Merge xburst target.

[openwrt-10.03/.git] / target / linux / xburst / patches-2.6.32 / 100-battery.patch

diff --git a/target/linux/xburst/patches-2.6.32/100-battery.patch b/target/linux/xburst/patches-2.6.32/100-battery.patch
new file mode 100644 (file)
index 0000000..5885839
--- /dev/null
+++ b/target/linux/xburst/patches-2.6.32/100-battery.patch
@@ -0,0 +1,42 @@
+From 045c37b75e13fe84f582627f7e2f68b7fa194909 Mon Sep 17 00:00:00 2001
+From: Lars-Peter Clausen <lars@metafoo.de>
+Date: Mon, 11 Jan 2010 04:29:41 +0100
+Subject: [PATCH] /opt/Projects/openwrt/target/linux/xburst/patches-2.6.31/100-battery.patch
+
+---
+ drivers/power/Kconfig  |   11 +++++++++++
+ drivers/power/Makefile |    1 +
+ 2 files changed, 12 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
+index cea6cef..f10934e 100644
+--- a/drivers/power/Kconfig
++++ b/drivers/power/Kconfig
+@@ -110,4 +110,15 @@ config CHARGER_PCF50633
+       help
+        Say Y to include support for NXP PCF50633 Main Battery Charger.
+ 
++config BATTERY_JZ4740
++      tristate "Ingenic JZ4720/JZ4740 battery"
++      depends on SOC_JZ4740
++      depends on JZ4740_ADC
++      help
++        Say Y to enable support for the battery on Ingenic JZ4720/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/drivers/power/Makefile b/drivers/power/Makefile
+index b96f29d..664d589 100644
+--- a/drivers/power/Makefile
++++ b/drivers/power/Makefile
+@@ -29,3 +29,4 @@ obj-$(CONFIG_BATTERY_BQ27x00)        += bq27x00_battery.o
+ obj-$(CONFIG_BATTERY_DA9030)  += da9030_battery.o
+ obj-$(CONFIG_BATTERY_MAX17040)        += max17040_battery.o
+ obj-$(CONFIG_CHARGER_PCF50633)        += pcf50633-charger.o
++obj-$(CONFIG_BATTERY_JZ4740)  += jz4740-battery.o
+-- 
+1.5.6.5
+