[PATCH 2/2] Pb1200: do register SMC 91C111

[PATCH 2/2] Pb1200: do register SMC 91C111

[Sergei Shtylyov]

Pb1200 does have SMC 91C111 Ethernet chip on board but the platform code did
not register it, so one couldn't mount NFS...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

---
This is definitely a bad place for the board #ifdef's, so I'm going to submit
a patch moving IDE and 91C111 registration into arch/mips/au1000/pb1200/...

 arch/mips/au1000/common/platform.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

Index: linux-2.6/arch/mips/au1000/common/platform.c
===================================================================
--- linux-2.6.orig/arch/mips/au1000/common/platform.c
+++ linux-2.6/arch/mips/au1000/common/platform.c
@@ -245,8 +245,7 @@ static struct platform_device au1x00_pcm
 	.id 		= 0,
 };
 
-#ifdef CONFIG_MIPS_DB1200
-
+#if defined(CONFIG_MIPS_DB1200) || defined(CONFIG_MIPS_PB1200)
 static struct resource smc91x_resources[] = {
 	[0] = {
 		.name	= "smc91x-regs",
@@ -267,8 +266,7 @@ static struct platform_device smc91x_dev
 	.num_resources	= ARRAY_SIZE(smc91x_resources),
 	.resource	= smc91x_resources,
 };
-
-#endif
+#endif /* defined(CONFIG_MIPS_DB1200) || defined(CONFIG_MIPS_PB1200) */
 
 /* All Alchemy demoboards with I2C have this #define in their headers */
 #ifdef SMBUS_PSC_BASE
@@ -302,7 +300,7 @@ static struct platform_device *au1xxx_pl
 	&au1200_ide0_device,
 	&au1xxx_mmc_device,
 #endif
-#ifdef CONFIG_MIPS_DB1200
+#if defined(CONFIG_MIPS_DB1200) || defined(CONFIG_MIPS_PB1200)
 	&smc91x_device,
 #endif
 #ifdef SMBUS_PSC_BASE

Re: [PATCH 2/2] Pb1200: do register SMC 91C111

[Sergei Shtylyov]

Hello, I wrote:

> Pb1200 does have SMC 91C111 Ethernet chip on board but the platform code did
> not register it, so one couldn't mount NFS...

> Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

> ---
> This is definitely a bad place for the board #ifdef's, so I'm going to submit
> a patch moving IDE and 91C111 registration into arch/mips/au1000/pb1200/...

    Err, Ralf, since these 2 patches haven't got merged and haven't got into 
2.6.25 anyway, maybe it makes sense to ignore them, so that I do these change 
along with moving the code into arch/mips/au1000/pb1200/platform.c?

WBR, Sergei

Re: [PATCH 2/2] Pb1200: do register SMC 91C111

[Ralf Baechle]

On Tue, Apr 15, 2008 at 10:26:18PM +0400, Sergei Shtylyov wrote:
> From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
> Date: Tue, 15 Apr 2008 22:26:18 +0400
> To: ralf@linux-mips.org
> Cc: linux-mips@linux-mips.org
> Subject: [PATCH 2/2] Pb1200: do register SMC 91C111

Applied, thanks.

  Ralf