diff options
| author | Jimmy Rubin <jimmy.rubin@stericsson.com> | 2011-10-11 12:31:55 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-27 16:08:45 +0200 |
| commit | fd5871b1deb2c11a53557ecf76a3dc14f8feb636 (patch) | |
| tree | d42c24ee50c456179aaf95f411b27aef3f474aca | |
| parent | a2ef2573cb68e88ca1b0595484cfd2208956d26c (diff) | |
ux500: mcde: Add correct reg id for sony display
ST-Ericsson ID: 321190
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I606e9f3df286e7f8cd383e6840561ab9742d612c
Signed-off-by: Jimmy Rubin <jimmy.rubin@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33680
Reviewed-by: QABUILD
Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-mcde.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-mcde.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-regulators.c | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-mcde.c b/arch/arm/mach-ux500/board-mop500-mcde.c index b517cecc72e..a1055854d47 100644 --- a/arch/arm/mach-ux500/board-mop500-mcde.c +++ b/arch/arm/mach-ux500/board-mop500-mcde.c @@ -144,7 +144,7 @@ static struct mcde_port sony_port0 = { struct mcde_display_sony_acx424akp_platform_data sony_acx424akp_display0_pdata = { .reset_gpio = HREFV60_DISP2_RST_GPIO, - .regulator_id = "vaux12v5", + .regulator_id = "vddi", }; static struct mcde_display_device sony_acx424akp_display0 = { diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 41a6f42a719..2ff6c8a9782 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -80,8 +80,8 @@ struct regulator_init_data tps61052_regulator = { }; static struct regulator_consumer_supply ab8500_vaux1_consumers[] = { - /* Main display, u8500 R3 uib, display connector 2v5 power supply */ - REGULATOR_SUPPLY("vaux12v5", "mcde_disp_sony_acx424akp.0"), + /* Main display, u8500 R3 uib */ + REGULATOR_SUPPLY("vddi", "mcde_disp_sony_acx424akp.0"), /* Main display, u8500 uib and ST uib */ REGULATOR_SUPPLY("vdd1", "samsung_s6d16d0.0"), /* Secondary display, ST uib */ diff --git a/arch/arm/mach-ux500/board-u5500-mcde.c b/arch/arm/mach-ux500/board-u5500-mcde.c index 54245db882c..859a316cd45 100644 --- a/arch/arm/mach-ux500/board-u5500-mcde.c +++ b/arch/arm/mach-ux500/board-u5500-mcde.c @@ -174,7 +174,7 @@ struct mcde_display_sony_acx424akp_platform_data \ .reset_low_delay = 1, .sleep_out_delay = 140, #ifdef CONFIG_REGULATOR - .regulator_id = "v-display", + .regulator_id = "vddi", .min_supply_voltage = 2800000, /* 2.8V */ .max_supply_voltage = 2800000 /* 2.8V */ #endif diff --git a/arch/arm/mach-ux500/board-u5500-regulators.c b/arch/arm/mach-ux500/board-u5500-regulators.c index 881391897ec..dcb48012753 100644 --- a/arch/arm/mach-ux500/board-u5500-regulators.c +++ b/arch/arm/mach-ux500/board-u5500-regulators.c @@ -23,7 +23,9 @@ static struct regulator_consumer_supply ab5500_ldo_g_consumers[] = { }; static struct regulator_consumer_supply ab5500_ldo_h_consumers[] = { - REGULATOR_SUPPLY("v-display", NULL), + /* Remove once sony display driver is updated */ + REGULATOR_SUPPLY("vddi", NULL), + REGULATOR_SUPPLY("vddi", "mcde_disp_sony_acx424akp.0"), REGULATOR_SUPPLY("vdd", "1-004b"), /* Synaptics */ REGULATOR_SUPPLY("vin", "2-0036"), /* LM3530 */ REGULATOR_SUPPLY("vcpin", "spi1.0"), |