summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/fsl_soc.c
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2008-07-08 19:36:40 +0200
committerKumar Gala <galak@kernel.crashing.org>2008-07-17 00:57:38 +0200
commit69ad7e73dee33f8e0680825006c801ca6b4bf470 (patch)
tree1dc9d10c972d152b932ec3f11f899f0d1c789e72 /arch/powerpc/sysdev/fsl_soc.c
parentpowerpc/83xx: fix ULPI setup for MPC8315 processors (diff)
downloadlinux-69ad7e73dee33f8e0680825006c801ca6b4bf470.tar.xz
linux-69ad7e73dee33f8e0680825006c801ca6b4bf470.zip
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.c3
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)
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));