diff options
-rw-r--r-- | Documentation/devicetree/bindings/regulator/twl-regulator.txt | 2 | ||||
-rw-r--r-- | drivers/regulator/twl-regulator.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/regulator/twl-regulator.txt b/Documentation/devicetree/bindings/regulator/twl-regulator.txt index ba9d2ccf8fdc..0c3395d55ac1 100644 --- a/Documentation/devicetree/bindings/regulator/twl-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/twl-regulator.txt | |||
@@ -13,6 +13,8 @@ For twl6030 regulators/LDOs | |||
13 | - "ti,twl6030-vcxio" for VCXIO LDO | 13 | - "ti,twl6030-vcxio" for VCXIO LDO |
14 | - "ti,twl6030-vdac" for VDAC LDO | 14 | - "ti,twl6030-vdac" for VDAC LDO |
15 | - "ti,twl6030-vusb" for VUSB LDO | 15 | - "ti,twl6030-vusb" for VUSB LDO |
16 | - "ti,twl6030-v1v8" for V1V8 LDO | ||
17 | - "ti,twl6030-v2v1" for V2V1 LDO | ||
16 | - "ti,twl6030-clk32kg" for CLK32KG RESOURCE | 18 | - "ti,twl6030-clk32kg" for CLK32KG RESOURCE |
17 | - "ti,twl6030-vdd1" for VDD1 SMPS | 19 | - "ti,twl6030-vdd1" for VDD1 SMPS |
18 | - "ti,twl6030-vdd2" for VDD2 SMPS | 20 | - "ti,twl6030-vdd2" for VDD2 SMPS |
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); | |||
1094 | TWL6030_FIXED_LDO(VCXIO, 0x60, 1800, 0); | 1094 | TWL6030_FIXED_LDO(VCXIO, 0x60, 1800, 0); |
1095 | TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 0); | 1095 | TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 0); |
1096 | TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 0); | 1096 | TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 0); |
1097 | TWL6030_FIXED_LDO(V1V8, 0x16, 1800, 0); | ||
1098 | TWL6030_FIXED_LDO(V2V1, 0x1c, 2100, 0); | ||
1097 | TWL6030_FIXED_RESOURCE(CLK32KG, 0x8C, 0); | 1099 | TWL6030_FIXED_RESOURCE(CLK32KG, 0x8C, 0); |
1098 | TWL6025_ADJUSTABLE_SMPS(SMPS3, 0x34); | 1100 | TWL6025_ADJUSTABLE_SMPS(SMPS3, 0x34); |
1099 | TWL6025_ADJUSTABLE_SMPS(SMPS4, 0x10); | 1101 | TWL6025_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), |