---

yaml --- r: 204582 b: refs/heads/master c: f6a2138 h: refs/heads/master v: v3
git-mirror · Aug 5, 2010 · c31f9cb · c31f9cb
1 parent acd2a26
commit c31f9cb
Show file tree

Hide file tree

Showing 5 changed files with 482 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f983ba93d449972d5f372f12c6ad32d86ef30b4
+refs/heads/master: f6a21388bd255773cc80d4423afb4c69d4daa173
diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig
@@ -142,4 +142,15 @@ config CHARGER_PCF50633
 	help
 	 Say Y to include support for NXP PCF50633 Main Battery Charger.
 
+config BATTERY_JZ4740
+	tristate "Ingenic JZ4740 battery"
+	depends on MACH_JZ4740
+	depends on MFD_JZ4740_ADC
+	help
+	  Say Y to enable support for the battery on Ingenic JZ4740 based
+	  boards.
+
+	  This driver can be build as a module. If so, the module will be
+	  called jz4740-battery.
+
 endif # POWER_SUPPLY
diff --git a/trunk/drivers/power/Makefile b/trunk/drivers/power/Makefile
@@ -34,3 +34,4 @@ obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
 obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o
 obj-$(CONFIG_BATTERY_Z2)	+= z2_battery.o
 obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
+obj-$(CONFIG_BATTERY_JZ4740)	+= jz4740-battery.o