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

Commit 3bc48014 authored by Ladislav Michl's avatar Ladislav Michl Committed by Tony Lindgren
Browse files

omap: use smc91x_platdata to setup smc91x 



Use smc91x_platdata to setup smc91x, so we can get rid of OMAP specific stuff
in smc91x driver

Signed-off-by: default avatarLadislav Michl <ladis@linux-mips.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 662c8b55

arch/arm/mach-omap1/board-fsample.c

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

#include <linux/mtd/partitions.h>

#include <linux/input.h>

#include <linux/smc91x.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>
@@ -100,6 +101,12 @@ static int fsample_keymap[] = { 
	0

};



static struct smc91x_platdata smc91x_info = {

	.flags	= SMC91X_USE_16BIT | SMC91X_NOWAIT,

	.leda	= RPC_LED_100_10,

	.ledb	= RPC_LED_TX_RX,

};



static struct resource smc91x_resources[] = {

	[0] = {

		.start	= H2P2_DBG_FPGA_ETHR_START,	/* Physical */
@@ -190,6 +197,9 @@ static struct platform_device nand_device = { 
static struct platform_device smc91x_device = {

	.name		= "smc91x",

	.id		= 0,

	.dev	= {

		.platform_data	= &smc91x_info,

	},

	.num_resources	= ARRAY_SIZE(smc91x_resources),

	.resource	= smc91x_resources,

};

arch/arm/mach-omap1/board-h2.c

+10 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/mtd/partitions.h>

#include <linux/input.h>

#include <linux/i2c/tps65010.h>

#include <linux/smc91x.h>



#include <mach/hardware.h>

#include <asm/gpio.h>
@@ -200,6 +201,12 @@ static struct platform_device h2_nand_device = { 
	.resource	= &h2_nand_resource,

};



static struct smc91x_platdata h2_smc91x_info = {

	.flags	= SMC91X_USE_16BIT | SMC91X_NOWAIT,

	.leda	= RPC_LED_100_10,

	.ledb	= RPC_LED_TX_RX,

};



static struct resource h2_smc91x_resources[] = {

	[0] = {

		.start	= OMAP1610_ETHR_START,		/* Physical */
@@ -216,6 +223,9 @@ static struct resource h2_smc91x_resources[] = { 
static struct platform_device h2_smc91x_device = {

	.name		= "smc91x",

	.id		= 0,

	.dev	= {

		.platform_data	= &h2_smc91x_info,

	},

	.num_resources	= ARRAY_SIZE(h2_smc91x_resources),

	.resource	= h2_smc91x_resources,

};

arch/arm/mach-omap1/board-h3.c

+10 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/input.h>

#include <linux/spi/spi.h>

#include <linux/i2c/tps65010.h>

#include <linux/smc91x.h>



#include <asm/setup.h>

#include <asm/page.h>
@@ -202,6 +203,12 @@ static struct platform_device nand_device = { 
	.resource	= &nand_resource,

};



static struct smc91x_platdata smc91x_info = {

	.flags	= SMC91X_USE_16BIT | SMC91X_NOWAIT,

	.leda	= RPC_LED_100_10,

	.ledb	= RPC_LED_TX_RX,

};



static struct resource smc91x_resources[] = {

	[0] = {

		.start	= OMAP1710_ETHR_START,		/* Physical */
@@ -218,6 +225,9 @@ static struct resource smc91x_resources[] = { 
static struct platform_device smc91x_device = {

	.name		= "smc91x",

	.id		= 0,

	.dev	= {

		.platform_data	= &smc91x_info,

	},

	.num_resources	= ARRAY_SIZE(smc91x_resources),

	.resource	= smc91x_resources,

};

arch/arm/mach-omap1/board-innovator.c

+12 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/input.h>

#include <linux/smc91x.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>
@@ -142,6 +143,11 @@ static struct platform_device innovator_kp_device = { 
	.resource	= innovator_kp_resources,

};



static struct smc91x_platdata innovator_smc91x_info = {

	.flags	= SMC91X_USE_16BIT | SMC91X_NOWAIT,

	.leda	= RPC_LED_100_10,

	.ledb	= RPC_LED_TX_RX,

};



#ifdef CONFIG_ARCH_OMAP15XX
@@ -175,6 +181,9 @@ static struct resource innovator1510_smc91x_resources[] = { 
static struct platform_device innovator1510_smc91x_device = {

	.name		= "smc91x",

	.id		= 0,

	.dev	= {

		.platform_data	= &innovator_smc91x_info,

	},

	.num_resources	= ARRAY_SIZE(innovator1510_smc91x_resources),

	.resource	= innovator1510_smc91x_resources,

};
@@ -241,6 +250,9 @@ static struct resource innovator1610_smc91x_resources[] = { 
static struct platform_device innovator1610_smc91x_device = {

	.name		= "smc91x",

	.id		= 0,

	.dev	= {

		.platform_data	= &innovator_smc91x_info,

	},

	.num_resources	= ARRAY_SIZE(innovator1610_smc91x_resources),

	.resource	= innovator1610_smc91x_resources,

};

arch/arm/mach-omap1/board-osk.c

+10 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include <linux/irq.h>

#include <linux/i2c.h>

#include <linux/leds.h>

#include <linux/smc91x.h>



#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>
@@ -115,6 +116,12 @@ static struct platform_device osk5912_flash_device = { 
	.resource	= &osk_flash_resource,

};



static struct smc91x_platdata osk5912_smc91x_info = {

	.flags	= SMC91X_USE_16BIT | SMC91X_NOWAIT,

	.leda	= RPC_LED_100_10,

	.ledb	= RPC_LED_TX_RX,

};



static struct resource osk5912_smc91x_resources[] = {

	[0] = {

		.start	= OMAP_OSK_ETHR_START,		/* Physical */
@@ -131,6 +138,9 @@ static struct resource osk5912_smc91x_resources[] = { 
static struct platform_device osk5912_smc91x_device = {

	.name		= "smc91x",

	.id		= -1,

	.dev	= {

		.platform_data	= &osk5912_smc91x_info,

	},

	.num_resources	= ARRAY_SIZE(osk5912_smc91x_resources),

	.resource	= osk5912_smc91x_resources,

};