Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88c36eb7 authored by Eric Miao's avatar Eric Miao Committed by Russell King
Browse files

[ARM] pxa: make zylonite to use the new smc91x platform data 



Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
Acked-by: default avatarNicolas Pitre <nico@cam.org>
Acked-by: default avatarJeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 38fd6c38

arch/arm/mach-pxa/zylonite.c

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/pwm_backlight.h>

#include <linux/smc91x.h>



#include <asm/mach-types.h>

#include <asm/mach/arch.h>
@@ -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)

drivers/net/smc91x.h

+2 −17
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ 
 */



#if defined(CONFIG_ARCH_LUBBOCK) ||\

    defined(CONFIG_MACH_MAINSTONE)

    defined(CONFIG_MACH_MAINSTONE) ||\

    defined(CONFIG_MACH_ZYLONITE)



#include <asm/mach-types.h>
@@ -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. */