diff options
author | Luciano Coelho <coelho@ti.com> | 2014-02-14 18:05:52 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-02-28 14:08:26 -0500 |
commit | 946651cba26779864bcdbd7e12502f5a36c2de37 (patch) | |
tree | 55c97ba2440833a39c89faff4c1177ecd0c03189 /arch | |
parent | ef1b4141d0430583743a6045901e4d1a73557a33 (diff) |
wl1251: split wl251 platform data to a separate structure
Move the wl1251 part of the wl12xx platform data structure into a new
structure specifically for wl1251. Change the platform data built-in
block and board files accordingly.
Signed-off-by: Luciano Coelho <coelho@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Reviewed-by: Sebastian Reichel <sre@debian.org>
Reviewed-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index de1bc6bbe585..24f3c1be69a5 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
@@ -536,7 +536,7 @@ static struct spi_board_info omap3pandora_spi_board_info[] __initdata = { | |||
536 | 536 | ||
537 | static void __init pandora_wl1251_init(void) | 537 | static void __init pandora_wl1251_init(void) |
538 | { | 538 | { |
539 | struct wl12xx_platform_data pandora_wl1251_pdata; | 539 | struct wl1251_platform_data pandora_wl1251_pdata; |
540 | int ret; | 540 | int ret; |
541 | 541 | ||
542 | memset(&pandora_wl1251_pdata, 0, sizeof(pandora_wl1251_pdata)); | 542 | memset(&pandora_wl1251_pdata, 0, sizeof(pandora_wl1251_pdata)); |
@@ -550,7 +550,7 @@ static void __init pandora_wl1251_init(void) | |||
550 | goto fail_irq; | 550 | goto fail_irq; |
551 | 551 | ||
552 | pandora_wl1251_pdata.use_eeprom = true; | 552 | pandora_wl1251_pdata.use_eeprom = true; |
553 | ret = wl12xx_set_platform_data(&pandora_wl1251_pdata); | 553 | ret = wl1251_set_platform_data(&pandora_wl1251_pdata); |
554 | if (ret < 0) | 554 | if (ret < 0) |
555 | goto fail_irq; | 555 | goto fail_irq; |
556 | 556 | ||
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index 8760bbe3baab..e05e740a4426 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
@@ -84,7 +84,7 @@ enum { | |||
84 | RX51_SPI_MIPID, /* LCD panel */ | 84 | RX51_SPI_MIPID, /* LCD panel */ |
85 | }; | 85 | }; |
86 | 86 | ||
87 | static struct wl12xx_platform_data wl1251_pdata; | 87 | static struct wl1251_platform_data wl1251_pdata; |
88 | static struct tsc2005_platform_data tsc2005_pdata; | 88 | static struct tsc2005_platform_data tsc2005_pdata; |
89 | 89 | ||
90 | #if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE) | 90 | #if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE) |