[PATCH 1/2] Add SMC_MEM_RESERVED for OMAP platform.

[PATCH 1/2] Add SMC_MEM_RESERVED for OMAP platform.

[Stanley.Miao]

The iomem resource for Ethernet device  has been reserved on omap24xx and
omap34xx. So, define SMC_MEM_RESERVED for them.

Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
---
 drivers/net/smc911x.c |    6 ++++--
 drivers/net/smc911x.h |   10 ++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c
index 1f26ab0..291ee46 100644
--- a/drivers/net/smc911x.c
+++ b/drivers/net/smc911x.c
@@ -2065,7 +2065,7 @@ static int smc911x_drv_probe(struct platform_device *pdev)
 		ret = -ENODEV;
 		goto out;
 	}
-
+#ifndef SMC_MEM_RESERVED
 	/*
 	 * Request the regions.
 	 */
@@ -2073,7 +2073,7 @@ static int smc911x_drv_probe(struct platform_device *pdev)
 		 ret = -EBUSY;
 		 goto out;
 	}
-
+#endif
 	ndev = alloc_etherdev(sizeof(struct smc911x_local));
 	if (!ndev) {
 		printk("%s: could not allocate device.\n", CARDNAME);
@@ -2110,7 +2110,9 @@ static int smc911x_drv_probe(struct platform_device *pdev)
 release_both:
 		free_netdev(ndev);
 release_1:
+#ifndef SMC_MEM_RESERVED
 		release_mem_region(res->start, SMC911X_IO_EXTENT);
+#endif
 out:
 		printk("%s: not found (%d).\n", CARDNAME, ret);
 	}
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index cc7d85b..d1b3b9b 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -42,6 +42,16 @@
   #define SMC_USE_16BIT		0
   #define SMC_USE_32BIT		1
   #define SMC_IRQ_SENSE		IRQF_TRIGGER_LOW
+#elif defined(CONFIG_ARCH_OMAP34XX)
+  #define SMC_USE_16BIT		0
+  #define SMC_USE_32BIT		1
+  #define SMC_IRQ_SENSE		IRQF_TRIGGER_LOW
+  #define SMC_MEM_RESERVED	1
+#elif defined(CONFIG_ARCH_OMAP24XX)
+  #define SMC_USE_16BIT		0
+  #define SMC_USE_32BIT		1
+  #define SMC_IRQ_SENSE		IRQF_TRIGGER_LOW
+  #define SMC_MEM_RESERVED	1
 #else
 /*
  * Default configuration
-- 
1.5.6.3

[PATCH 2/2] smc911x: Add support for LAN9211 chips from SMSC

[Stanley.Miao]

Add the define of LAN9211 in chip_ids.

Signed-off-by: Stanley.Miao <stanley.miao@windriver.com>
---
 drivers/net/smc911x.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index d1b3b9b..f688b55 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -682,6 +682,7 @@ smc_pxa_dma_outsl(struct smc911x_local *lp, u_long physaddr,
 #define CHIP_9116	0x0116
 #define CHIP_9117	0x0117
 #define CHIP_9118	0x0118
+#define CHIP_9211	0x9211
 #define CHIP_9215	0x115A
 #define CHIP_9217	0x117A
 #define CHIP_9218	0x118A
@@ -696,6 +697,7 @@ static const struct chip_id chip_ids[] =  {
 	{ CHIP_9116, "LAN9116" },
 	{ CHIP_9117, "LAN9117" },
 	{ CHIP_9118, "LAN9118" },
+	{ CHIP_9211, "LAN9211" },
 	{ CHIP_9215, "LAN9215" },
 	{ CHIP_9217, "LAN9217" },
 	{ CHIP_9218, "LAN9218" },
-- 
1.5.6.3

Re: [PATCH 1/2] Add SMC_MEM_RESERVED for OMAP platform.

[Steve.Glendinning]

Hi Stanley,

Jeff has merged the smsc911x driver into -next, this is intended to 
replace smc911x moving forward.  I'll forward the patchset to you 
off-list, it includes platform_data support for several platforms so 
adding support for omap should be simple.

> diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
> index cc7d85b..d1b3b9b 100644
> --- a/drivers/net/smc911x.h
> +++ b/drivers/net/smc911x.h
> @@ -42,6 +42,16 @@
>    #define SMC_USE_16BIT      0
>    #define SMC_USE_32BIT      1
>    #define SMC_IRQ_SENSE      IRQF_TRIGGER_LOW
> +#elif defined(CONFIG_ARCH_OMAP34XX)
> +  #define SMC_USE_16BIT      0
> +  #define SMC_USE_32BIT      1
> +  #define SMC_IRQ_SENSE      IRQF_TRIGGER_LOW
> +  #define SMC_MEM_RESERVED   1
> +#elif defined(CONFIG_ARCH_OMAP24XX)
> +  #define SMC_USE_16BIT      0
> +  #define SMC_USE_32BIT      1
> +  #define SMC_IRQ_SENSE      IRQF_TRIGGER_LOW
> +  #define SMC_MEM_RESERVED   1
>  #else
>  /*
>   * Default configuration

nack - this platform-specific configuration shouldn't be in the driver, 
SMC_DYNAMIC_BUS_CONFIG was added so this can be specified in 
platform_data.

Regards,
--
Steve Glendinning
SMSC GmbH
m: +44 777 933 9124
e: steve.glendinning@smsc.com

Re: [PATCH 1/2] Add SMC_MEM_RESERVED for OMAP platform.

[stanley.miao]

On Mon, 2008-11-17 at 10:31 +0000, Steve.Glendinning@smsc.com wrote:
> Hi Stanley,
> 
> Jeff has merged the smsc911x driver into -next, this is intended to 
> replace smc911x moving forward.  I'll forward the patchset to you 
> off-list, it includes platform_data support for several platforms so 
> adding support for omap should be simple.

OK, Thanks.

Stanley.

> 
> > diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
> > index cc7d85b..d1b3b9b 100644
> > --- a/drivers/net/smc911x.h
> > +++ b/drivers/net/smc911x.h
> > @@ -42,6 +42,16 @@
> >    #define SMC_USE_16BIT      0
> >    #define SMC_USE_32BIT      1
> >    #define SMC_IRQ_SENSE      IRQF_TRIGGER_LOW
> > +#elif defined(CONFIG_ARCH_OMAP34XX)
> > +  #define SMC_USE_16BIT      0
> > +  #define SMC_USE_32BIT      1
> > +  #define SMC_IRQ_SENSE      IRQF_TRIGGER_LOW
> > +  #define SMC_MEM_RESERVED   1
> > +#elif defined(CONFIG_ARCH_OMAP24XX)
> > +  #define SMC_USE_16BIT      0
> > +  #define SMC_USE_32BIT      1
> > +  #define SMC_IRQ_SENSE      IRQF_TRIGGER_LOW
> > +  #define SMC_MEM_RESERVED   1
> >  #else
> >  /*
> >   * Default configuration
> 
> nack - this platform-specific configuration shouldn't be in the driver, 
> SMC_DYNAMIC_BUS_CONFIG was added so this can be specified in 
> platform_data.
> 
> Regards,
> --
> Steve Glendinning
> SMSC GmbH
> m: +44 777 933 9124
> e: steve.glendinning@smsc.com
>