From: David Brownell <dbrownell@users.sourceforge.net>
Date: Fri, 20 Mar 2009 22:33:11 +0000 (+0000)
Subject: sdp regulator init updates
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c274d9729a5862d6641df0260679e27b8915259f;p=linux-2.6-omap-h63xx.git

sdp regulator init updates

Hook up VPLL2 regulator on 3430 SDP.  Link that and VDAC to the
framebuffer device, supporting eventual conversion to use the
regulator framework.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 08f0d41d7ca..0a1099ead14 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -189,6 +189,8 @@ static int ads7846_vaux_control(int vaux_cntrl)
 {
 	int ret = 0;
 
+	/* FIXME use regulator calls */
+
 #ifdef CONFIG_TWL4030_CORE
 	/* check for return value of ldo_use: if success it returns 0 */
 	if (vaux_cntrl == VAUX_ENABLE) {
@@ -245,6 +247,16 @@ static struct platform_device sdp3430_lcd_device = {
 	.id		= -1,
 };
 
+static struct regulator_consumer_supply sdp3430_vdac_supply = {
+	.supply		= "vdac",
+	.dev		= &sdp3430_lcd_device.dev,
+};
+
+static struct regulator_consumer_supply sdp3430_vdvi_supply = {
+	.supply		= "vdvi",
+	.dev		= &sdp3430_lcd_device.dev,
+};
+
 static struct platform_device *sdp3430_devices[] __initdata = {
 	&sdp3430_smc91x_device,
 	&sdp3430_lcd_device,
@@ -587,6 +599,23 @@ static struct regulator_init_data sdp3430_vdac = {
 		.valid_ops_mask		= REGULATOR_CHANGE_MODE
 					| REGULATOR_CHANGE_STATUS,
 	},
+	.num_consumer_supplies	= 1,
+	.consumer_supplies	= &sdp3430_vdac_supply,
+};
+
+/* VPLL2 for digital video outputs */
+static struct regulator_init_data sdp3430_vpll2 = {
+	.constraints = {
+		.name			= "VDVI",
+		.min_uV			= 1800000,
+		.max_uV			= 1800000,
+		.valid_modes_mask	= REGULATOR_MODE_NORMAL
+					| REGULATOR_MODE_STANDBY,
+		.valid_ops_mask		= REGULATOR_CHANGE_MODE
+					| REGULATOR_CHANGE_STATUS,
+	},
+	.num_consumer_supplies	= 1,
+	.consumer_supplies	= &sdp3430_vdvi_supply,
 };
 
 static struct twl4030_platform_data sdp3430_twldata = {
@@ -609,6 +638,7 @@ static struct twl4030_platform_data sdp3430_twldata = {
 	.vmmc2		= &sdp3430_vmmc2,
 	.vsim		= &sdp3430_vsim,
 	.vdac		= &sdp3430_vdac,
+	.vpll2		= &sdp3430_vpll2,
 };
 
 static struct i2c_board_info __initdata sdp3430_i2c_boardinfo[] = {