diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2008-07-08 21:36:40 +0400 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2008-07-16 17:57:38 -0500 |
| commit | 69ad7e73dee33f8e0680825006c801ca6b4bf470 (patch) | |
| tree | 1dc9d10c972d152b932ec3f11f899f0d1c789e72 /arch/powerpc/sysdev/fsl_soc.c | |
| parent | c0a2015965d42f58d3b50c59bd139bc2419bc7f9 (diff) | |
| download | kernel_goldelico_gta04-69ad7e73dee33f8e0680825006c801ca6b4bf470.zip kernel_goldelico_gta04-69ad7e73dee33f8e0680825006c801ca6b4bf470.tar.gz kernel_goldelico_gta04-69ad7e73dee33f8e0680825006c801ca6b4bf470.tar.bz2 | |
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/powerpc/sysdev/fsl_soc.c')
| -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 ebcec73..ca180a9 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) const phandle *ph; int n_res = 2; + if (!of_device_is_available(np)) + continue; + memset(r, 0, sizeof(r)); memset(&gfar_data, 0, sizeof(gfar_data)); |