---

yaml --- r: 283482 b: refs/heads/master c: ded7fc7 h: refs/heads/master v: v3
git-mirror · Jan 6, 2012 · 2221efa · 2221efa
1 parent 8230abb
commit 2221efa
Show file tree

Hide file tree

Showing 4 changed files with 673 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c934502db7fda4fac1bb3b5c74f35e9bde8e7547
+refs/heads/master: ded7fc7b055055427d0d04958482dbe3d23e087d
diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig
@@ -150,6 +150,13 @@ config BATTERY_DA9030
 	  Say Y here to enable support for batteries charger integrated into
 	  DA9030 PMIC.
 
+config BATTERY_DA9052
+	tristate "Dialog DA9052 Battery"
+	depends on PMIC_DA9052
+	help
+	  Say Y here to enable support for batteries charger integrated into
+	  DA9052 PMIC.
+
 config BATTERY_MAX17040
 	tristate "Maxim MAX17040 Fuel Gauge"
 	depends on I2C

diff --git a/trunk/drivers/power/Makefile b/trunk/drivers/power/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_BATTERY_WM97XX)	+= wm97xx_battery.o
 obj-$(CONFIG_BATTERY_SBS)	+= sbs-battery.o
 obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o
 obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
+obj-$(CONFIG_BATTERY_DA9052)	+= da9052-battery.o
 obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o
 obj-$(CONFIG_BATTERY_MAX17042)	+= max17042_battery.o
 obj-$(CONFIG_BATTERY_Z2)	+= z2_battery.o