lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OMAP2: Devkit8000: Cleanup for power supplies

Browse Source 
Corrected the wrong power supplies in devkit8000 code.

Add supply for ads7846 to support the new regulator framework for
touchscreen.

Signed-off-by: Thomas Weber <weber@corscience.de>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Thomas Weber 2010-07-05 17:04:39 +03:00 committed by Tony Lindgren
parent 847e951b99
commit 5fd58b5103
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
arch/arm/mach-omap2/board-devkit8000.c
View File

@ -168,6 +168,10 @@ static struct regulator_consumer_supply devkit8000_vsim_supply = {
.supply = "vmmc_aux",
};
/* ads7846 on SPI */
static struct regulator_consumer_supply devkit8000_vio_supplies[] = {
REGULATOR_SUPPLY("vcc", "spi2.0")
};
static struct omap_dss_device devkit8000_lcd_device = {
.name = "lcd",
@ -282,7 +286,7 @@ static struct twl4030_gpio_platform_data devkit8000_gpio_data = {
.setup = devkit8000_twl_gpio_setup,
};
static struct regulator_consumer_supply devkit8000_vpll2_supplies[] = {
static struct regulator_consumer_supply devkit8000_vpll1_supplies[] = {
{
.supply = "vdvi",
.dev = &devkit8000_lcd_device.dev,
@ -337,8 +341,8 @@ static struct regulator_init_data devkit8000_vdac = {
.consumer_supplies = &devkit8000_vdda_dac_supply,
};
/* VPLL2 for digital video outputs */
static struct regulator_init_data devkit8000_vpll2 = {
/* VPLL1 for digital video outputs */
static struct regulator_init_data devkit8000_vpll1 = {
.constraints = {
.name = "VDVI",
.min_uV = 1800000,
@ -348,8 +352,23 @@ static struct regulator_init_data devkit8000_vpll2 = {
.valid_ops_mask = REGULATOR_CHANGE_MODE
| REGULATOR_CHANGE_STATUS,
},
.num_consumer_supplies = ARRAY_SIZE(devkit8000_vpll2_supplies),
.consumer_supplies = devkit8000_vpll2_supplies,
.num_consumer_supplies = ARRAY_SIZE(devkit8000_vpll1_supplies),
.consumer_supplies = devkit8000_vpll1_supplies,
};
/* VAUX4 for ads7846 and nubs */
static struct regulator_init_data devkit8000_vio = {
.constraints = {
.min_uV = 1800000,
.max_uV = 1800000,
.apply_uV = true,
.valid_modes_mask = REGULATOR_MODE_NORMAL
| REGULATOR_MODE_STANDBY,
.valid_ops_mask = REGULATOR_CHANGE_MODE
| REGULATOR_CHANGE_STATUS,
},
.num_consumer_supplies = ARRAY_SIZE(devkit8000_vio_supplies),
.consumer_supplies = devkit8000_vio_supplies,
};
static struct twl4030_usb_data devkit8000_usb_data = {
@ -376,7 +395,8 @@ static struct twl4030_platform_data devkit8000_twldata = {
.vmmc1 = &devkit8000_vmmc1,
.vsim = &devkit8000_vsim,
.vdac = &devkit8000_vdac,
.vpll2 = &devkit8000_vpll2,
.vpll1 = &devkit8000_vpll1,
.vio = &devkit8000_vio,
.keypad = &devkit8000_kp_data,
};