RE: [PATCH] usb: renesas_usbhs: Add compatible string for r8a7743/5

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Biju-san,
(+ Felipe-san)

Thank you for the patch!

> From: Biju Das, Sent: Friday, October 6, 2017 12:13 AM
> 
> This patch adds support for r8a7743/5 SoC.  The Renesas RZ/G1[ME]
> (R8A7743/5) usbhs is identical to the R-Car Gen2 family.
> 
> This doesn't change the driver, so it does nothing by itself.  But it does
> mean that checkpatch won't complain about a future patch that adds
> "renesas,usbhs-r8a7743" or "renesas,usbhs-r8a7745" to a DT, which helps
> ensure that shipped DTs use documented compatibility strings.
> 
> Signed-off-by: Biju Das <biju.das@xxxxxxxxxxxxxx>
> ---
> This patch is tested against Linux next tag next-20170929
> 
>  Documentation/devicetree/bindings/usb/renesas_usbhs.txt | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
> b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
> index 9e18e00..479215b 100644
> --- a/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
> +++ b/Documentation/devicetree/bindings/usb/renesas_usbhs.txt
> @@ -3,6 +3,8 @@ Renesas Electronics USBHS driver
>  Required properties:
>    - compatible: Must contain one or more of the following:
> 
> +	- "renesas,usbhs-r8a7743" for r8a7743 (RZ/G1M) compatible device
> +	- "renesas,usbhs-r8a7745" for r8a7745 (RZ/G1E) compatible device
>  	- "renesas,usbhs-r8a7790" for r8a7790 (R-Car H2) compatible device
>  	- "renesas,usbhs-r8a7791" for r8a7791 (R-Car M2-W) compatible device
>  	- "renesas,usbhs-r8a7792" for r8a7792 (R-Car V2H) compatible device
> @@ -10,7 +12,7 @@ Required properties:
>  	- "renesas,usbhs-r8a7794" for r8a7794 (R-Car E2) compatible device
>  	- "renesas,usbhs-r8a7795" for r8a7795 (R-Car H3) compatible device
>  	- "renesas,usbhs-r8a7796" for r8a7796 (R-Car M3-W) compatible device
> -	- "renesas,rcar-gen2-usbhs" for R-Car Gen2 compatible device
> +	- "renesas,rcar-gen2-usbhs" for R-Car Gen2 or RZ/G1 compatible device
>  	- "renesas,rcar-gen3-usbhs" for R-Car Gen3 compatible device

This will be conflict with my R-Car D3 support patch.
https://patchwork.kernel.org/patch/9982267/
The R-Car D3 patch is not applied into usb.git yet though...

Hi Felipe-san,

Could you resolve this conflict on your side?
Or, should this r8a7743/5 patch be rebased on the R-Car D3 patch?

When after resolved the conflict:

Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@xxxxxxxxxxx>

Best regards,
Yoshihiro Shimoda

>  	When compatible with the generic version, nodes must list the
> --
> 1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Media]     [Linux Input]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [Old Linux USB Devel Archive]

  Powered by Linux