From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Miao Subject: [PATCH 09/10] pxa: make zylonite to use the new smc91x platform data Date: Tue, 24 Jun 2008 17:47:46 +0800 Message-ID: <1214300867-15495-10-git-send-email-eric.y.miao@gmail.com> Cc: Nicolas Pitre , Magnus Damm , Eric Miao To: linux-arm-kernel , linux-netdev Return-path: Received: from host2.marvell.com ([65.219.4.2]:44707 "EHLO maili.marvell.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753193AbYFXJrk (ORCPT ); Tue, 24 Jun 2008 05:47:40 -0400 In-Reply-To: <> References: <> Sender: netdev-owner@vger.kernel.org List-ID: From: Eric Miao Signed-off-by: Eric Miao --- arch/arm/mach-pxa/zylonite.c | 9 +++++++++ drivers/net/smc91x.h | 19 ++----------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/arch/arm/mach-pxa/zylonite.c b/arch/arm/mach-pxa/zylonite.c index 4a4711d..8fca6d8 100644 --- a/arch/arm/mach-pxa/zylonite.c +++ b/arch/arm/mach-pxa/zylonite.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -59,11 +60,19 @@ static struct resource smc91x_resources[] = { } }; +static struct smc91x_platdata zylonite_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 = &zylonite_smc91x_info, + }, }; #if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE) diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index 3d03284..d55739c 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h @@ -41,7 +41,8 @@ */ #if defined(CONFIG_ARCH_LUBBOCK) ||\ - defined(CONFIG_MACH_MAINSTONE) + defined(CONFIG_MACH_MAINSTONE) ||\ + defined(CONFIG_MACH_ZYLONITE) #include @@ -249,22 +250,6 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) } } -#elif defined(CONFIG_MACH_ZYLONITE) - -#define SMC_CAN_USE_8BIT 1 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 0 -#define SMC_IO_SHIFT 0 -#define SMC_NOWAIT 1 -#define SMC_USE_PXA_DMA 1 -#define SMC_inb(a, r) readb((a) + (r)) -#define SMC_inw(a, r) readw((a) + (r)) -#define SMC_insw(a, r, p, l) insw((a) + (r), p, l) -#define SMC_outsw(a, r, p, l) outsw((a) + (r), p, l) -#define SMC_outb(v, a, r) writeb(v, (a) + (r)) -#define SMC_outw(v, a, r) writew(v, (a) + (r)) -#define SMC_IRQ_FLAGS (-1) /* from resource */ - #elif defined(CONFIG_ARCH_OMAP) /* We can only do 16-bit reads and writes in the static memory space. */ -- 1.5.4.3