summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2013-03-21 15:59:05 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-28 00:07:24 +0000
commit27f26de1850e36254b4e5e4162d1e047e46914fc (patch)
treea7d2be50ae74b46eadeeef9539ac087cca45326b /arch/arm
parent292349287f6dfedf0c1b6ae678cb508d9d63d7ac (diff)
downloadlinux-27f26de1850e36254b4e5e4162d1e047e46914fc.tar.gz
linux-27f26de1850e36254b4e5e4162d1e047e46914fc.tar.bz2
linux-27f26de1850e36254b4e5e4162d1e047e46914fc.zip
ARM: ux500: Update displays in vaux1 consumer list
Add 3 more specific consumers pertaining to the displays found on the u8500 and ST User Interface Boards (UIBs). Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-ux500/board-mop500-regulators.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c
index 0fd84d42e1ec..c4d0d0cd69a2 100644
--- a/arch/arm/mach-ux500/board-mop500-regulators.c
+++ b/arch/arm/mach-ux500/board-mop500-regulators.c
@@ -53,8 +53,12 @@ struct regulator_init_data tps61052_regulator = {
};
static struct regulator_consumer_supply ab8500_vaux1_consumers[] = {
- /* External displays, connector on board 2v5 power supply */
- REGULATOR_SUPPLY("vaux12v5", "mcde.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 */
+ REGULATOR_SUPPLY("vdd1", "samsung_s6d16d0.1"),
/* SFH7741 proximity sensor */
REGULATOR_SUPPLY("vcc", "gpio-keys.0"),
/* BH1780GLS ambient light sensor */