Skip to contentSkip to conversation

ARM: dts: Fix missing usb0_reset for sun4i / sun5i

PATCH New Hans de Goede 3 participants 4 messages Dec 24, 2014 – Jan 5, 2015

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

Hans de Goede

author
#0 lore raw

PATCH 1/1 ARM: dts: Fix missing usb0_reset for sun4i / sun5i

Hi Maxime,

The recent sun4i-usb-phy changes to add (preliminary) support for the oth phy, cause the ehci/ohci controllers to no longer work on sun4i / sun5i, because the phy driver refuses to load due to a missing usb0_reset reset controller in the dts files for sun4i / sun5i:

[    0.094293] sun4i-usb-phy 1c13400.phy: failed to get reset usb0_reset
[    0.094326] sun4i-usb-phy: probe of 1c13400.phy failed with error -22

This patch fixes this, please queue this up as a fix for 3.19 .

Regards,

Hans

author
#1 lore raw

PATCH 1/1 ARM: dts: Fix missing usb0_reset for sun4i / sun5i

The recent sun4i-usb-phy changes to add (preliminary) support for the oth phy, cause the ehci/ohci controllers to no longer work on sun4i / sun5i, because the phy driver refuses to load due to a missing usb0_reset reset controller in the dts files for sun4i / sun5i:

[    0.094293] sun4i-usb-phy 1c13400.phy: failed to get reset usb0_reset
[    0.094326] sun4i-usb-phy: probe of 1c13400.phy failed with error -22

This fixes this.

Signed-off-by Hans de Goede <[email protected]>
---
 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 03e6843..356efb8 100644
@@ -445,8 +445,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 f936b03..668521d 100644
@@ -397,8 +397,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 3306254..02a9459 100644
@@ -362,8 +362,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.0
#2 lore raw

PATCH 1/1 ARM: dts: Fix missing usb0_reset for sun4i / sun5i

Quoted 10 lines

-----Original Message-----
From: linux-sunxi at googlegroups.com [mailto:linux-
sunxi at googlegroups.com] On Behalf Of Hans de Goede
Sent: Thursday, 25 December 2014 6:19 AM
To: Maxime Ripard
Cc: linux-arm-kernel at lists.infradead.org; devicetree; linux- sunxi at googlegroups.com; Roman Byshko; Alain Durand; Hans de Goede
Subject: [linux-sunxi] [PATCH] ARM: dts: Fix missing usb0_reset for sun4i / sun5i

Quoted 4 lines

The recent sun4i-usb-phy changes to add (preliminary) support for the oth phy, cause the ehci/ohci controllers to no longer work on sun4i / sun5i, because the phy driver refuses to load due to a missing usb0_reset reset controller in the dts files for sun4i / sun5i:

Should that be otg phy?

Paul.

Quoted 69 lines
[    0.094293] sun4i-usb-phy 1c13400.phy: failed to get reset usb0_reset
[    0.094326] sun4i-usb-phy: probe of 1c13400.phy failed with error -22

This fixes this.

Signed-off-by Hans de Goede <[email protected]>

---
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- renamed from arch/arm/boot/dts/sun4i-a10.dtsi +0 -0

a10.dtsi
index 03e6843..356efb8 100644

arch/arm/boot/dts/sun4i-a10.dtsi +2 -2
@@ -445,8 +445,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- renamed from arch/arm/boot/dts/sun5i-a10s.dtsi +0 -0

a10s.dtsi
index f936b03..668521d 100644

arch/arm/boot/dts/sun5i-a10s.dtsi +2 -2
@@ -397,8 +397,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- renamed from arch/arm/boot/dts/sun5i-a13.dtsi +0 -0

a13.dtsi
index 3306254..02a9459 100644

arch/arm/boot/dts/sun5i-a13.dtsi +2 -3
@@ -362,8 +362,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";
 		};
 
--

2.1.0

--
You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe at googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

#3 lore raw

PATCH 1/1 ARM: dts: Fix missing usb0_reset for sun4i / sun5i

In reply to Hans de Goede

Hi Hans,

Quoted 11 lines · Hans de Goede

The recent sun4i-usb-phy changes to add (preliminary) support for the oth phy, cause the ehci/ohci controllers to no longer work on sun4i / sun5i, because the phy driver refuses to load due to a missing usb0_reset reset controller in the dts files for sun4i / sun5i:

[    0.094293] sun4i-usb-phy 1c13400.phy: failed to get reset usb0_reset
[    0.094326] sun4i-usb-phy: probe of 1c13400.phy failed with error -22

This fixes this.

Signed-off-by Hans de Goede <[email protected]>

Thanks for this. Chen-Yu submitted a similar patch before the holidays that I queued for 3.19, but didn't push at the time.

It's now pushed as part as sunxi/fixes-for-3.19, and sunxi/for-next.

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/20150105/6207df47/attachment.sig>