summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ux500/board-mop500-mcde.c2
-rw-r--r--arch/arm/mach-ux500/board-mop500-regulators.c4
-rw-r--r--arch/arm/mach-ux500/board-u5500-mcde.c2
-rw-r--r--arch/arm/mach-ux500/board-u5500-regulators.c4
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 5bbcb37e1f9..691dac5b981 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 2aab5ec83ff..63135f3a6cd 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -38,8 +38,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 7327813fbcc..7ce70cea553 100644
--- a/arch/arm/mach-ux500/board-u5500-mcde.c
+++ b/arch/arm/mach-ux500/board-u5500-mcde.c
@@ -175,7 +175,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 a3bb277f72d..6085a5dc7ba 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"),