wl1251: split wl251 platform data to a separate structure

[deliverable/linux.git] / arch / arm / mach-omap2 / board-rx51-peripherals.c

diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index f093af17f5e6a9de4943fc16d2d4d8116aab1045..e05e740a4426210c4d1f4d008128566529ccc623 100644 (file)
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -84,7 +84,7 @@ enum {
        RX51_SPI_MIPID,         /* LCD panel */
 };
 
-static struct wl12xx_platform_data wl1251_pdata;
+static struct wl1251_platform_data wl1251_pdata;
 static struct tsc2005_platform_data tsc2005_pdata;
 
 #if defined(CONFIG_SENSORS_LIS3_I2C) || defined(CONFIG_SENSORS_LIS3_I2C_MODULE)
@@ -760,7 +760,14 @@ static struct regulator_init_data rx51_vintdig = {
        },
 };
 
+static const char * const si4713_supply_names[] = {
+       "vio",
+       "vdd",
+};
+
 static struct si4713_platform_data rx51_si4713_i2c_data __initdata_or_module = {
+       .supplies       = ARRAY_SIZE(si4713_supply_names),
+       .supply_names   = si4713_supply_names,
        .gpio_reset     = RX51_FMTX_RESET_GPIO,
 };