[PATCH 3.19 REGRESSION FIX] ARM: dts: Fix missing usb0

All of lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH 3.19 REGRESSION FIX] ARM: dts: Fix missing usb0_reset for sun4i / sun5i
@ 2014-12-24 19:19 ` Hans de Goede
  0 siblings, 0 replies; 8+ messages in thread
From: Hans de Goede @ 2014-12-24 19:19 UTC (permalink / raw)
  To: linux-arm-kernel

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 3.19 REGRESSION FIX] ARM: dts: Fix missing usb0_reset for sun4i / sun5i
@ 2014-12-24 19:19 ` Hans de Goede
  0 siblings, 0 replies; 8+ messages in thread
From: Hans de Goede @ 2014-12-24 19:19 UTC (permalink / raw)
  To: Maxime Ripard
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree,
	linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, Roman Byshko, Alain Durand

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] ARM: dts: Fix missing usb0_reset for sun4i / sun5i
@ 2014-12-24 19:19   ` Hans de Goede
  0 siblings, 0 replies; 8+ messages in thread
From: Hans de Goede @ 2014-12-24 19:19 UTC (permalink / raw)
  To: linux-arm-kernel

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 <hdegoede@redhat.com>
---
 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(-)

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 03e6843..356efb8 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -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";
 		};
 
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index f936b03..668521d 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -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";
 		};
 
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index 3306254..02a9459 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [PATCH] ARM: dts: Fix missing usb0_reset for sun4i / sun5i
@ 2014-12-24 19:19   ` Hans de Goede
  0 siblings, 0 replies; 8+ messages in thread
From: Hans de Goede @ 2014-12-24 19:19 UTC (permalink / raw)
  To: Maxime Ripard
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree,
	linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, Roman Byshko, Alain Durand,
	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 <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 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(-)

diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index 03e6843..356efb8 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -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";
 		};
 
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index f936b03..668521d 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -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";
 		};
 
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index 3306254..02a9459 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [linux-sunxi] [PATCH] ARM: dts: Fix missing usb0_reset for sun4i / sun5i
@ 2014-12-25  8:13     ` Paul Jones
  0 siblings, 0 replies; 8+ messages in thread
From: Paul Jones @ 2014-12-25  8:13 UTC (permalink / raw)
  To: linux-arm-kernel

> -----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
> 
> 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.
 
> [    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 <hdegoede@redhat.com>
> ---
>  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(-)
> 
> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-
> a10.dtsi
> index 03e6843..356efb8 100644
> --- a/arch/arm/boot/dts/sun4i-a10.dtsi
> +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
> @@ -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";
>  		};
> 
> diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-
> a10s.dtsi
> index f936b03..668521d 100644
> --- a/arch/arm/boot/dts/sun5i-a10s.dtsi
> +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
> @@ -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";
>  		};
> 
> diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-
> a13.dtsi
> index 3306254..02a9459 100644
> --- a/arch/arm/boot/dts/sun5i-a13.dtsi
> +++ b/arch/arm/boot/dts/sun5i-a13.dtsi
> @@ -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.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* RE: [PATCH] ARM: dts: Fix missing usb0_reset for sun4i / sun5i
@ 2014-12-25  8:13     ` Paul Jones
  0 siblings, 0 replies; 8+ messages in thread
From: Paul Jones @ 2014-12-25  8:13 UTC (permalink / raw)
  To: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org,
	Maxime Ripard
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	devicetree, Roman Byshko, Alain Durand

> -----Original Message-----
> From: linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org [mailto:linux-
> sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org] On Behalf Of Hans de Goede
> Sent: Thursday, 25 December 2014 6:19 AM
> To: Maxime Ripard
> Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org; devicetree; linux-
> sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org; Roman Byshko; Alain Durand; Hans de Goede
> Subject: [linux-sunxi] [PATCH] 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:

Should that be otg phy?


Paul.
 
> [    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 <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
>  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(-)
> 
> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-
> a10.dtsi
> index 03e6843..356efb8 100644
> --- a/arch/arm/boot/dts/sun4i-a10.dtsi
> +++ b/arch/arm/boot/dts/sun4i-a10.dtsi
> @@ -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";
>  		};
> 
> diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-
> a10s.dtsi
> index f936b03..668521d 100644
> --- a/arch/arm/boot/dts/sun5i-a10s.dtsi
> +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
> @@ -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";
>  		};
> 
> diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-
> a13.dtsi
> index 3306254..02a9459 100644
> --- a/arch/arm/boot/dts/sun5i-a13.dtsi
> +++ b/arch/arm/boot/dts/sun5i-a13.dtsi
> @@ -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-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
> For more options, visit https://groups.google.com/d/optout.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH] ARM: dts: Fix missing usb0_reset for sun4i / sun5i
@ 2015-01-05 13:50     ` Maxime Ripard
  0 siblings, 0 replies; 8+ messages in thread
From: Maxime Ripard @ 2015-01-05 13:50 UTC (permalink / raw)
  To: linux-arm-kernel

Hi Hans,

On Wed, Dec 24, 2014 at 08:19:18PM +0100, Hans de Goede wrote:
> 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 <hdegoede@redhat.com>

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

-- 
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>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH] ARM: dts: Fix missing usb0_reset for sun4i / sun5i
@ 2015-01-05 13:50     ` Maxime Ripard
  0 siblings, 0 replies; 8+ messages in thread
From: Maxime Ripard @ 2015-01-05 13:50 UTC (permalink / raw)
  To: Hans de Goede
  Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, devicetree,
	linux-sunxi-/JYPxA39Uh5TLH3MbocFFw, Roman Byshko, Alain Durand

[-- Attachment #1: Type: text/plain, Size: 918 bytes --]

Hi Hans,

On Wed, Dec 24, 2014 at 08:19:18PM +0100, Hans de Goede wrote:
> 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 <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

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

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2015-01-05 13:50 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-24 19:19 [PATCH 3.19 REGRESSION FIX] ARM: dts: Fix missing usb0_reset for sun4i / sun5i Hans de Goede
2014-12-24 19:19 ` Hans de Goede
2014-12-24 19:19 ` [PATCH] " Hans de Goede
2014-12-24 19:19   ` Hans de Goede
2014-12-25  8:13   ` [linux-sunxi] " Paul Jones
2014-12-25  8:13     ` Paul Jones
2015-01-05 13:50   ` Maxime Ripard
2015-01-05 13:50     ` Maxime Ripard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.