Skip to contentSkip to conversation

ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i

PATCH New Chen-Yu Tsai 2 participants 2 messages Dec 18, 2014 – Dec 19, 2014

Subsystems (2)
Device tree bindings Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

Chen-Yu Tsai

author
#0 lore raw

PATCH 1/1 ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i

usbphy0 support in the sunxi usb-phy driver has been merged, but the dtsi's for sun4i/sun5i haven't been updated. This results in the phy driver failing to load, breaking usb support.

Fixes 6827a46f5994 ('phy: sun4i: add support for USB phy0')
Signed-off-by Chen-Yu Tsai <[email protected]>

---

Hi Maxime,

The phy-sun4i-usb usbphy0 update is merged into Linus's tree. Please queue this one for 3.19 fixes.

---
 arch/arm/boot/dts/sun4i-a10.dtsi  | 4 ++--
 arch/arm/boot/dts/sun5i-a10s.dtsi | 4 ++--
 arch/arm/boot/dts/sun5i-a13.dtsi  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/sun4i-a10.dtsi +2 -2
index 7b4099fcf817..e3422309e54b 100644
@@ -438,8 +438,8 @@
 			reg-names = "phy_ctrl", "pmu1", "pmu2";
 			clocks = <&usb_clk 8>;
 			clock-names = "usb_phy";
-			resets = <&usb_clk 1>, <&usb_clk 2>;
-			reset-names = "usb1_reset", "usb2_reset";
+			resets = <&usb_clk 0>, <&usb_clk 1>, <&usb_clk 2>;
+			reset-names = "usb0_reset", "usb1_reset", "usb2_reset";
 			status = "disabled";
 		};
arch/arm/boot/dts/sun5i-a10s.dtsi +2 -2
index 1b76667f3182..3c3c1920788a 100644
@@ -390,8 +390,8 @@
 			reg-names = "phy_ctrl", "pmu1";
 			clocks = <&usb_clk 8>;
 			clock-names = "usb_phy";
-			resets = <&usb_clk 1>;
-			reset-names = "usb1_reset";
+			resets = <&usb_clk 0>, <&usb_clk 1>;
+			reset-names = "usb0_reset", "usb1_reset";
 			status = "disabled";
 		};
arch/arm/boot/dts/sun5i-a13.dtsi +2 -2
index c35217ea1f64..2448d7f38d6b 100644
@@ -349,8 +349,8 @@
 			reg-names = "phy_ctrl", "pmu1";
 			clocks = <&usb_clk 8>;
 			clock-names = "usb_phy";
-			resets = <&usb_clk 1>;
-			reset-names = "usb1_reset";
+			resets = <&usb_clk 0>, <&usb_clk 1>;
+			reset-names = "usb0_reset", "usb1_reset";
 			status = "disabled";
 		};
Signature · 1 line
2.1.3
Applied
#1 lore raw

PATCH 1/1 ARM: dts: sunxi: Fix usb-phy support for sun4i/sun5i

Quoted 4 lines · Chen-Yu Tsai

usbphy0 support in the sunxi usb-phy driver has been merged, but the dtsi's for sun4i/sun5i haven't been updated. This results in the phy driver failing to load, breaking usb support.

Quoted 8 lines
Fixes 6827a46f5994 ('phy: sun4i: add support for USB phy0')
Signed-off-by Chen-Yu Tsai <[email protected]>

---

Hi Maxime,

The phy-sun4i-usb usbphy0 update is merged into Linus's tree. Please queue this one for 3.19 fixes.

Applied, thanks!

Maxime

Signature · 10 lines
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141219/f2ae0d21/attachment-0001.sig>