Commit e6064cf4 authored by Maxime Ripard's avatar Maxime Ripard Committed by Greg Kroah-Hartman
Browse files

ARM: dts: sunxi: Revert phy-names removal for ECHI and OHCI 



This reverts commits 3d109bdc ("ARM: dts: sunxi: Remove useless
phy-names from EHCI and OHCI"), 0a3df8bb ("ARM: dts: sunxi: h3/h5:
Remove useless phy-names from EHCI and OHCI") and 3c7ab90a ("arm64:
dts: allwinner: Remove useless phy-names from EHCI and OHCI").

It turns out that while the USB bindings were not mentionning it, the PHY
client bindings were mandating that phy-names is set when phys is. Let's
add it back.

Fixes: 3d109bdc ("ARM: dts: sunxi: Remove useless phy-names from EHCI and OHCI")
Fixes: 0a3df8bb ("ARM: dts: sunxi: h3/h5: Remove useless phy-names from EHCI and OHCI")
Fixes: 3c7ab90a ("arm64: dts: allwinner: Remove useless phy-names from EHCI and OHCI")
Reported-by: default avatarEmmanuel Vadot <manu@bidouilliste.com>
Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
Link: https://lore.kernel.org/r/20191002112651.100504-1-mripard@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d599cd3

arch/arm/boot/dts/sun4i-a10.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -520,6 +520,7 @@ 
			interrupts = <39>;

			clocks = <&ccu CLK_AHB_EHCI0>;

			phys = <&usbphy 1>;

			phy-names = "usb";

			status = "disabled";

		};
@@ -529,6 +530,7 @@ 
			interrupts = <64>;

			clocks = <&ccu CLK_USB_OHCI0>, <&ccu CLK_AHB_OHCI0>;

			phys = <&usbphy 1>;

			phy-names = "usb";

			status = "disabled";

		};
@@ -608,6 +610,7 @@ 
			interrupts = <40>;

			clocks = <&ccu CLK_AHB_EHCI1>;

			phys = <&usbphy 2>;

			phy-names = "usb";

			status = "disabled";

		};
@@ -617,6 +620,7 @@ 
			interrupts = <65>;

			clocks = <&ccu CLK_USB_OHCI1>, <&ccu CLK_AHB_OHCI1>;

			phys = <&usbphy 2>;

			phy-names = "usb";

			status = "disabled";

		};

arch/arm/boot/dts/sun5i.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -391,6 +391,7 @@ 
			interrupts = <39>;

			clocks = <&ccu CLK_AHB_EHCI>;

			phys = <&usbphy 1>;

			phy-names = "usb";

			status = "disabled";

		};
@@ -400,6 +401,7 @@ 
			interrupts = <40>;

			clocks = <&ccu CLK_USB_OHCI>, <&ccu CLK_AHB_OHCI>;

			phys = <&usbphy 1>;

			phy-names = "usb";

			status = "disabled";

		};

arch/arm/boot/dts/sun6i-a31.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -545,6 +545,7 @@ 
			clocks = <&ccu CLK_AHB1_EHCI0>;

			resets = <&ccu RST_AHB1_EHCI0>;

			phys = <&usbphy 1>;

			phy-names = "usb";

			status = "disabled";

		};
@@ -555,6 +556,7 @@ 
			clocks = <&ccu CLK_AHB1_OHCI0>, <&ccu CLK_USB_OHCI0>;

			resets = <&ccu RST_AHB1_OHCI0>;

			phys = <&usbphy 1>;

			phy-names = "usb";

			status = "disabled";

		};
@@ -565,6 +567,7 @@ 
			clocks = <&ccu CLK_AHB1_EHCI1>;

			resets = <&ccu RST_AHB1_EHCI1>;

			phys = <&usbphy 2>;

			phy-names = "usb";

			status = "disabled";

		};
@@ -575,6 +578,7 @@ 
			clocks = <&ccu CLK_AHB1_OHCI1>, <&ccu CLK_USB_OHCI1>;

			resets = <&ccu RST_AHB1_OHCI1>;

			phys = <&usbphy 2>;

			phy-names = "usb";

			status = "disabled";

		};

arch/arm/boot/dts/sun7i-a20.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -623,6 +623,7 @@ 
			interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_AHB_EHCI0>;

			phys = <&usbphy 1>;

			phy-names = "usb";

			status = "disabled";

		};
@@ -632,6 +633,7 @@ 
			interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_USB_OHCI0>, <&ccu CLK_AHB_OHCI0>;

			phys = <&usbphy 1>;

			phy-names = "usb";

			status = "disabled";

		};
@@ -714,6 +716,7 @@ 
			interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_AHB_EHCI1>;

			phys = <&usbphy 2>;

			phy-names = "usb";

			status = "disabled";

		};
@@ -723,6 +726,7 @@ 
			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&ccu CLK_USB_OHCI1>, <&ccu CLK_AHB_OHCI1>;

			phys = <&usbphy 2>;

			phy-names = "usb";

			status = "disabled";

		};

arch/arm/boot/dts/sun8i-a23-a33.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ 
			clocks = <&ccu CLK_BUS_EHCI>;

			resets = <&ccu RST_BUS_EHCI>;

			phys = <&usbphy 1>;

			phy-names = "usb";

			status = "disabled";

		};
@@ -317,6 +318,7 @@ 
			clocks = <&ccu CLK_BUS_OHCI>, <&ccu CLK_USB_OHCI>;

			resets = <&ccu RST_BUS_OHCI>;

			phys = <&usbphy 1>;

			phy-names = "usb";

			status = "disabled";

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE