---

yaml --- r: 140255 b: refs/heads/master c: fa16a5c h: refs/heads/master i: 140253: 56b2bf2 140251: 0bf902d 140247: 67ca75d 140239: 0f2aa6e 140223: 72b1deb v: v3
git-mirror · Mar 31, 2009 · 2f53ad9 · 2f53ad9
1 parent db35382
commit 2f53ad9
Show file tree

Hide file tree

Showing 5 changed files with 567 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b2a6061afe6fcc44437cd5ec641b0aeb2825ee3
+refs/heads/master: fa16a5c13a2fc1433cfff38a083b4f8c5138d022
diff --git a/trunk/drivers/regulator/Kconfig b/trunk/drivers/regulator/Kconfig
@@ -56,6 +56,13 @@ config REGULATOR_BQ24022
 	  charging select between 100 mA and 500 mA charging current
 	  limit.
 
+config REGULATOR_TWL4030
+	bool "TI TWL4030/TWL5030/TPS695x0 PMIC"
+	depends on TWL4030_CORE
+	help
+	  This driver supports the voltage regulators provided by
+	  this family of companion chips.
+
 config REGULATOR_WM8350
 	tristate "Wolfson Microelectroncis WM8350 AudioPlus PMIC"
 	depends on MFD_WM8350

diff --git a/trunk/drivers/regulator/Makefile b/trunk/drivers/regulator/Makefile
@@ -8,6 +8,7 @@ obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o
 obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o
 
 obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o
+obj-$(CONFIG_REGULATOR_TWL4030) += twl4030-regulator.o
 obj-$(CONFIG_REGULATOR_WM8350) += wm8350-regulator.o
 obj-$(CONFIG_REGULATOR_WM8400) += wm8400-regulator.o
 obj-$(CONFIG_REGULATOR_DA903X)	+= da903x.o