diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-08-03 07:13:52 -0400 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-09-30 09:16:12 -0400 |
commit | 4e6a0ab0f9d4c8062bd84f3fc95b175001d46ebf (patch) | |
tree | 79d45b268abd4671f66ddb60a1a731dbfa3bb947 /arch/arm | |
parent | 7c68dd96d5a5eefe3ff6d9b94fc98fd9378aff1f (diff) |
OMAP4: TWL: Add common omapdss supplies
OMAP DSS normally gets power from VCXIO on OMAP4. Add configuration for
this into twl-common.c
Mark VCXIO as always_on, as VCXIO is used by multiple components,
including the MPU, and turning it off when DSS doesn't need it would
lead the device to halt.
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-omap2/twl-common.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c index 4f6d2164e8cf..522435772168 100644 --- a/arch/arm/mach-omap2/twl-common.c +++ b/arch/arm/mach-omap2/twl-common.c | |||
@@ -235,6 +235,12 @@ static struct regulator_init_data omap4_vana_idata = { | |||
235 | }, | 235 | }, |
236 | }; | 236 | }; |
237 | 237 | ||
238 | static struct regulator_consumer_supply omap4_vcxio_supply[] = { | ||
239 | REGULATOR_SUPPLY("vdds_dsi", "omapdss_dss"), | ||
240 | REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.0"), | ||
241 | REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi.1"), | ||
242 | }; | ||
243 | |||
238 | static struct regulator_init_data omap4_vcxio_idata = { | 244 | static struct regulator_init_data omap4_vcxio_idata = { |
239 | .constraints = { | 245 | .constraints = { |
240 | .min_uV = 1800000, | 246 | .min_uV = 1800000, |
@@ -243,7 +249,10 @@ static struct regulator_init_data omap4_vcxio_idata = { | |||
243 | | REGULATOR_MODE_STANDBY, | 249 | | REGULATOR_MODE_STANDBY, |
244 | .valid_ops_mask = REGULATOR_CHANGE_MODE | 250 | .valid_ops_mask = REGULATOR_CHANGE_MODE |
245 | | REGULATOR_CHANGE_STATUS, | 251 | | REGULATOR_CHANGE_STATUS, |
252 | .always_on = true, | ||
246 | }, | 253 | }, |
254 | .num_consumer_supplies = ARRAY_SIZE(omap4_vcxio_supply), | ||
255 | .consumer_supplies = omap4_vcxio_supply, | ||
247 | }; | 256 | }; |
248 | 257 | ||
249 | static struct regulator_init_data omap4_vusb_idata = { | 258 | static struct regulator_init_data omap4_vusb_idata = { |