aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2012-02-28 04:39:12 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-11 16:09:18 -0400
commite9d47fa4ebb9382bc3282fc13ad28a4e2a1a089e (patch)
treeb106e171c05e3d409470f3e88a202c2ce4eb4c0c /drivers/regulator
parent2098e95ce9bb039ff2e7bf836df358d18a176139 (diff)
regulator: twl-regulator: Add fixed LDO for V1V8, V2V1 supply
V1V8 supply most common use is to provide VIO for the system. V2V1 supply is used on SDP4430/PandaBoards to provide 2.1V to twl6040, and also as an input to VCXIO_IN, VDAC_IN of twl6030. Also update the bindings documentation with the new compatible property for these additional LDOs. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Rajendra Nayak <rnayak@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/twl-regulator.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 2a1321135178..9cdfc389ca26 100644
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -1094,6 +1094,8 @@ TWL6030_FIXED_LDO(VANA, 0x50, 2100, 0);
1094TWL6030_FIXED_LDO(VCXIO, 0x60, 1800, 0); 1094TWL6030_FIXED_LDO(VCXIO, 0x60, 1800, 0);
1095TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 0); 1095TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 0);
1096TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 0); 1096TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 0);
1097TWL6030_FIXED_LDO(V1V8, 0x16, 1800, 0);
1098TWL6030_FIXED_LDO(V2V1, 0x1c, 2100, 0);
1097TWL6030_FIXED_RESOURCE(CLK32KG, 0x8C, 0); 1099TWL6030_FIXED_RESOURCE(CLK32KG, 0x8C, 0);
1098TWL6025_ADJUSTABLE_SMPS(SMPS3, 0x34); 1100TWL6025_ADJUSTABLE_SMPS(SMPS3, 0x34);
1099TWL6025_ADJUSTABLE_SMPS(SMPS4, 0x10); 1101TWL6025_ADJUSTABLE_SMPS(SMPS4, 0x10);
@@ -1173,6 +1175,8 @@ static const struct of_device_id twl_of_match[] __devinitconst = {
1173 TWLFIXED_OF_MATCH("ti,twl6030-vcxio", VCXIO), 1175 TWLFIXED_OF_MATCH("ti,twl6030-vcxio", VCXIO),
1174 TWLFIXED_OF_MATCH("ti,twl6030-vdac", VDAC), 1176 TWLFIXED_OF_MATCH("ti,twl6030-vdac", VDAC),
1175 TWLFIXED_OF_MATCH("ti,twl6030-vusb", VUSB), 1177 TWLFIXED_OF_MATCH("ti,twl6030-vusb", VUSB),
1178 TWLFIXED_OF_MATCH("ti,twl6030-v1v8", V1V8),
1179 TWLFIXED_OF_MATCH("ti,twl6030-v2v1", V2V1),
1176 TWLRES_OF_MATCH("ti,twl6030-clk32kg", CLK32KG), 1180 TWLRES_OF_MATCH("ti,twl6030-clk32kg", CLK32KG),
1177 TWLSMPS_OF_MATCH("ti,twl6025-smps3", SMPS3), 1181 TWLSMPS_OF_MATCH("ti,twl6025-smps3", SMPS3),
1178 TWLSMPS_OF_MATCH("ti,twl6025-smps4", SMPS4), 1182 TWLSMPS_OF_MATCH("ti,twl6025-smps4", SMPS4),