diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-02-19 11:02:23 -0500 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2009-03-09 10:25:37 -0400 |
commit | c026c98739c7e435440e76cbcd96e0f8ebeeada0 (patch) | |
tree | 98f0ddc17ef2a3123888f2259b1999b32c905909 /arch/powerpc/platforms/83xx | |
parent | 30c404699dd650f213d480d263c775915a0e1297 (diff) |
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.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/83xx')
-rw-r--r-- | arch/powerpc/platforms/83xx/usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/83xx/usb.c b/arch/powerpc/platforms/83xx/usb.c index cc99c280aad9..11e1fac17c7f 100644 --- a/arch/powerpc/platforms/83xx/usb.c +++ b/arch/powerpc/platforms/83xx/usb.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
16 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
17 | #include <linux/of.h> | ||
17 | 18 | ||
18 | #include <asm/io.h> | 19 | #include <asm/io.h> |
19 | #include <asm/prom.h> | 20 | #include <asm/prom.h> |
@@ -210,7 +211,7 @@ int mpc837x_usb_cfg(void) | |||
210 | int ret = 0; | 211 | int ret = 0; |
211 | 212 | ||
212 | np = of_find_compatible_node(NULL, NULL, "fsl-usb2-dr"); | 213 | np = of_find_compatible_node(NULL, NULL, "fsl-usb2-dr"); |
213 | if (!np) | 214 | if (!np || !of_device_is_available(np)) |
214 | return -ENODEV; | 215 | return -ENODEV; |
215 | prop = of_get_property(np, "phy_type", NULL); | 216 | prop = of_get_property(np, "phy_type", NULL); |
216 | 217 | ||