From 500211c3a3358500fd79d7bafaef8f4b1631a889 Mon Sep 17 00:00:00 2001 From: Marcus Lorentzon Date: Thu, 6 Oct 2011 20:06:39 +0200 Subject: 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 Tested-by: Marcus LORENTZON Reviewed-by: Per PERSSON Reviewed-by: QABUILD Reviewed-by: Jimmy RUBIN --- arch/arm/mach-ux500/board-mop500-regulators.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'arch/arm') 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 */ -- cgit v1.2.3