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

Geert Uytterhoeven geert+renesas at glider.be
Wed Sep 14 07:21:54 PDT 2022


make dtbs_check:

    usb-phy at 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 at glider.be>
---
See also "[PATCH v2] dt-bindings: phy: renesas,rcar-gen2-usb-phy:
Convert to json-schema"
https://lore.kernel.org/r/dbdcffd009302734fe2fb895ce04b72fa1ea4355.1663165000.git.geert+renesas@glider.be

 arch/arm/boot/dts/r8a7742.dtsi  | 6 +++---
 arch/arm/boot/dts/r8a7743.dtsi  | 6 +++---
 arch/arm/boot/dts/r8a7744.dtsi  | 6 +++---
 arch/arm/boot/dts/r8a7745.dtsi  | 6 +++---
 arch/arm/boot/dts/r8a77470.dtsi | 8 ++++----
 arch/arm/boot/dts/r8a7790.dtsi  | 6 +++---
 arch/arm/boot/dts/r8a7791.dtsi  | 6 +++---
 arch/arm/boot/dts/r8a7794.dtsi  | 6 +++---
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7742.dtsi b/arch/arm/boot/dts/r8a7742.dtsi
index 420e0b3259d48de6..758a1bf02fae9a15 100644
--- a/arch/arm/boot/dts/r8a7742.dtsi
+++ b/arch/arm/boot/dts/r8a7742.dtsi
@@ -633,7 +633,7 @@ hsusb: usb at e6590000 {
 			status = "disabled";
 		};
 
-		usbphy: usb-phy at e6590100 {
+		usbphy: usb-phy-controller at e6590100 {
 			compatible = "renesas,usb-phy-r8a7742",
 				     "renesas,rcar-gen2-usb-phy";
 			reg = <0 0xe6590100 0 0x100>;
@@ -645,11 +645,11 @@ usbphy: usb-phy at e6590100 {
 			resets = <&cpg 704>;
 			status = "disabled";
 
-			usb0: usb-channel at 0 {
+			usb0: usb-phy at 0 {
 				reg = <0>;
 				#phy-cells = <1>;
 			};
-			usb2: usb-channel at 2 {
+			usb2: usb-phy at 2 {
 				reg = <2>;
 				#phy-cells = <1>;
 			};
diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
index c0c145a5fe8da52a..20f1d98a048dc1af 100644
--- a/arch/arm/boot/dts/r8a7743.dtsi
+++ b/arch/arm/boot/dts/r8a7743.dtsi
@@ -584,7 +584,7 @@ hsusb: usb at e6590000 {
 			status = "disabled";
 		};
 
-		usbphy: usb-phy at e6590100 {
+		usbphy: usb-phy-controller at e6590100 {
 			compatible = "renesas,usb-phy-r8a7743",
 				     "renesas,rcar-gen2-usb-phy";
 			reg = <0 0xe6590100 0 0x100>;
@@ -596,11 +596,11 @@ usbphy: usb-phy at e6590100 {
 			resets = <&cpg 704>;
 			status = "disabled";
 
-			usb0: usb-channel at 0 {
+			usb0: usb-phy at 0 {
 				reg = <0>;
 				#phy-cells = <1>;
 			};
-			usb2: usb-channel at 2 {
+			usb2: usb-phy at 2 {
 				reg = <2>;
 				#phy-cells = <1>;
 			};
diff --git a/arch/arm/boot/dts/r8a7744.dtsi b/arch/arm/boot/dts/r8a7744.dtsi
index 3f4fb53dd6df1696..96b2d5a4e8f64bd6 100644
--- a/arch/arm/boot/dts/r8a7744.dtsi
+++ b/arch/arm/boot/dts/r8a7744.dtsi
@@ -584,7 +584,7 @@ hsusb: usb at e6590000 {
 			status = "disabled";
 		};
 
-		usbphy: usb-phy at e6590100 {
+		usbphy: usb-phy-controller at e6590100 {
 			compatible = "renesas,usb-phy-r8a7744",
 				     "renesas,rcar-gen2-usb-phy";
 			reg = <0 0xe6590100 0 0x100>;
@@ -596,11 +596,11 @@ usbphy: usb-phy at e6590100 {
 			resets = <&cpg 704>;
 			status = "disabled";
 
-			usb0: usb-channel at 0 {
+			usb0: usb-phy at 0 {
 				reg = <0>;
 				#phy-cells = <1>;
 			};
-			usb2: usb-channel at 2 {
+			usb2: usb-phy at 2 {
 				reg = <2>;
 				#phy-cells = <1>;
 			};
diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi
index fe8e98a66d93ebc8..afc902e532d8d45a 100644
--- a/arch/arm/boot/dts/r8a7745.dtsi
+++ b/arch/arm/boot/dts/r8a7745.dtsi
@@ -525,7 +525,7 @@ hsusb: usb at e6590000 {
 			status = "disabled";
 		};
 
-		usbphy: usb-phy at e6590100 {
+		usbphy: usb-phy-controller at e6590100 {
 			compatible = "renesas,usb-phy-r8a7745",
 				     "renesas,rcar-gen2-usb-phy";
 			reg = <0 0xe6590100 0 0x100>;
@@ -537,11 +537,11 @@ usbphy: usb-phy at e6590100 {
 			resets = <&cpg 704>;
 			status = "disabled";
 
-			usb0: usb-channel at 0 {
+			usb0: usb-phy at 0 {
 				reg = <0>;
 				#phy-cells = <1>;
 			};
-			usb2: usb-channel at 2 {
+			usb2: usb-phy at 2 {
 				reg = <2>;
 				#phy-cells = <1>;
 			};
diff --git a/arch/arm/boot/dts/r8a77470.dtsi b/arch/arm/boot/dts/r8a77470.dtsi
index c90f2a2702146701..a5cf663a0118ee1d 100644
--- a/arch/arm/boot/dts/r8a77470.dtsi
+++ b/arch/arm/boot/dts/r8a77470.dtsi
@@ -357,7 +357,7 @@ hsusb0: hsusb at e6590000 {
 			status = "disabled";
 		};
 
-		usbphy0: usb-phy at e6590100 {
+		usbphy0: usb-phy-controller at e6590100 {
 			compatible = "renesas,usb-phy-r8a77470",
 				     "renesas,rcar-gen2-usb-phy";
 			reg = <0 0xe6590100 0 0x100>;
@@ -369,7 +369,7 @@ usbphy0: usb-phy at e6590100 {
 			resets = <&cpg 704>;
 			status = "disabled";
 
-			usb0: usb-channel at 0 {
+			usb0: usb-phy at 0 {
 				reg = <0>;
 				#phy-cells = <1>;
 			};
@@ -393,7 +393,7 @@ hsusb1: hsusb at e6598000 {
 			status = "disabled";
 		};
 
-		usbphy1: usb-phy at e6598100 {
+		usbphy1: usb-phy-controller at e6598100 {
 			compatible = "renesas,usb-phy-r8a77470",
 				     "renesas,rcar-gen2-usb-phy";
 			reg = <0 0xe6598100 0 0x100>;
@@ -405,7 +405,7 @@ usbphy1: usb-phy at e6598100 {
 			resets = <&cpg 706>;
 			status = "disabled";
 
-			usb1: usb-channel at 0 {
+			usb1: usb-phy at 0 {
 				reg = <0>;
 				#phy-cells = <1>;
 			};
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index a640488d513b2f53..db171e3c62f25eb8 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -654,7 +654,7 @@ hsusb: usb at e6590000 {
 			status = "disabled";
 		};
 
-		usbphy: usb-phy at e6590100 {
+		usbphy: usb-phy-controller at e6590100 {
 			compatible = "renesas,usb-phy-r8a7790",
 				     "renesas,rcar-gen2-usb-phy";
 			reg = <0 0xe6590100 0 0x100>;
@@ -666,11 +666,11 @@ usbphy: usb-phy at e6590100 {
 			resets = <&cpg 704>;
 			status = "disabled";
 
-			usb0: usb-channel at 0 {
+			usb0: usb-phy at 0 {
 				reg = <0>;
 				#phy-cells = <1>;
 			};
-			usb2: usb-channel at 2 {
+			usb2: usb-phy at 2 {
 				reg = <2>;
 				#phy-cells = <1>;
 			};
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 542ed0a71872959a..d8f91d9f42aeed8a 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -608,7 +608,7 @@ hsusb: usb at e6590000 {
 			status = "disabled";
 		};
 
-		usbphy: usb-phy at e6590100 {
+		usbphy: usb-phy-controller at e6590100 {
 			compatible = "renesas,usb-phy-r8a7791",
 				     "renesas,rcar-gen2-usb-phy";
 			reg = <0 0xe6590100 0 0x100>;
@@ -620,11 +620,11 @@ usbphy: usb-phy at e6590100 {
 			resets = <&cpg 704>;
 			status = "disabled";
 
-			usb0: usb-channel at 0 {
+			usb0: usb-phy at 0 {
 				reg = <0>;
 				#phy-cells = <1>;
 			};
-			usb2: usb-channel at 2 {
+			usb2: usb-phy at 2 {
 				reg = <2>;
 				#phy-cells = <1>;
 			};
diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index b601ee6f7580b285..7aa781ff3bff6952 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -506,7 +506,7 @@ hsusb: usb at e6590000 {
 			status = "disabled";
 		};
 
-		usbphy: usb-phy at e6590100 {
+		usbphy: usb-phy-controller at e6590100 {
 			compatible = "renesas,usb-phy-r8a7794",
 				     "renesas,rcar-gen2-usb-phy";
 			reg = <0 0xe6590100 0 0x100>;
@@ -518,11 +518,11 @@ usbphy: usb-phy at e6590100 {
 			resets = <&cpg 704>;
 			status = "disabled";
 
-			usb0: usb-channel at 0 {
+			usb0: usb-phy at 0 {
 				reg = <0>;
 				#phy-cells = <1>;
 			};
-			usb2: usb-channel at 2 {
+			usb2: usb-phy at 2 {
 				reg = <2>;
 				#phy-cells = <1>;
 			};
-- 
2.25.1




More information about the linux-arm-kernel mailing list