diff options
| author | Eric Miao <eric.miao@marvell.com> | 2008-06-24 16:49:41 +0800 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-12 21:52:41 +0100 |
| commit | e1719da689378de5c252ea0f51f5f76cc75fd629 (patch) | |
| tree | 3eaf18dd3a83cbfa2c01819e18917bc7e6c74a19 | |
| parent | 88c36eb73e1e71ea3ca16896d6478a65d230b44a (diff) | |
| download | op-kernel-dev-e1719da689378de5c252ea0f51f5f76cc75fd629.zip op-kernel-dev-e1719da689378de5c252ea0f51f5f76cc75fd629.tar.gz | |
[ARM] pxa: make littleton to use the new smc91x platform data
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Acked-by: Nicolas Pitre <nico@cam.org>
Acked-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-pxa/littleton.c | 9 | ||||
| -rw-r--r-- | 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 273f90a..22209b6 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> |
