Skip to contentSkip to conversation

powerpc/fsl_soc: gianfar: don't probe disabled devices

PATCH Applied Anton Vorontsov 2 participants 2 messages Jul 8, 2008 – Jul 15, 2008 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 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.

---
 arch/powerpc/sysdev/fsl_soc.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
arch/powerpc/sysdev/fsl_soc.c +3 -0
index 7d4cf00..2a19769 100644
@@ -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));
 
Signature · 1 line
1.5.5.4
Applied
#1 lore raw
Quoted 5 lines · Anton Vorontsov

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.

Quoted 7 lines

For the second case U-Boot will add status = "disabled"; property into the TSEC1 node, so Linux should not try to probe it.

---
arch/powerpc/sysdev/fsl_soc.c | 3 +++

1 files changed, 3 insertions(+), 0 deletions(-)

applied.

- k