ARM: dts: renesas: Fix USB PHY device and child node names

make dtbs_check:

    usb-phy@e6590100: '#phy-cells' is a required property
	    From schema: dtschema/schemas/phy/phy-provider.yaml

The R-Car Gen2 USB PHY device nodes do not represent USB PHYs
theirselves, and thus do not have "#phy-cells" properties.  Fix the
warning by renaming them from "usb-phy" to "usb-phy-controller".
Rename their child nodes from "usb-channel" to "usb-phy", as these do
represent USB PHYs.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/6442b4042e26537abc8632c4772f8201685f1f1f.1663165098.git.geert+renesas@glider.be

diff --git a/arch/arm/boot/dts/r8a7742.dtsi b/arch/arm/boot/dts/r8a7742.dtsi
index 420e0b3..758a1bf 100644 (file)
--- a/arch/arm/boot/dts/r8a7742.dtsi
+++ b/arch/arm/boot/dts/r8a7742.dtsi
@@ -633,7 +633,7 @@
                        status = "disabled";
                };
 
-               usbphy: usb-phy@e6590100 {
+               usbphy: usb-phy-controller@e6590100 {
                        compatible = "renesas,usb-phy-r8a7742",
                                     "renesas,rcar-gen2-usb-phy";
                        reg = <0 0xe6590100 0 0x100>;
@@ -645,11 +645,11 @@
                        resets = <&cpg 704>;
                        status = "disabled";
 
-                       usb0: usb-channel@0 {
+                       usb0: usb-phy@0 {
                                reg = <0>;
                                #phy-cells = <1>;
                        };
-                       usb2: usb-channel@2 {
+                       usb2: usb-phy@2 {
                                reg = <2>;
                                #phy-cells = <1>;
                        };

diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
index c0c145a..20f1d98 100644 (file)
--- a/arch/arm/boot/dts/r8a7743.dtsi
+++ b/arch/arm/boot/dts/r8a7743.dtsi
@@ -584,7 +584,7 @@
                        status = "disabled";
                };
 
-               usbphy: usb-phy@e6590100 {
+               usbphy: usb-phy-controller@e6590100 {
                        compatible = "renesas,usb-phy-r8a7743",
                                     "renesas,rcar-gen2-usb-phy";
                        reg = <0 0xe6590100 0 0x100>;
@@ -596,11 +596,11 @@
                        resets = <&cpg 704>;
                        status = "disabled";
 
-                       usb0: usb-channel@0 {
+                       usb0: usb-phy@0 {
                                reg = <0>;
                                #phy-cells = <1>;
                        };
-                       usb2: usb-channel@2 {
+                       usb2: usb-phy@2 {
                                reg = <2>;
                                #phy-cells = <1>;
                        };

diff --git a/arch/arm/boot/dts/r8a7744.dtsi b/arch/arm/boot/dts/r8a7744.dtsi
index 3f4fb53..96b2d5a 100644 (file)
--- a/arch/arm/boot/dts/r8a7744.dtsi
+++ b/arch/arm/boot/dts/r8a7744.dtsi
@@ -584,7 +584,7 @@
                        status = "disabled";
                };
 
-               usbphy: usb-phy@e6590100 {
+               usbphy: usb-phy-controller@e6590100 {
                        compatible = "renesas,usb-phy-r8a7744",
                                     "renesas,rcar-gen2-usb-phy";
                        reg = <0 0xe6590100 0 0x100>;
@@ -596,11 +596,11 @@
                        resets = <&cpg 704>;
                        status = "disabled";
 
-                       usb0: usb-channel@0 {
+                       usb0: usb-phy@0 {
                                reg = <0>;
                                #phy-cells = <1>;
                        };
-                       usb2: usb-channel@2 {
+                       usb2: usb-phy@2 {
                                reg = <2>;
                                #phy-cells = <1>;
                        };

diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi
index fe8e98a..afc902e 100644 (file)
--- a/arch/arm/boot/dts/r8a7745.dtsi
+++ b/arch/arm/boot/dts/r8a7745.dtsi
@@ -525,7 +525,7 @@
                        status = "disabled";
                };
 
-               usbphy: usb-phy@e6590100 {
+               usbphy: usb-phy-controller@e6590100 {
                        compatible = "renesas,usb-phy-r8a7745",
                                     "renesas,rcar-gen2-usb-phy";
                        reg = <0 0xe6590100 0 0x100>;
@@ -537,11 +537,11 @@
                        resets = <&cpg 704>;
                        status = "disabled";
 
-                       usb0: usb-channel@0 {
+                       usb0: usb-phy@0 {
                                reg = <0>;
                                #phy-cells = <1>;
                        };
-                       usb2: usb-channel@2 {
+                       usb2: usb-phy@2 {
                                reg = <2>;
                                #phy-cells = <1>;
                        };

diff --git a/arch/arm/boot/dts/r8a77470.dtsi b/arch/arm/boot/dts/r8a77470.dtsi
index c90f2a2..a5cf663 100644 (file)
--- a/arch/arm/boot/dts/r8a77470.dtsi
+++ b/arch/arm/boot/dts/r8a77470.dtsi
@@ -357,7 +357,7 @@
                        status = "disabled";
                };
 
-               usbphy0: usb-phy@e6590100 {
+               usbphy0: usb-phy-controller@e6590100 {
                        compatible = "renesas,usb-phy-r8a77470",
                                     "renesas,rcar-gen2-usb-phy";
                        reg = <0 0xe6590100 0 0x100>;
@@ -369,7 +369,7 @@
                        resets = <&cpg 704>;
                        status = "disabled";
 
-                       usb0: usb-channel@0 {
+                       usb0: usb-phy@0 {
                                reg = <0>;
                                #phy-cells = <1>;
                        };
@@ -393,7 +393,7 @@
                        status = "disabled";
                };
 
-               usbphy1: usb-phy@e6598100 {
+               usbphy1: usb-phy-controller@e6598100 {
                        compatible = "renesas,usb-phy-r8a77470",
                                     "renesas,rcar-gen2-usb-phy";
                        reg = <0 0xe6598100 0 0x100>;
@@ -405,7 +405,7 @@
                        resets = <&cpg 706>;
                        status = "disabled";
 
-                       usb1: usb-channel@0 {
+                       usb1: usb-phy@0 {
                                reg = <0>;
                                #phy-cells = <1>;
                        };

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index a640488..db171e3 100644 (file)
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -654,7 +654,7 @@
                        status = "disabled";
                };
 
-               usbphy: usb-phy@e6590100 {
+               usbphy: usb-phy-controller@e6590100 {
                        compatible = "renesas,usb-phy-r8a7790",
                                     "renesas,rcar-gen2-usb-phy";
                        reg = <0 0xe6590100 0 0x100>;
@@ -666,11 +666,11 @@
                        resets = <&cpg 704>;
                        status = "disabled";
 
-                       usb0: usb-channel@0 {
+                       usb0: usb-phy@0 {
                                reg = <0>;
                                #phy-cells = <1>;
                        };
-                       usb2: usb-channel@2 {
+                       usb2: usb-phy@2 {
                                reg = <2>;
                                #phy-cells = <1>;
                        };

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 542ed0a..d8f91d9 100644 (file)
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -608,7 +608,7 @@
                        status = "disabled";
                };
 
-               usbphy: usb-phy@e6590100 {
+               usbphy: usb-phy-controller@e6590100 {
                        compatible = "renesas,usb-phy-r8a7791",
                                     "renesas,rcar-gen2-usb-phy";
                        reg = <0 0xe6590100 0 0x100>;
@@ -620,11 +620,11 @@
                        resets = <&cpg 704>;
                        status = "disabled";
 
-                       usb0: usb-channel@0 {
+                       usb0: usb-phy@0 {
                                reg = <0>;
                                #phy-cells = <1>;
                        };
-                       usb2: usb-channel@2 {
+                       usb2: usb-phy@2 {
                                reg = <2>;
                                #phy-cells = <1>;
                        };

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index b601ee6..7aa781f 100644 (file)
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -506,7 +506,7 @@
                        status = "disabled";
                };
 
-               usbphy: usb-phy@e6590100 {
+               usbphy: usb-phy-controller@e6590100 {
                        compatible = "renesas,usb-phy-r8a7794",
                                     "renesas,rcar-gen2-usb-phy";
                        reg = <0 0xe6590100 0 0x100>;
@@ -518,11 +518,11 @@
                        resets = <&cpg 704>;
                        status = "disabled";
 
-                       usb0: usb-channel@0 {
+                       usb0: usb-phy@0 {
                                reg = <0>;
                                #phy-cells = <1>;
                        };
-                       usb2: usb-channel@2 {
+                       usb2: usb-phy@2 {
                                reg = <2>;
                                #phy-cells = <1>;
                        };