Merge branch 'omap-fixes'

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-3430sdp.c

diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 08f0d41d7ca20d45174cc36d1e6c678a7da6c680..03acac79adfc730cb697d1d4dcff29312c48fc2d 100644 (file)
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -61,6 +61,8 @@
 
 #define TWL4030_MSECURE_GPIO 22
 
+extern void sdp3430_flash_init(void);
+
 static struct resource sdp3430_smc91x_resources[] = {
        [0] = {
                .flags  = IORESOURCE_MEM,
@@ -189,6 +191,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 +249,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 +601,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 +640,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[] = {