diff options
author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-07-08 13:36:40 -0400 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2008-07-16 18:57:38 -0400 |
commit | 69ad7e73dee33f8e0680825006c801ca6b4bf470 (patch) | |
tree | 1dc9d10c972d152b932ec3f11f899f0d1c789e72 /arch | |
parent | c0a2015965d42f58d3b50c59bd139bc2419bc7f9 (diff) |
powerpc/fsl_soc: gianfar: don't probe disabled devices
Freescale ships MPC8315E-RDB boards in two variants:
1. With TSEC1 ethernet support and USB UTMI PHY;
2. Without TSEC1 support, but with USB ULPI PHY in addition.
For the second case U-Boot will add status = "disabled"; property
into the TSEC1 node, so Linux should not try to probe it.
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/sysdev/fsl_soc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index ebcec7362f95..ca180a93bca1 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c | |||
@@ -296,6 +296,9 @@ static int __init gfar_of_init(void) | |||
296 | const phandle *ph; | 296 | const phandle *ph; |
297 | int n_res = 2; | 297 | int n_res = 2; |
298 | 298 | ||
299 | if (!of_device_is_available(np)) | ||
300 | continue; | ||
301 | |||
299 | memset(r, 0, sizeof(r)); | 302 | memset(r, 0, sizeof(r)); |
300 | memset(&gfar_data, 0, sizeof(gfar_data)); | 303 | memset(&gfar_data, 0, sizeof(gfar_data)); |
301 | 304 | ||