diff options
| author | Jimmy Rubin <jimmy.rubin@stericsson.com> | 2011-10-11 12:31:55 +0200 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 10:59:11 +0200 |
| commit | 8c25e3981087dc8268dddc33076f325e7cc3b707 (patch) | |
| tree | 2f29fb69b0c568cceb30ce1fc02a88aaab4e201d /arch/arm/mach-ux500 | |
| parent | 705305f9b1e4b53ea2491a05995c402e0c74df54 (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>
Diffstat (limited to 'arch/arm/mach-ux500')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500-regulators.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 183ba5dcb26..ed3b563fb04 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-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"), |