Commit 4dd51864 authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Greg Kroah-Hartman

usb: host: xhci: plat: re-fact xhci_plat_priv for R-Car Gen3

Since the firmware_name is decided by xhci-rcar.c on R-Car Gen3 now,
this patch removes 2 things:
 - Remove struct xhci_plat_priv xhci_plat_renesas_rcar_r8a7796.
 - Remoce .firmware_name from xhci_plat_renesas_rcar_gen3.

The behavior is the same as before.
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 306b89d3
...@@ -107,14 +107,6 @@ static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen2 = { ...@@ -107,14 +107,6 @@ static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen2 = {
}; };
static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen3 = { static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen3 = {
.firmware_name = XHCI_RCAR_FIRMWARE_NAME_V2,
.init_quirk = xhci_rcar_init_quirk,
.plat_start = xhci_rcar_start,
.resume_quirk = xhci_rcar_resume_quirk,
};
static const struct xhci_plat_priv xhci_plat_renesas_rcar_r8a7796 = {
.firmware_name = XHCI_RCAR_FIRMWARE_NAME_V3,
.init_quirk = xhci_rcar_init_quirk, .init_quirk = xhci_rcar_init_quirk,
.plat_start = xhci_rcar_start, .plat_start = xhci_rcar_start,
.resume_quirk = xhci_rcar_resume_quirk, .resume_quirk = xhci_rcar_resume_quirk,
...@@ -145,7 +137,7 @@ static const struct of_device_id usb_xhci_of_match[] = { ...@@ -145,7 +137,7 @@ static const struct of_device_id usb_xhci_of_match[] = {
.data = &xhci_plat_renesas_rcar_gen3, .data = &xhci_plat_renesas_rcar_gen3,
}, { }, {
.compatible = "renesas,xhci-r8a7796", .compatible = "renesas,xhci-r8a7796",
.data = &xhci_plat_renesas_rcar_r8a7796, .data = &xhci_plat_renesas_rcar_gen3,
}, { }, {
.compatible = "renesas,rcar-gen2-xhci", .compatible = "renesas,rcar-gen2-xhci",
.data = &xhci_plat_renesas_rcar_gen2, .data = &xhci_plat_renesas_rcar_gen2,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment