aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/mach-mx27_3ds.c6
-rw-r--r--arch/arm/mach-imx/mach-mx31_3ds.c6
2 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c
index 2eafbac2c763..377230497dcc 100644
--- a/arch/arm/mach-imx/mach-mx27_3ds.c
+++ b/arch/arm/mach-imx/mach-mx27_3ds.c
@@ -241,7 +241,7 @@ static struct regulator_init_data gpo_init = {
241}; 241};
242 242
243static struct regulator_consumer_supply vmmc1_consumers[] = { 243static struct regulator_consumer_supply vmmc1_consumers[] = {
244 REGULATOR_SUPPLY("lcd_2v8", NULL), 244 REGULATOR_SUPPLY("vcore", "spi0.0"),
245}; 245};
246 246
247static struct regulator_init_data vmmc1_init = { 247static struct regulator_init_data vmmc1_init = {
@@ -257,7 +257,7 @@ static struct regulator_init_data vmmc1_init = {
257}; 257};
258 258
259static struct regulator_consumer_supply vgen_consumers[] = { 259static struct regulator_consumer_supply vgen_consumers[] = {
260 REGULATOR_SUPPLY("vdd_lcdio", NULL), 260 REGULATOR_SUPPLY("vdd", "spi0.0"),
261}; 261};
262 262
263static struct regulator_init_data vgen_init = { 263static struct regulator_init_data vgen_init = {
@@ -348,8 +348,6 @@ static const struct imx_fb_platform_data mx27_3ds_fb_data __initconst = {
348static struct l4f00242t03_pdata mx27_3ds_lcd_pdata = { 348static struct l4f00242t03_pdata mx27_3ds_lcd_pdata = {
349 .reset_gpio = LCD_RESET, 349 .reset_gpio = LCD_RESET,
350 .data_enable_gpio = LCD_ENABLE, 350 .data_enable_gpio = LCD_ENABLE,
351 .core_supply = "lcd_2v8",
352 .io_supply = "vdd_lcdio",
353}; 351};
354 352
355static struct spi_board_info mx27_3ds_spi_devs[] __initdata = { 353static struct spi_board_info mx27_3ds_spi_devs[] __initdata = {
diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c
index 589066fb3316..6484db525bd7 100644
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@ -285,8 +285,6 @@ static struct mx3fb_platform_data mx3fb_pdata __initdata = {
285static struct l4f00242t03_pdata mx31_3ds_l4f00242t03_pdata = { 285static struct l4f00242t03_pdata mx31_3ds_l4f00242t03_pdata = {
286 .reset_gpio = IOMUX_TO_GPIO(MX31_PIN_LCS1), 286 .reset_gpio = IOMUX_TO_GPIO(MX31_PIN_LCS1),
287 .data_enable_gpio = IOMUX_TO_GPIO(MX31_PIN_SER_RS), 287 .data_enable_gpio = IOMUX_TO_GPIO(MX31_PIN_SER_RS),
288 .core_supply = "lcd_2v8",
289 .io_supply = "vdd_lcdio",
290}; 288};
291 289
292/* 290/*
@@ -411,7 +409,7 @@ static struct regulator_init_data vmmc2_init = {
411}; 409};
412 410
413static struct regulator_consumer_supply vmmc1_consumers[] = { 411static struct regulator_consumer_supply vmmc1_consumers[] = {
414 REGULATOR_SUPPLY("lcd_2v8", NULL), 412 REGULATOR_SUPPLY("vcore", "spi0.0"),
415 REGULATOR_SUPPLY("cmos_2v8", "soc-camera-pdrv.0"), 413 REGULATOR_SUPPLY("cmos_2v8", "soc-camera-pdrv.0"),
416}; 414};
417 415
@@ -428,7 +426,7 @@ static struct regulator_init_data vmmc1_init = {
428}; 426};
429 427
430static struct regulator_consumer_supply vgen_consumers[] = { 428static struct regulator_consumer_supply vgen_consumers[] = {
431 REGULATOR_SUPPLY("vdd_lcdio", NULL), 429 REGULATOR_SUPPLY("vdd", "spi0.0"),
432}; 430};
433 431
434static struct regulator_init_data vgen_init = { 432static struct regulator_init_data vgen_init = {