diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-devkit8000.c')
-rw-r--r-- | arch/arm/mach-omap2/board-devkit8000.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c index 34956ec8329..ead9c1d1940 100644 --- a/arch/arm/mach-omap2/board-devkit8000.c +++ b/arch/arm/mach-omap2/board-devkit8000.c | |||
@@ -130,13 +130,14 @@ static void devkit8000_panel_disable_dvi(struct omap_dss_device *dssdev) | |||
130 | gpio_set_value_cansleep(dssdev->reset_gpio, 0); | 130 | gpio_set_value_cansleep(dssdev->reset_gpio, 0); |
131 | } | 131 | } |
132 | 132 | ||
133 | static struct regulator_consumer_supply devkit8000_vmmc1_supply = | 133 | static struct regulator_consumer_supply devkit8000_vmmc1_supply[] = { |
134 | REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"); | 134 | REGULATOR_SUPPLY("vmmc", "omap_hsmmc.0"), |
135 | 135 | }; | |
136 | 136 | ||
137 | /* ads7846 on SPI */ | 137 | /* ads7846 on SPI */ |
138 | static struct regulator_consumer_supply devkit8000_vio_supply = | 138 | static struct regulator_consumer_supply devkit8000_vio_supply[] = { |
139 | REGULATOR_SUPPLY("vcc", "spi2.0"); | 139 | REGULATOR_SUPPLY("vcc", "spi2.0"), |
140 | }; | ||
140 | 141 | ||
141 | static struct panel_generic_dpi_data lcd_panel = { | 142 | static struct panel_generic_dpi_data lcd_panel = { |
142 | .name = "generic", | 143 | .name = "generic", |
@@ -186,8 +187,9 @@ static struct omap_dss_board_info devkit8000_dss_data = { | |||
186 | .default_device = &devkit8000_lcd_device, | 187 | .default_device = &devkit8000_lcd_device, |
187 | }; | 188 | }; |
188 | 189 | ||
189 | static struct regulator_consumer_supply devkit8000_vdda_dac_supply = | 190 | static struct regulator_consumer_supply devkit8000_vdda_dac_supply[] = { |
190 | REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"); | 191 | REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"), |
192 | }; | ||
191 | 193 | ||
192 | static uint32_t board_keymap[] = { | 194 | static uint32_t board_keymap[] = { |
193 | KEY(0, 0, KEY_1), | 195 | KEY(0, 0, KEY_1), |
@@ -284,8 +286,8 @@ static struct regulator_init_data devkit8000_vmmc1 = { | |||
284 | | REGULATOR_CHANGE_MODE | 286 | | REGULATOR_CHANGE_MODE |
285 | | REGULATOR_CHANGE_STATUS, | 287 | | REGULATOR_CHANGE_STATUS, |
286 | }, | 288 | }, |
287 | .num_consumer_supplies = 1, | 289 | .num_consumer_supplies = ARRAY_SIZE(devkit8000_vmmc1_supply), |
288 | .consumer_supplies = &devkit8000_vmmc1_supply, | 290 | .consumer_supplies = devkit8000_vmmc1_supply, |
289 | }; | 291 | }; |
290 | 292 | ||
291 | /* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */ | 293 | /* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */ |
@@ -298,8 +300,8 @@ static struct regulator_init_data devkit8000_vdac = { | |||
298 | .valid_ops_mask = REGULATOR_CHANGE_MODE | 300 | .valid_ops_mask = REGULATOR_CHANGE_MODE |
299 | | REGULATOR_CHANGE_STATUS, | 301 | | REGULATOR_CHANGE_STATUS, |
300 | }, | 302 | }, |
301 | .num_consumer_supplies = 1, | 303 | .num_consumer_supplies = ARRAY_SIZE(devkit8000_vdda_dac_supply), |
302 | .consumer_supplies = &devkit8000_vdda_dac_supply, | 304 | .consumer_supplies = devkit8000_vdda_dac_supply, |
303 | }; | 305 | }; |
304 | 306 | ||
305 | /* VPLL1 for digital video outputs */ | 307 | /* VPLL1 for digital video outputs */ |
@@ -327,8 +329,8 @@ static struct regulator_init_data devkit8000_vio = { | |||
327 | .valid_ops_mask = REGULATOR_CHANGE_MODE | 329 | .valid_ops_mask = REGULATOR_CHANGE_MODE |
328 | | REGULATOR_CHANGE_STATUS, | 330 | | REGULATOR_CHANGE_STATUS, |
329 | }, | 331 | }, |
330 | .num_consumer_supplies = 1, | 332 | .num_consumer_supplies = ARRAY_SIZE(devkit8000_vio_supply), |
331 | .consumer_supplies = &devkit8000_vio_supply, | 333 | .consumer_supplies = devkit8000_vio_supply, |
332 | }; | 334 | }; |
333 | 335 | ||
334 | static struct twl4030_usb_data devkit8000_usb_data = { | 336 | static struct twl4030_usb_data devkit8000_usb_data = { |