Commit 42279765 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/6442b4042e26537abc8632c4772f8201685f1f1f.1663165098.git.geert+renesas@glider.be
parent 167720e4

arch/arm/boot/dts/r8a7742.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -633,7 +633,7 @@ hsusb: usb@e6590000 { 
			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 @@ usbphy: usb-phy@e6590100 { 
			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>;

			};

arch/arm/boot/dts/r8a7743.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ hsusb: usb@e6590000 { 
			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 @@ usbphy: usb-phy@e6590100 { 
			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>;

			};

arch/arm/boot/dts/r8a7744.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ hsusb: usb@e6590000 { 
			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 @@ usbphy: usb-phy@e6590100 { 
			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>;

			};

arch/arm/boot/dts/r8a7745.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ hsusb: usb@e6590000 { 
			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 @@ usbphy: usb-phy@e6590100 { 
			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>;

			};

arch/arm/boot/dts/r8a77470.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -357,7 +357,7 @@ hsusb0: hsusb@e6590000 { 
			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 @@ usbphy0: usb-phy@e6590100 { 
			resets = <&cpg 704>;

			status = "disabled";



			usb0: usb-channel@0 {

			usb0: usb-phy@0 {

				reg = <0>;

				#phy-cells = <1>;

			};
@@ -393,7 +393,7 @@ hsusb1: hsusb@e6598000 { 
			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 @@ usbphy1: usb-phy@e6598100 { 
			resets = <&cpg 706>;

			status = "disabled";



			usb1: usb-channel@0 {

			usb1: usb-phy@0 {

				reg = <0>;

				#phy-cells = <1>;

			};