From 238eb097adbd54004752ff1ceab90e5712e58bab Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Thu, 21 Mar 2013 15:59:05 +0000 Subject: [PATCH] --- yaml --- r: 365039 b: refs/heads/master c: 27f26de1850e36254b4e5e4162d1e047e46914fc h: refs/heads/master i: 365037: 64d4572500b045fa9fc4bf004f7c9d104f04c892 365035: 175e59f5c4ea2a05c4050a66403a931b88eda3f0 365031: 741b138ac38ca012b938a594d06549398c057584 365023: 7152b0b85fa8a71571b919e9a4f2de55ab5fc7b8 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/board-mop500-regulators.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 855ce738646a..9af1fffc6230 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 292349287f6dfedf0c1b6ae678cb508d9d63d7ac +refs/heads/master: 27f26de1850e36254b4e5e4162d1e047e46914fc diff --git a/trunk/arch/arm/mach-ux500/board-mop500-regulators.c b/trunk/arch/arm/mach-ux500/board-mop500-regulators.c index 0fd84d42e1ec..c4d0d0cd69a2 100644 --- a/trunk/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/trunk/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 */