aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-06-24 04:49:41 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-12 16:52:41 -0400
commite1719da689378de5c252ea0f51f5f76cc75fd629 (patch)
tree3eaf18dd3a83cbfa2c01819e18917bc7e6c74a19
parent88c36eb73e1e71ea3ca16896d6478a65d230b44a (diff)
[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.c9
-rw-r--r--drivers/net/smc91x.h3
2 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/littleton.c b/arch/arm/mach-pxa/littleton.c
index 9a4f51d48758..dd759d03a9fd 100644
--- a/arch/arm/mach-pxa/littleton.c
+++ b/arch/arm/mach-pxa/littleton.c
@@ -20,6 +20,7 @@
20#include <linux/delay.h> 20#include <linux/delay.h>
21#include <linux/platform_device.h> 21#include <linux/platform_device.h>
22#include <linux/clk.h> 22#include <linux/clk.h>
23#include <linux/smc91x.h>
23 24
24#include <asm/types.h> 25#include <asm/types.h>
25#include <asm/setup.h> 26#include <asm/setup.h>
@@ -106,11 +107,19 @@ static struct resource smc91x_resources[] = {
106 } 107 }
107}; 108};
108 109
110static struct smc91x_platdata littleton_smc91x_info = {
111 .flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT |
112 SMC91X_NOWAIT | SMC91X_USE_DMA,
113};
114
109static struct platform_device smc91x_device = { 115static struct platform_device smc91x_device = {
110 .name = "smc91x", 116 .name = "smc91x",
111 .id = 0, 117 .id = 0,
112 .num_resources = ARRAY_SIZE(smc91x_resources), 118 .num_resources = ARRAY_SIZE(smc91x_resources),
113 .resource = smc91x_resources, 119 .resource = smc91x_resources,
120 .dev = {
121 .platform_data = &littleton_smc91x_info,
122 },
114}; 123};
115 124
116#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE) 125#if defined(CONFIG_FB_PXA) || defined(CONFIG_FB_PXA_MODULE)
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h
index 273f90ac2cb9..22209b6f1405 100644
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@ -42,7 +42,8 @@
42 42
43#if defined(CONFIG_ARCH_LUBBOCK) ||\ 43#if defined(CONFIG_ARCH_LUBBOCK) ||\
44 defined(CONFIG_MACH_MAINSTONE) ||\ 44 defined(CONFIG_MACH_MAINSTONE) ||\
45 defined(CONFIG_MACH_ZYLONITE) 45 defined(CONFIG_MACH_ZYLONITE) ||\
46 defined(CONFIG_MACH_LITTLETON)
46 47
47#include <asm/mach-types.h> 48#include <asm/mach-types.h>
48 49