diff options
| author | Marcus Lorentzon <marcus.xm.lorentzon@stericsson.com> | 2011-10-06 20:06:39 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2012-01-05 10:14:07 +0000 |
| commit | 500211c3a3358500fd79d7bafaef8f4b1631a889 (patch) | |
| tree | 3748c59585d0ee06b992963e15fdcd19cbf4422d /arch/arm | |
| parent | ff6cf0dc4442dfbd203de04c7cf5fc3c7b96e2bd (diff) | |
ux500: mcde: Replace generic driver with Samsung
Remove use of MCDE generic DSI driver in favor of the
real Samsung S6D16D0 driver to reduce the amount of code
in mop500 board config.
ST-Ericsson ID: 365249
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Idecde46fba388789403fea63210e81ed10cb75db
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33264
Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
Tested-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com>
Reviewed-by: Per PERSSON <per.xb.persson@stericsson.com>
Reviewed-by: QABUILD
Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500-regulators.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/board-mop500-regulators.c b/arch/arm/mach-ux500/board-mop500-regulators.c index 926c157ab09..d4d454049ff 100644 --- a/arch/arm/mach-ux500/board-mop500-regulators.c +++ b/arch/arm/mach-ux500/board-mop500-regulators.c @@ -80,9 +80,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_disp_generic.0"), + /* Main display, u8500 R3 uib, display connector 2v5 power supply */ REGULATOR_SUPPLY("vaux12v5", "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 */ |