[PATCH] usb: host: xhci-plat: add R-Car Gen2 and Gen3 fallback compatibility strings

[PATCH] usb: host: xhci-plat: add R-Car Gen2 and Gen3 fallback compatibility strings

[Simon Horman]

Add fallback compatibility strings for R-Car Gen2 and Gen3.

This is in keeping with the fallback scheme being adopted wherever
appropriate for drivers for Renesas SoCs.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 Documentation/devicetree/bindings/usb/usb-xhci.txt | 21 +++++++++++++++++----
 drivers/usb/host/xhci-plat.c                       |  5 +++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
index 082573289f1e..46435b1d5b8c 100644
--- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
@@ -1,10 +1,23 @@
 USB xHCI controllers
 
 Required properties:
-  - compatible: should be one of "generic-xhci",
-    "marvell,armada-375-xhci", "marvell,armada-380-xhci",
-    "renesas,xhci-r8a7790", "renesas,xhci-r8a7791", "renesas,xhci-r8a7793",
-    "renesas,xhci-r8a7795" (deprecated: "xhci-platform").
+  - compatible: should be one or more of
+
+    - "generic-xhci" for generic XHCI device,
+    - "marvell,armada-375-xhci" for Armada 375 SoCs,
+    - "marvell,armada-380-xhci" for Armada 380 SoCs,
+    - "renesas,xhci-r8a7790" for r8a7790 SoC,
+    - "renesas,xhci-r8a7791" for r8a7791 SoC
+    - "renesas,xhci-r8a7793" for r8a7793 SoC
+    - "renesas,xhci-r8a7795" for r8a7795 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)
+
+    When compatible with the generic version, nodes must list the
+    SoC-specific version corresponding to the platform first
+    followed by the generic version.
+
   - reg: should contain address and length of the standard XHCI
     register set for the device.
   - interrupts: one XHCI interrupt should be described here.
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 770b6b088797..63fb0c9c6612 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -104,12 +104,17 @@ static const struct of_device_id usb_xhci_of_match[] = {
 		.compatible = "renesas,xhci-r8a7791",
 		.data = &xhci_plat_renesas_rcar_gen2,
 	}, {
+		.compatible = "renesas,rcar-gen2-xhci",
+		.data = &xhci_plat_renesas_rcar_gen2,
+	}, {
 		.compatible = "renesas,xhci-r8a7793",
 		.data = &xhci_plat_renesas_rcar_gen2,
 	}, {
 		.compatible = "renesas,xhci-r8a7795",
 		.data = &xhci_plat_renesas_rcar_gen3,
 	}, {
+		.compatible = "renesas,rcar-gen3-xhci",
+		.data = &xhci_plat_renesas_rcar_gen3,
 	},
 };
 MODULE_DEVICE_TABLE(of, usb_xhci_of_match);
-- 
2.1.4

Re: [PATCH] usb: host: xhci-plat: add R-Car Gen2 and Gen3 fallback compatibility strings

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 1979 bytes --]

Hi Simon,

[auto build test ERROR on usb/usb-testing]
[also build test ERROR on next-20160107]
[cannot apply to v4.4-rc8]
[if your patch is applied to the wrong git tree, please drop us a note to help improving the system]

url:    https://github.com/0day-ci/linux/commits/Simon-Horman/usb-host-xhci-plat-add-R-Car-Gen2-and-Gen3-fallback-compatibility-strings/20160108-104056
base:   https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb-testing
config: i386-randconfig-s0-201601 (attached as .config)
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

   drivers/usb/host/xhci-plat-hcd: struct of_device_id is 196 bytes.  The last of 10 is:
   0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x72 0x65 0x6e 0x65 0x73 0x61 0x73 0x2c 0x72 0x63 0x61 0x72 0x2d 0x67 0x65 0x6e 0x33 0x2d 0x78 0x68 0x63 0x69 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0xe8 0x07 0x00 0x00 
>> FATAL: drivers/usb/host/xhci-plat-hcd: struct of_device_id is not terminated with a NULL entry!

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

[-- Attachment #2: .config.gz --]
[-- Type: application/octet-stream, Size: 22274 bytes --]

Re: [PATCH] usb: host: xhci-plat: add R-Car Gen2 and Gen3 fallback compatibility strings

[Geert Uytterhoeven]

Hi Simon,

On Fri, Jan 8, 2016 at 3:37 AM, Simon Horman <horms+renesas@verge.net.au> wrote:
> Add fallback compatibility strings for R-Car Gen2 and Gen3.
>
> This is in keeping with the fallback scheme being adopted wherever
> appropriate for drivers for Renesas SoCs.
>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

> --- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
> +++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
> @@ -1,10 +1,23 @@
>  USB xHCI controllers
>
>  Required properties:
> -  - compatible: should be one of "generic-xhci",
> -    "marvell,armada-375-xhci", "marvell,armada-380-xhci",
> -    "renesas,xhci-r8a7790", "renesas,xhci-r8a7791", "renesas,xhci-r8a7793",
> -    "renesas,xhci-r8a7795" (deprecated: "xhci-platform").
> +  - compatible: should be one or more of
> +
> +    - "generic-xhci" for generic XHCI device,
> +    - "marvell,armada-375-xhci" for Armada 375 SoCs,
> +    - "marvell,armada-380-xhci" for Armada 380 SoCs,
> +    - "renesas,xhci-r8a7790" for r8a7790 SoC,
> +    - "renesas,xhci-r8a7791" for r8a7791 SoC
> +    - "renesas,xhci-r8a7793" for r8a7793 SoC
> +    - "renesas,xhci-r8a7795" for r8a7795 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)

Inconsistent line ending (comma, period, or nothing).

> +    When compatible with the generic version, nodes must list the
> +    SoC-specific version corresponding to the platform first
> +    followed by the generic version.
> +
>    - reg: should contain address and length of the standard XHCI
>      register set for the device.
>    - interrupts: one XHCI interrupt should be described here.
> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> index 770b6b088797..63fb0c9c6612 100644
> --- a/drivers/usb/host/xhci-plat.c
> +++ b/drivers/usb/host/xhci-plat.c
> @@ -104,12 +104,17 @@ static const struct of_device_id usb_xhci_of_match[] = {
>                 .compatible = "renesas,xhci-r8a7791",
>                 .data = &xhci_plat_renesas_rcar_gen2,
>         }, {
> +               .compatible = "renesas,rcar-gen2-xhci",
> +               .data = &xhci_plat_renesas_rcar_gen2,
> +       }, {

Shouldn't this be inserted below "renesas,xhci-r8a7793"?
Or better, group all generic ones at the bottom?

>                 .compatible = "renesas,xhci-r8a7793",
>                 .data = &xhci_plat_renesas_rcar_gen2,
>         }, {
>                 .compatible = "renesas,xhci-r8a7795",
>                 .data = &xhci_plat_renesas_rcar_gen3,
>         }, {
> +               .compatible = "renesas,rcar-gen3-xhci",
> +               .data = &xhci_plat_renesas_rcar_gen3,
>         },

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] usb: host: xhci-plat: add R-Car Gen2 and Gen3 fallback compatibility strings

[Simon Horman]

On Fri, Jan 08, 2016 at 09:29:54AM +0100, Geert Uytterhoeven wrote:
> Hi Simon,
> 
> On Fri, Jan 8, 2016 at 3:37 AM, Simon Horman <horms+renesas@verge.net.au> wrote:
> > Add fallback compatibility strings for R-Car Gen2 and Gen3.
> >
> > This is in keeping with the fallback scheme being adopted wherever
> > appropriate for drivers for Renesas SoCs.
> >
> > Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> 
> > --- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
> > +++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
> > @@ -1,10 +1,23 @@
> >  USB xHCI controllers
> >
> >  Required properties:
> > -  - compatible: should be one of "generic-xhci",
> > -    "marvell,armada-375-xhci", "marvell,armada-380-xhci",
> > -    "renesas,xhci-r8a7790", "renesas,xhci-r8a7791", "renesas,xhci-r8a7793",
> > -    "renesas,xhci-r8a7795" (deprecated: "xhci-platform").
> > +  - compatible: should be one or more of
> > +
> > +    - "generic-xhci" for generic XHCI device,
> > +    - "marvell,armada-375-xhci" for Armada 375 SoCs,
> > +    - "marvell,armada-380-xhci" for Armada 380 SoCs,
> > +    - "renesas,xhci-r8a7790" for r8a7790 SoC,
> > +    - "renesas,xhci-r8a7791" for r8a7791 SoC
> > +    - "renesas,xhci-r8a7793" for r8a7793 SoC
> > +    - "renesas,xhci-r8a7795" for r8a7795 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)
> 
> Inconsistent line ending (comma, period, or nothing).

Thanks, I plan to go with nothing.

> > +    When compatible with the generic version, nodes must list the
> > +    SoC-specific version corresponding to the platform first
> > +    followed by the generic version.
> > +
> >    - reg: should contain address and length of the standard XHCI
> >      register set for the device.
> >    - interrupts: one XHCI interrupt should be described here.
> > diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> > index 770b6b088797..63fb0c9c6612 100644
> > --- a/drivers/usb/host/xhci-plat.c
> > +++ b/drivers/usb/host/xhci-plat.c
> > @@ -104,12 +104,17 @@ static const struct of_device_id usb_xhci_of_match[] = {
> >                 .compatible = "renesas,xhci-r8a7791",
> >                 .data = &xhci_plat_renesas_rcar_gen2,
> >         }, {
> > +               .compatible = "renesas,rcar-gen2-xhci",
> > +               .data = &xhci_plat_renesas_rcar_gen2,
> > +       }, {
> 
> Shouldn't this be inserted below "renesas,xhci-r8a7793"?
> Or better, group all generic ones at the bottom?

I'll put them at the bottom as you suggest.

> >                 .compatible = "renesas,xhci-r8a7793",
> >                 .data = &xhci_plat_renesas_rcar_gen2,
> >         }, {
> >                 .compatible = "renesas,xhci-r8a7795",
> >                 .data = &xhci_plat_renesas_rcar_gen3,
> >         }, {
> > +               .compatible = "renesas,rcar-gen3-xhci",
> > +               .data = &xhci_plat_renesas_rcar_gen3,
> >         },
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds
>