OMAP: convert boards to use platform data with smc91x
Subsystems (7)
cover OMAP: convert boards to use platform data with smc91x
As smc91x driver allows specifying settings in board resources, use that rather than needing CONFIG_ARCH_OMAP in the drivers/net/smc91x.h header.
arch/arm/mach-omap1/board-fsample.c | 10 ++++++++++ arch/arm/mach-omap1/board-h2.c | 10 ++++++++++ arch/arm/mach-omap1/board-h3.c | 10 ++++++++++ arch/arm/mach-omap1/board-innovator.c | 13 +++++++++++++ arch/arm/mach-omap1/board-osk.c | 10 ++++++++++ arch/arm/mach-omap1/board-perseus2.c | 10 ++++++++++ arch/arm/mach-omap1/board-voiceblue.c | 10 ++++++++++ arch/arm/mach-omap2/board-apollon.c | 10 ++++++++++ arch/arm/mach-omap2/gpmc-smc91x.c | 8 +++++--- arch/arm/plat-omap/debug-devices.c | 10 ++++++++++ drivers/net/smc91x.h | 15 --------------- 11 files changed, 98 insertions(+), 18 deletions(-)
PATCH 1/2 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
arch/arm/mach-omap1/board-fsample.c +10 -0
@@ -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
@@ -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
@@ -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 +13 -0
@@ -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>
@@ -159,6 +160,12 @@ static struct map_desc innovator1510_io_desc[] __initdata = { } }; +static struct smc91x_platdata innovator_smc91x_info = { + .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT , + .leda =RPC_LED_100_10 , + .ledb =RPC_LED_TX_RX , +}; +static struct resource innovator1510_smc91x_resources[] = { [0 ] = { .start =OMAP1510_FPGA_ETHR_START ,/* Physical */
@@ -175,6 +182,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 +251,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
@@ -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, };
arch/arm/mach-omap1/board-perseus2.c +10 -0
@@ -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>
@@ -67,6 +68,12 @@ static int p2_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 */
@@ -157,6 +164,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-voiceblue.c +10 -0
@@ -22,6 +22,7 @@#include <linux/reboot.h> #include <linux/serial_8250.h> #include <linux/serial_reg.h> +#include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h>
@@ -106,6 +107,12 @@ static struct platform_device voiceblue_flash_device = { .resource = &voiceblue_flash_resource, }; +static struct smc91x_platdata voiceblue_smc91x_info = { + .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT , + .leda =RPC_LED_100_10 , + .ledb =RPC_LED_TX_RX , +}; +static struct resource voiceblue_smc91x_resources[] = { [0 ] = { .start =OMAP_CS2_PHYS +0x300 ,
@@ -122,6 +129,9 @@ static struct resource voiceblue_smc91x_resources[] = {static struct platform_device voiceblue_smc91x_device = { .name ="smc91x" , .id =0 , + .dev = { + .platform_data = &voiceblue_smc91x_info, + }, .num_resources =ARRAY_SIZE (voiceblue_smc91x_resources), .resource = voiceblue_smc91x_resources, };
arch/arm/mach-omap2/board-apollon.c +10 -0
@@ -26,6 +26,7 @@#include <linux/leds.h> #include <linux/err.h> #include <linux/clk.h> +#include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h>
@@ -120,6 +121,12 @@ static void __init apollon_flash_init(void) apollon_flash_resource[0 ].end = base +SZ_128K -1 ; } +static struct smc91x_platdata appolon_smc91x_info = { + .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT , + .leda =RPC_LED_100_10 , + .ledb =RPC_LED_TX_RX , +}; +static struct resource apollon_smc91x_resources[] = { [0 ] = { .flags =IORESOURCE_MEM ,
@@ -134,6 +141,9 @@ static struct resource apollon_smc91x_resources[] = {static struct platform_device apollon_smc91x_device = { .name ="smc91x" , .id =-1 , + .dev = { + .platform_data = &appolon_smc91x_info, + }, .num_resources =ARRAY_SIZE (apollon_smc91x_resources), .resource = apollon_smc91x_resources, };
arch/arm/mach-omap2/gpmc-smc91x.c +5 -3
@@ -33,17 +33,19 @@ static struct resource gpmc_smc91x_resources[] = { };static struct smc91x_platdata gpmc_smc91x_info = { - .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT |SMC91X_IO_SHIFT_0 , + .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT |SMC91X_IO_SHIFT_0 , + .leda =RPC_LED_100_10 , + .ledb =RPC_LED_TX_RX , };static struct platform_device gpmc_smc91x_device = { .name ="smc91x" , .id =-1 , - .num_resources =ARRAY_SIZE (gpmc_smc91x_resources), - .resource = gpmc_smc91x_resources, .dev = { .platform_data = &gpmc_smc91x_info, }, + .num_resources =ARRAY_SIZE (gpmc_smc91x_resources), + .resource = gpmc_smc91x_resources, };/*
arch/arm/plat-omap/debug-devices.c +10 -0
@@ -13,6 +13,7 @@#include <linux/init.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/smc91x.h> #include <mach/hardware.h>
@@ -24,6 +25,12 @@* platforms include H2, H3, H4, and Perseus2. */ +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 ] = { .flags =IORESOURCE_MEM ,
@@ -36,6 +43,9 @@ static struct resource smc91x_resources[] = {static struct platform_device smc91x_device = { .name ="smc91x" , .id =-1 , + .dev = { + .platform_data = &smc91x_info, + }, .num_resources =ARRAY_SIZE (smc91x_resources), .resource = smc91x_resources, };
Tony Lindgren
maintainerRe: [PATCH 1/2] OMAP: use smc91x_platdata to setup smc91x
Quoted 2 lines · Ladislav Michl
Use
smc91x_platdatato setup smc91x, so we can get rid of OMAP specific stuff in smc91x driver
Thanks, will merge both via linux-omap tree.
Regards,
Tony
Quoted 359 lines
Signed-off-by Ladislav Michl <[email protected]>arch/arm/mach-omap1/board-fsample.c +10
-0@@ -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@@ -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@@ -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 +13
-0@@ -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> @@ -159,6 +160,12 @@ static struct map_desc innovator1510_io_desc[] __initdata = { } }; +static struct smc91x_platdata innovator_smc91x_info = { + .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT , + .leda =RPC_LED_100_10 , + .ledb =RPC_LED_TX_RX , +}; +static struct resource innovator1510_smc91x_resources[] = { [0 ] = { .start =OMAP1510_FPGA_ETHR_START ,/* Physical */ @@ -175,6 +182,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 +251,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@@ -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, };arch/arm/mach-omap1/board-perseus2.c +10
-0@@ -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> @@ -67,6 +68,12 @@ static int p2_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 */ @@ -157,6 +164,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-voiceblue.c +10
-0@@ -22,6 +22,7 @@#include <linux/reboot.h> #include <linux/serial_8250.h> #include <linux/serial_reg.h> +#include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h> @@ -106,6 +107,12 @@ static struct platform_device voiceblue_flash_device = { .resource = &voiceblue_flash_resource, }; +static struct smc91x_platdata voiceblue_smc91x_info = { + .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT , + .leda =RPC_LED_100_10 , + .ledb =RPC_LED_TX_RX , +}; +static struct resource voiceblue_smc91x_resources[] = { [0 ] = { .start =OMAP_CS2_PHYS +0x300 ,@@ -122,6 +129,9 @@ static struct resource voiceblue_smc91x_resources[] = {static struct platform_device voiceblue_smc91x_device = { .name ="smc91x" , .id =0 , + .dev = { + .platform_data = &voiceblue_smc91x_info, + }, .num_resources =ARRAY_SIZE (voiceblue_smc91x_resources), .resource = voiceblue_smc91x_resources, };arch/arm/mach-omap2/board-apollon.c +10
-0@@ -26,6 +26,7 @@#include <linux/leds.h> #include <linux/err.h> #include <linux/clk.h> +#include <linux/smc91x.h> #include <mach/hardware.h> #include <asm/mach-types.h> @@ -120,6 +121,12 @@ static void __init apollon_flash_init(void) apollon_flash_resource[0 ].end = base +SZ_128K -1 ; } +static struct smc91x_platdata appolon_smc91x_info = { + .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT , + .leda =RPC_LED_100_10 , + .ledb =RPC_LED_TX_RX , +}; +static struct resource apollon_smc91x_resources[] = { [0 ] = { .flags =IORESOURCE_MEM ,@@ -134,6 +141,9 @@ static struct resource apollon_smc91x_resources[] = {static struct platform_device apollon_smc91x_device = { .name ="smc91x" , .id =-1 , + .dev = { + .platform_data = &appolon_smc91x_info, + }, .num_resources =ARRAY_SIZE (apollon_smc91x_resources), .resource = apollon_smc91x_resources, };arch/arm/mach-omap2/gpmc-smc91x.c +5
-3@@ -33,17 +33,19 @@ static struct resource gpmc_smc91x_resources[] = { };static struct smc91x_platdata gpmc_smc91x_info = { - .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT |SMC91X_IO_SHIFT_0 , + .flags =SMC91X_USE_16BIT |SMC91X_NOWAIT |SMC91X_IO_SHIFT_0 , + .leda =RPC_LED_100_10 , + .ledb =RPC_LED_TX_RX , };static struct platform_device gpmc_smc91x_device = { .name ="smc91x" , .id =-1 , - .num_resources =ARRAY_SIZE (gpmc_smc91x_resources), - .resource = gpmc_smc91x_resources, .dev = { .platform_data = &gpmc_smc91x_info, }, + .num_resources =ARRAY_SIZE (gpmc_smc91x_resources), + .resource = gpmc_smc91x_resources, };/* arch/arm/plat-omap/debug-devices.c +10
-1@@ -13,6 +13,7 @@#include <linux/init.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/smc91x.h> #include <mach/hardware.h> @@ -24,6 +25,12 @@* platforms include H2, H3, H4, and Perseus2. */ +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 ] = { .flags =IORESOURCE_MEM ,@@ -36,6 +43,9 @@ static struct resource smc91x_resources[] = {static struct platform_device smc91x_device = { .name ="smc91x" , .id =-1 , + .dev = { + .platform_data = &smc91x_info, + }, .num_resources =ARRAY_SIZE (smc91x_resources), .resource = smc91x_resources, }; --To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Tony Lindgren
maintainerPATCH 1/2 OMAP: use smc91x_platdata to setup smc91x
In reply to Ladislav MichlThis patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: for-next
Initial commit ID (Likely to change): 3bbdd7f9bb4ec490324f9dcc790c2e006b23965e
PatchWorks
http://patchwork.kernel.org/patch/65709/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=3bbdd7f9bb4ec490324f9dcc790c2e006b23965e
PATCH 2/2 smc91x: remove OMAP specific bits
In reply to Ladislav MichlNow that all OMAP boards are using the board resources, we don't need to keep the arch/board specific crap in the driver header.
drivers/net/smc91x.h +0 -15
@@ -206,21 +206,6 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) } } -#elif defined(CONFIG_ARCH_OMAP) - -/* We can only do 16-bit reads and writes in the static memory space. */ -#define SMC_CAN_USE_8BIT 0 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 0 -#define SMC_IO_SHIFT 0 -#define SMC_NOWAIT 1 - -#define SMC_inw (a, r) readw((a) + (r)) -#define SMC_outw (v, a, r) writew(v, (a) + (r)) -#define SMC_insw (a, r, p, l) readsw((a) + (r), p, l) -#define SMC_outsw (a, r, p, l) writesw((a) + (r), p, l) -#define SMC_IRQ_FLAGS (-1)/* from resource */ -#elif defined(CONFIG_SH_SH4202_MICRODEV)#define SMC_CAN_USE_8BIT 0
Tony Lindgren
maintainerRe: [PATCH 2/2] smc91x: remove OMAP specific bits
Quoted 2 lines · Ladislav Michl
Now that all OMAP boards are using the board resources, we don't need to keep the
arch/boardspecific crap in the driver header.
Planning to merge this via linux-omap list too with the platform data patch unless somebody at netdev has objections.
Nico, care to ack this?
Regards,
Tony
Quoted 32 lines
Signed-off-by Ladislav Michl <[email protected]>drivers/net/smc91x.h +0
-16@@ -206,21 +206,6 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) } } -#elif defined(CONFIG_ARCH_OMAP) - -/* We can only do 16-bit reads and writes in the static memory space. */ -#define SMC_CAN_USE_8BIT 0 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 0 -#define SMC_IO_SHIFT 0 -#define SMC_NOWAIT 1 - -#define SMC_inw (a, r) readw((a) + (r)) -#define SMC_outw (v, a, r) writew(v, (a) + (r)) -#define SMC_insw (a, r, p, l) readsw((a) + (r), p, l) -#define SMC_outsw (a, r, p, l) writesw((a) + (r), p, l) -#define SMC_IRQ_FLAGS (-1)/* from resource */ -#elif defined(CONFIG_SH_SH4202_MICRODEV)#define SMC_CAN_USE_8BIT 0 --To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/2] smc91x: remove OMAP specific bits
Quoted 8 lines · Tony Lindgren
Quoted 2 lines · Ladislav Michl
Now that all OMAP boards are using the board resources, we don't need to keep the
arch/boardspecific crap in the driver header.Planning to merge this via linux-omap list too with the platform data patch unless somebody at netdev has objections.
Nico, care to ack this?
ACK.
Quoted 39 lines
Regards,
Tony
Quoted 32 lines
Signed-off-by Ladislav Michl <[email protected]>drivers/net/smc91x.h +0
-16@@ -206,21 +206,6 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) } } -#elif defined(CONFIG_ARCH_OMAP) - -/* We can only do 16-bit reads and writes in the static memory space. */ -#define SMC_CAN_USE_8BIT 0 -#define SMC_CAN_USE_16BIT 1 -#define SMC_CAN_USE_32BIT 0 -#define SMC_IO_SHIFT 0 -#define SMC_NOWAIT 1 - -#define SMC_inw (a, r) readw((a) + (r)) -#define SMC_outw (v, a, r) writew(v, (a) + (r)) -#define SMC_insw (a, r, p, l) readsw((a) + (r), p, l) -#define SMC_outsw (a, r, p, l) writesw((a) + (r), p, l) -#define SMC_IRQ_FLAGS (-1)/* from resource */ -#elif defined(CONFIG_SH_SH4202_MICRODEV)#define SMC_CAN_USE_8BIT 0 --To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Tony Lindgren
maintainerPATCH 2/2 smc91x: remove OMAP specific bits
In reply to Ladislav MichlThis patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: for-next
Initial commit ID (Likely to change): a08742729a07c11a746c9fb81c34fccf3d6a57f2
PatchWorks
http://patchwork.kernel.org/patch/65711/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=a08742729a07c11a746c9fb81c34fccf3d6a57f2