Skip to content

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

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.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4d599cd3
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 0 deletions
arch/arm/boot/dts/sun4i-a10.dtsi
View file @ e6064cf4
......@@ -520,6 +520,7 @@ ehci0: usb@1c14000 {
interrupts = <39>;
clocks = <&ccu CLK_AHB_EHCI0>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......@@ -529,6 +530,7 @@ ohci0: usb@1c14400 {
interrupts = <64>;
clocks = <&ccu CLK_USB_OHCI0>, <&ccu CLK_AHB_OHCI0>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......@@ -608,6 +610,7 @@ ehci1: usb@1c1c000 {
interrupts = <40>;
clocks = <&ccu CLK_AHB_EHCI1>;
phys = <&usbphy 2>;
phy-names = "usb";
status = "disabled";
};
......@@ -617,6 +620,7 @@ ohci1: usb@1c1c400 {
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
View file @ e6064cf4
......@@ -391,6 +391,7 @@ ehci0: usb@1c14000 {
interrupts = <39>;
clocks = <&ccu CLK_AHB_EHCI>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......@@ -400,6 +401,7 @@ ohci0: usb@1c14400 {
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
View file @ e6064cf4
......@@ -545,6 +545,7 @@ ehci0: usb@1c1a000 {
clocks = <&ccu CLK_AHB1_EHCI0>;
resets = <&ccu RST_AHB1_EHCI0>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......@@ -555,6 +556,7 @@ ohci0: usb@1c1a400 {
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 @@ ehci1: usb@1c1b000 {
clocks = <&ccu CLK_AHB1_EHCI1>;
resets = <&ccu RST_AHB1_EHCI1>;
phys = <&usbphy 2>;
phy-names = "usb";
status = "disabled";
};
......@@ -575,6 +578,7 @@ ohci1: usb@1c1b400 {
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
View file @ e6064cf4
......@@ -623,6 +623,7 @@ ehci0: usb@1c14000 {
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 @@ ohci0: usb@1c14400 {
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 @@ ehci1: usb@1c1c000 {
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 @@ ohci1: usb@1c1c400 {
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
View file @ e6064cf4
......@@ -307,6 +307,7 @@ ehci0: usb@1c1a000 {
clocks = <&ccu CLK_BUS_EHCI>;
resets = <&ccu RST_BUS_EHCI>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......@@ -317,6 +318,7 @@ ohci0: usb@1c1a400 {
clocks = <&ccu CLK_BUS_OHCI>, <&ccu CLK_USB_OHCI>;
resets = <&ccu RST_BUS_OHCI>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......
arch/arm/boot/dts/sun8i-a83t.dtsi
View file @ e6064cf4
......@@ -632,6 +632,7 @@ ehci0: usb@1c1a000 {
clocks = <&ccu CLK_BUS_EHCI0>;
resets = <&ccu RST_BUS_EHCI0>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......@@ -643,6 +644,7 @@ ohci0: usb@1c1a400 {
clocks = <&ccu CLK_BUS_OHCI0>, <&ccu CLK_USB_OHCI0>;
resets = <&ccu RST_BUS_OHCI0>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......@@ -654,6 +656,7 @@ ehci1: usb@1c1b000 {
clocks = <&ccu CLK_BUS_EHCI1>;
resets = <&ccu RST_BUS_EHCI1>;
phys = <&usbphy 2>;
phy-names = "usb";
status = "disabled";
};
......
arch/arm/boot/dts/sun8i-r40.dtsi
View file @ e6064cf4
......@@ -273,6 +273,7 @@ ehci1: usb@1c19000 {
clocks = <&ccu CLK_BUS_EHCI1>;
resets = <&ccu RST_BUS_EHCI1>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......@@ -284,6 +285,7 @@ ohci1: usb@1c19400 {
<&ccu CLK_USB_OHCI1>;
resets = <&ccu RST_BUS_OHCI1>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......@@ -294,6 +296,7 @@ ehci2: usb@1c1c000 {
clocks = <&ccu CLK_BUS_EHCI2>;
resets = <&ccu RST_BUS_EHCI2>;
phys = <&usbphy 2>;
phy-names = "usb";
status = "disabled";
};
......@@ -305,6 +308,7 @@ ohci2: usb@1c1c400 {
<&ccu CLK_USB_OHCI2>;
resets = <&ccu RST_BUS_OHCI2>;
phys = <&usbphy 2>;
phy-names = "usb";
status = "disabled";
};
......
arch/arm/boot/dts/sun9i-a80.dtsi
View file @ e6064cf4
......@@ -346,6 +346,7 @@ ehci0: usb@a00000 {
clocks = <&usb_clocks CLK_BUS_HCI0>;
resets = <&usb_clocks RST_USB0_HCI>;
phys = <&usbphy1>;
phy-names = "usb";
status = "disabled";
};
......@@ -357,6 +358,7 @@ ohci0: usb@a00400 {
<&usb_clocks CLK_USB_OHCI0>;
resets = <&usb_clocks RST_USB0_HCI>;
phys = <&usbphy1>;
phy-names = "usb";
status = "disabled";
};
......@@ -378,6 +380,7 @@ ehci1: usb@a01000 {
clocks = <&usb_clocks CLK_BUS_HCI1>;
resets = <&usb_clocks RST_USB1_HCI>;
phys = <&usbphy2>;
phy-names = "usb";
status = "disabled";
};
......@@ -407,6 +410,7 @@ ehci2: usb@a02000 {
clocks = <&usb_clocks CLK_BUS_HCI2>;
resets = <&usb_clocks RST_USB2_HCI>;
phys = <&usbphy3>;
phy-names = "usb";
status = "disabled";
};
......@@ -418,6 +422,7 @@ ohci2: usb@a02400 {
<&usb_clocks CLK_USB_OHCI2>;
resets = <&usb_clocks RST_USB2_HCI>;
phys = <&usbphy3>;
phy-names = "usb";
status = "disabled";
};
......
arch/arm/boot/dts/sunxi-h3-h5.dtsi
View file @ e6064cf4
......@@ -304,6 +304,7 @@ ehci1: usb@1c1b000 {
clocks = <&ccu CLK_BUS_EHCI1>, <&ccu CLK_BUS_OHCI1>;
resets = <&ccu RST_BUS_EHCI1>, <&ccu RST_BUS_OHCI1>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......@@ -315,6 +316,7 @@ ohci1: usb@1c1b400 {
<&ccu CLK_USB_OHCI1>;
resets = <&ccu RST_BUS_EHCI1>, <&ccu RST_BUS_OHCI1>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......@@ -325,6 +327,7 @@ ehci2: usb@1c1c000 {
clocks = <&ccu CLK_BUS_EHCI2>, <&ccu CLK_BUS_OHCI2>;
resets = <&ccu RST_BUS_EHCI2>, <&ccu RST_BUS_OHCI2>;
phys = <&usbphy 2>;
phy-names = "usb";
status = "disabled";
};
......@@ -336,6 +339,7 @@ ohci2: usb@1c1c400 {
<&ccu CLK_USB_OHCI2>;
resets = <&ccu RST_BUS_EHCI2>, <&ccu RST_BUS_OHCI2>;
phys = <&usbphy 2>;
phy-names = "usb";
status = "disabled";
};
......@@ -346,6 +350,7 @@ ehci3: usb@1c1d000 {
clocks = <&ccu CLK_BUS_EHCI3>, <&ccu CLK_BUS_OHCI3>;
resets = <&ccu RST_BUS_EHCI3>, <&ccu RST_BUS_OHCI3>;
phys = <&usbphy 3>;
phy-names = "usb";
status = "disabled";
};
......@@ -357,6 +362,7 @@ ohci3: usb@1c1d400 {
<&ccu CLK_USB_OHCI3>;
resets = <&ccu RST_BUS_EHCI3>, <&ccu RST_BUS_OHCI3>;
phys = <&usbphy 3>;
phy-names = "usb";
status = "disabled";
};
......
arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
View file @ e6064cf4
......@@ -104,6 +104,7 @@ &dai {
&ehci0 {
phys = <&usbphy 0>;
phy-names = "usb";
status = "okay";
};
......@@ -150,6 +151,7 @@ &mmc2 {
&ohci0 {
phys = <&usbphy 0>;
phy-names = "usb";
status = "okay";
};
......
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
View file @ e6064cf4
......@@ -553,6 +553,7 @@ ehci1: usb@1c1b000 {
resets = <&ccu RST_BUS_OHCI1>,
<&ccu RST_BUS_EHCI1>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......@@ -564,6 +565,7 @@ ohci1: usb@1c1b400 {
<&ccu CLK_USB_OHCI1>;
resets = <&ccu RST_BUS_OHCI1>;
phys = <&usbphy 1>;
phy-names = "usb";
status = "disabled";
};
......
arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
View file @ e6064cf4
......@@ -547,6 +547,7 @@ ehci3: usb@5311000 {
resets = <&ccu RST_BUS_OHCI3>,
<&ccu RST_BUS_EHCI3>;
phys = <&usb2phy 3>;
phy-names = "usb";
status = "disabled";
};
......@@ -558,6 +559,7 @@ ohci3: usb@5311400 {
<&ccu CLK_USB_OHCI3>;
resets = <&ccu RST_BUS_OHCI3>;
phys = <&usb2phy 3>;
phy-names = "usb";
status = "disabled";
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7