From a23760d9ad29b1d6875e4cd6d4df29594150cfa2 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Tue, 28 Feb 2012 15:09:12 +0530 Subject: [PATCH] --- yaml --- r: 292095 b: refs/heads/master c: e9d47fa4ebb9382bc3282fc13ad28a4e2a1a089e h: refs/heads/master i: 292093: a332d8ec3af86f51b793985c558e7b2b99df4e1a 292091: 44f44945945488a73126ccb2f59b6d8cb0434d98 292087: 080e087a670e83226492b810bbc24b5d3e5a25f1 292079: fda31ca5feeb0d5582375b366cfbe413c5f3153b 292063: 3a7d18e3ab7a14a8131cf349abc0ea471cf77043 292031: 7e1c100d77610f94bfa0a6d4aa8caee16029571c 291967: 09e31aa53eb0269908ddd86d75c7d85a00824eef 291839: 78f3b13581fbbb2fb5b84a1bd8d36e9ee2a8cea2 v: v3 --- [refs] | 2 +- .../devicetree/bindings/regulator/twl-regulator.txt | 2 ++ trunk/drivers/regulator/twl-regulator.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bc65183d7cb5..4ec6226aba37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2098e95ce9bb039ff2e7bf836df358d18a176139 +refs/heads/master: e9d47fa4ebb9382bc3282fc13ad28a4e2a1a089e diff --git a/trunk/Documentation/devicetree/bindings/regulator/twl-regulator.txt b/trunk/Documentation/devicetree/bindings/regulator/twl-regulator.txt index ba9d2ccf8fdc..0c3395d55ac1 100644 --- a/trunk/Documentation/devicetree/bindings/regulator/twl-regulator.txt +++ b/trunk/Documentation/devicetree/bindings/regulator/twl-regulator.txt @@ -13,6 +13,8 @@ For twl6030 regulators/LDOs - "ti,twl6030-vcxio" for VCXIO LDO - "ti,twl6030-vdac" for VDAC LDO - "ti,twl6030-vusb" for VUSB LDO + - "ti,twl6030-v1v8" for V1V8 LDO + - "ti,twl6030-v2v1" for V2V1 LDO - "ti,twl6030-clk32kg" for CLK32KG RESOURCE - "ti,twl6030-vdd1" for VDD1 SMPS - "ti,twl6030-vdd2" for VDD2 SMPS diff --git a/trunk/drivers/regulator/twl-regulator.c b/trunk/drivers/regulator/twl-regulator.c index 2a1321135178..9cdfc389ca26 100644 --- a/trunk/drivers/regulator/twl-regulator.c +++ b/trunk/drivers/regulator/twl-regulator.c @@ -1094,6 +1094,8 @@ TWL6030_FIXED_LDO(VANA, 0x50, 2100, 0); TWL6030_FIXED_LDO(VCXIO, 0x60, 1800, 0); TWL6030_FIXED_LDO(VDAC, 0x64, 1800, 0); TWL6030_FIXED_LDO(VUSB, 0x70, 3300, 0); +TWL6030_FIXED_LDO(V1V8, 0x16, 1800, 0); +TWL6030_FIXED_LDO(V2V1, 0x1c, 2100, 0); TWL6030_FIXED_RESOURCE(CLK32KG, 0x8C, 0); TWL6025_ADJUSTABLE_SMPS(SMPS3, 0x34); TWL6025_ADJUSTABLE_SMPS(SMPS4, 0x10); @@ -1173,6 +1175,8 @@ static const struct of_device_id twl_of_match[] __devinitconst = { TWLFIXED_OF_MATCH("ti,twl6030-vcxio", VCXIO), TWLFIXED_OF_MATCH("ti,twl6030-vdac", VDAC), TWLFIXED_OF_MATCH("ti,twl6030-vusb", VUSB), + TWLFIXED_OF_MATCH("ti,twl6030-v1v8", V1V8), + TWLFIXED_OF_MATCH("ti,twl6030-v2v1", V2V1), TWLRES_OF_MATCH("ti,twl6030-clk32kg", CLK32KG), TWLSMPS_OF_MATCH("ti,twl6025-smps3", SMPS3), TWLSMPS_OF_MATCH("ti,twl6025-smps4", SMPS4),