[PATCH 2/2] powerpc/fsl_soc: gianfar: don't probe disabled devices

[PATCH 2/2] powerpc/fsl_soc: gianfar: don't probe disabled devices

[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.

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>
---
 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 7d4cf00..2a19769 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));
 
-- 
1.5.5.4

Re: [PATCH 2/2] powerpc/fsl_soc: gianfar: don't probe disabled devices

[Kumar Gala]

On Jul 8, 2008, at 12:36 PM, Anton Vorontsov wrote:

> 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>
> ---
> arch/powerpc/sysdev/fsl_soc.c |    3 +++
> 1 files changed, 3 insertions(+), 0 deletions(-)

applied.

- k