[PATCH 10/10] pxa: make littleton to use the new smc91x platform data

[PATCH 10/10] pxa: make littleton to use the new smc91x platform data

[Eric Miao]

From: Eric Miao <eric.miao@marvell.com>

Signed-off-by: Eric Miao <eric.miao@marvell.com>
---
 arch/arm/mach-pxa/littleton.c |    9 +++++++++
 drivers/net/smc91x.h          |    3 ++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c
index 9a4f51d..dd759d0 100644
--- a/arch/arm/mach-pxa/littleton.c
+++ b/arch/arm/mach-pxa/littleton.c
@@ -20,6 +20,7 @@
 #include <linux/delay.h>
 #include <linux/platform_device.h>
 #include <linux/clk.h>
+#include <linux/smc91x.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -106,11 +107,19 @@ static struct resource smc91x_resources[] = {
 	}
 };
 
+static struct smc91x_platdata littleton_smc91x_info = {
+	.flags	= SMC91X_USE_8BIT | SMC91X_USE_16BIT |
+		  SMC91X_NOWAIT | SMC91X_USE_DMA,
+};
+
 static struct platform_device smc91x_device = {
 	.name		= "smc91x",
 	.id		= 0,
 	.num_resources	= ARRAY_SIZE(smc91x_resources),
 	.resource	= smc91x_resources,
+	.dev		= {
+		.platform_data = &littleton_smc91x_info,
+	},
 };
 
 #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index d55739c..46ebac8 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -42,7 +42,8 @@
 
 #if defined(CONFIG_ARCH_LUBBOCK) ||\
     defined(CONFIG_MACH_MAINSTONE) ||\
-    defined(CONFIG_MACH_ZYLONITE)
+    defined(CONFIG_MACH_ZYLONITE) ||\
+    defined(CONFIG_MACH_LITTLETON)
 
 #include <asm/mach-types.h>
 
-- 
1.5.4.3

Re: [PATCH 10/10] pxa: make littleton to use the new smc91x platform data

[Nicolas Pitre]

On Tue, 24 Jun 2008, Eric Miao wrote:

> From: Eric Miao <eric.miao@marvell.com>
> 
> Signed-off-by: Eric Miao <eric.miao@marvell.com>

Acked-by: Nicolas Pitre <nico@cam.org>

> ---
>  arch/arm/mach-pxa/littleton.c |    9 +++++++++
>  drivers/net/smc91x.h          |    3 ++-
>  2 files changed, 11 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c
> index 9a4f51d..dd759d0 100644
> --- a/arch/arm/mach-pxa/littleton.c
> +++ b/arch/arm/mach-pxa/littleton.c
> @@ -20,6 +20,7 @@
>  #include <linux/delay.h>
>  #include <linux/platform_device.h>
>  #include <linux/clk.h>
> +#include <linux/smc91x.h>
>  
>  #include <asm/types.h>
>  #include <asm/setup.h>
> @@ -106,11 +107,19 @@ static struct resource smc91x_resources[] = {
>  	}
>  };
>  
> +static struct smc91x_platdata littleton_smc91x_info = {
> +	.flags	= SMC91X_USE_8BIT | SMC91X_USE_16BIT |
> +		  SMC91X_NOWAIT | SMC91X_USE_DMA,
> +};
> +
>  static struct platform_device smc91x_device = {
>  	.name		= "smc91x",
>  	.id		= 0,
>  	.num_resources	= ARRAY_SIZE(smc91x_resources),
>  	.resource	= smc91x_resources,
> +	.dev		= {
> +		.platform_data = &littleton_smc91x_info,
> +	},
>  };
>  
>  #if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)
> diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
> index d55739c..46ebac8 100644
> --- a/drivers/net/smc91x.h
> +++ b/drivers/net/smc91x.h
> @@ -42,7 +42,8 @@
>  
>  #if defined(CONFIG_ARCH_LUBBOCK) ||\
>      defined(CONFIG_MACH_MAINSTONE) ||\
> -    defined(CONFIG_MACH_ZYLONITE)
> +    defined(CONFIG_MACH_ZYLONITE) ||\
> +    defined(CONFIG_MACH_LITTLETON)
>  
>  #include <asm/mach-types.h>
>  
> -- 
> 1.5.4.3
> 


Nicolas

Re: [PATCH 10/10] pxa: make littleton to use the new smc91x platform data

[Jeff Garzik]

Eric Miao wrote:
> From: Eric Miao <eric.miao@marvell.com>
> 
> Signed-off-by: Eric Miao <eric.miao@marvell.com>
> ---
>  arch/arm/mach-pxa/littleton.c |    9 +++++++++
>  drivers/net/smc91x.h          |    3 ++-
>  2 files changed, 11 insertions(+), 1 deletions(-)

The rest of the patches seem OK.

What do ARM people prefer -- should I ACK this series, and let it be 
merged via an ARM tree?

The series is mainly platform-oriented rather than net-oriented.

Re: [PATCH 10/10] pxa: make littleton to use the new smc91x platform data

[Eric Miao]

Jeff Garzik wrote:
> Eric Miao wrote:
>> From: Eric Miao <eric.miao@marvell.com>
>>
>> Signed-off-by: Eric Miao <eric.miao@marvell.com>
>> ---
>>  arch/arm/mach-pxa/littleton.c |    9 +++++++++
>>  drivers/net/smc91x.h          |    3 ++-
>>  2 files changed, 11 insertions(+), 1 deletions(-)
> 
> The rest of the patches seem OK.
> 
> What do ARM people prefer -- should I ACK this series, and let it be
> merged via an ARM tree?
> 

Well, I guess there are still some smc91x patches around and I'm not
sure if they will go inside the next merge window. So ideally, it'll
be best for "smc91x: *" patches go through the net-2.6, and I can
manage the rest to go through Russell's tree.

If you are OK with this, I'll send the smc91x specific patches to
you, together with Nico's Ack and a minor modification suggestion.

And either way will work if you prefer this to go through Russell's
arm tree.

> The series is mainly platform-oriented rather than net-oriented.
> 
> 

Yes, indeed.

Re: [PATCH 10/10] pxa: make littleton to use the new smc91x platform data

[Russell King - ARM Linux]

On Fri, Jun 27, 2008 at 01:58:07AM -0400, Jeff Garzik wrote:
> Eric Miao wrote:
> > From: Eric Miao <eric.miao@marvell.com>
> > 
> > Signed-off-by: Eric Miao <eric.miao@marvell.com>
> > ---
> >  arch/arm/mach-pxa/littleton.c |    9 +++++++++
> >  drivers/net/smc91x.h          |    3 ++-
> >  2 files changed, 11 insertions(+), 1 deletions(-)
> 
> The rest of the patches seem OK.
> 
> What do ARM people prefer -- should I ACK this series, and let it be 
> merged via an ARM tree?

I've not seen the patches, so I can't comment.