[PATCH v2 2/2] usb: host: xhci: plat: add support for Renesas r8a7796 SoC

[PATCH v2 2/2] usb: host: xhci: plat: add support for Renesas r8a7796 SoC

[Yoshihiro Shimoda]

This patch adds support for Renesas r8a7796 SoC. This SoC is not
compatible with r8a7795 because using firmware version differs.

Since the "V2" firmware can be used on both r8a7795 (es1.x) and r8a7796,
the "renesas,rcar-gen3-xhci" keeps to use the "V2" for now.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 +
 drivers/usb/host/xhci-plat.c                       | 9 +++++++++
 drivers/usb/host/xhci-rcar.c                       | 1 +
 3 files changed, 11 insertions(+)

diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
index 966885c..0b7d857 100644
--- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
@@ -11,6 +11,7 @@ Required properties:
     - "renesas,xhci-r8a7791" for r8a7791 SoC
     - "renesas,xhci-r8a7793" for r8a7793 SoC
     - "renesas,xhci-r8a7795" for r8a7795 SoC
+    - "renesas,xhci-r8a7796" for r8a7796 SoC
     - "renesas,rcar-gen2-xhci" for a generic R-Car Gen2 compatible device
     - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 compatible device
     - "xhci-platform" (deprecated)
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index ed56bf9..ddfab30 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -100,6 +100,12 @@ static int xhci_plat_start(struct usb_hcd *hcd)
 	.plat_start = xhci_rcar_start,
 };
 
+static const struct xhci_plat_priv xhci_plat_renesas_rcar_r8a7796 = {
+	.firmware_name = XHCI_RCAR_FIRMWARE_NAME_V3,
+	.init_quirk = xhci_rcar_init_quirk,
+	.plat_start = xhci_rcar_start,
+};
+
 static const struct of_device_id usb_xhci_of_match[] = {
 	{
 		.compatible = "generic-xhci",
@@ -124,6 +130,9 @@ static int xhci_plat_start(struct usb_hcd *hcd)
 		.compatible = "renesas,xhci-r8a7795",
 		.data = &xhci_plat_renesas_rcar_gen3,
 	}, {
+		.compatible = "renesas,xhci-r8a7796",
+		.data = &xhci_plat_renesas_rcar_r8a7796,
+	}, {
 		.compatible = "renesas,rcar-gen2-xhci",
 		.data = &xhci_plat_renesas_rcar_gen2,
 	}, {
diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
index ced4a76..d28df38 100644
--- a/drivers/usb/host/xhci-rcar.c
+++ b/drivers/usb/host/xhci-rcar.c
@@ -95,6 +95,7 @@ static int xhci_rcar_is_gen3(struct device *dev)
 	struct device_node *node = dev->of_node;
 
 	return of_device_is_compatible(node, "renesas,xhci-r8a7795") ||
+		of_device_is_compatible(node, "renesas,xhci-r8a7796") ||
 		of_device_is_compatible(node, "renesas,rcar-gen3-xhci");
 }
 
-- 
1.9.1

Re: [PATCH v2 0/2] usb: host: xhci: plat: add support for Renesas r8a7796 SoC

[Mathias Nyman]

On 19.10.2016 11:50, Yoshihiro Shimoda wrote:
> This patch set is based on the latest Greg's usb.git / usb-next branch.
> (commit id = 1001354ca34179f3db924eb66672442a173147dc)
>
> Changes from v1:
>   - Revise the comment in patch 1.
>   - Don't add a new macro because the macro will be not used in the future.
>     (Especially, the xhci-rcar driver will need to check SoC revision and
>      change the firmware name.)
>
> Yoshihiro Shimoda (2):
>    usb: host: xhci: rcar: add a new firmware version for r8a7796
>    usb: host: xhci: plat: add support for Renesas r8a7796 SoC
>
>   Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 +
>   drivers/usb/host/xhci-plat.c                       | 9 +++++++++
>   drivers/usb/host/xhci-rcar.c                       | 4 ++++
>   drivers/usb/host/xhci-rcar.h                       | 1 +
>   4 files changed, 15 insertions(+)
>

Thanks, added it to my tree

-Mathias