Skip to contentSkip to conversation

powerpc/83xx: Do not configure or probe disabled FSL DR USB controllers

PATCH Applied Anton Vorontsov 2 participants 4 messages Feb 19, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 powerpc/83xx: Do not configure or probe disabled FSL DR USB controllers

On MPC837X CPUs Dual-Role USB isn't always available (for example DR USB pins can be muxed away to eSDHC).

U-Boot adds status = "disabled" property into the DR USB nodes to indicate that we must not try to configure or probe Dual-Role USB, otherwise we'll break eSDHC support on targets with MPC837X CPUs.

---
 arch/powerpc/platforms/83xx/usb.c |    3 ++-
 arch/powerpc/sysdev/fsl_soc.c     |    4 ++++
 2 files changed, 6 insertions(+), 1 deletions(-)
arch/powerpc/platforms/83xx/usb.c +2 -1
index cc99c28..11e1fac 100644
@@ -14,6 +14,7 @@
 #include <linux/stddef.h>
 #include <linux/kernel.h>
 #include <linux/errno.h>
+#include <linux/of.h>
 
 #include <asm/io.h>
 #include <asm/prom.h>
@@ -210,7 +211,7 @@ int mpc837x_usb_cfg(void)
 	int ret = 0;
 
 	np = of_find_compatible_node(NULL, NULL, "fsl-usb2-dr");
-	if (!np)
+	if (!np || !of_device_is_available(np))
 		return -ENODEV;
 	prop = of_get_property(np, "phy_type", NULL);
 
arch/powerpc/sysdev/fsl_soc.c +4 -0
index 18e49ef..afe8dbc 100644
@@ -22,6 +22,7 @@
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/phy.h>
 #include <linux/phy_fixed.h>
@@ -328,6 +329,9 @@ static int __init fsl_usb_of_init(void)
 		struct fsl_usb2_platform_data usb_data;
 		const unsigned char *prop = NULL;
 
+		if (!of_device_is_available(np))
+			continue;
+
 		memset(&r, 0, sizeof(r));
 		memset(&usb_data, 0, sizeof(usb_data));
 
Signature · 1 line
1.5.6.5
#1 lore raw
Quoted 7 lines · Anton Vorontsov

On MPC837X CPUs Dual-Role USB isn't always available (for example DR USB pins can be muxed away to eSDHC).

U-Boot adds status = "disabled" property into the DR USB nodes to indicate that we must not try to configure or probe Dual-Role USB, otherwise we'll break eSDHC support on targets with MPC837X CPUs.

Quoted 5 lines

---

arch/powerpc/platforms/83xx/usb.c |    3 ++-
arch/powerpc/sysdev/fsl_soc.c     |    4 ++++
2 files changed, 6 insertions(+), 1 deletions(-)

Mind looking at possibly killing the fsl_soc.c usb code and making the usb a real of-platform driver?

- k

#2 lore raw
Quoted 10 lines · Kumar Gala
Quoted 7 lines · Anton Vorontsov

On MPC837X CPUs Dual-Role USB isn't always available (for example DR USB pins can be muxed away to eSDHC).

U-Boot adds status = "disabled" property into the DR USB nodes to indicate that we must not try to configure or probe Dual-Role USB, otherwise we'll break eSDHC support on targets with MPC837X CPUs.

Quoted 8 lines
Quoted 5 lines

---

arch/powerpc/platforms/83xx/usb.c |    3 ++-
arch/powerpc/sysdev/fsl_soc.c     |    4 ++++
2 files changed, 6 insertions(+), 1 deletions(-)

Mind looking at possibly killing the fsl_soc.c usb code and making the usb a real of-platform driver?

Sure, but it's a bit complicated because of OTG support (which doesn't currently work, btw).

Just need to think about whether we want to leave UDC and HOST drivers as pure platform drivers, and implement an of platform driver as a proxy for Host/UDC/OTG...

Thanks,

Signature · 3 lines
Anton Vorontsov
email: [email protected]
irc://irc.freenode.net/bd2
Applied
#3 lore raw
In reply to Anton Vorontsov
Quoted 7 lines · Anton Vorontsov

On MPC837X CPUs Dual-Role USB isn't always available (for example DR USB pins can be muxed away to eSDHC).

U-Boot adds status = "disabled" property into the DR USB nodes to indicate that we must not try to configure or probe Dual-Role USB, otherwise we'll break eSDHC support on targets with MPC837X CPUs.

Quoted 5 lines

---

arch/powerpc/platforms/83xx/usb.c |    3 ++-
arch/powerpc/sysdev/fsl_soc.c     |    4 ++++
2 files changed, 6 insertions(+), 1 deletions(-)

applied to next

- k