---

yaml --- r: 325504 b: refs/heads/master c: e60fea7 h: refs/heads/master v: v3
git-mirror · Sep 22, 2012 · 804824f · 804824f
1 parent 7aa9e09
commit 804824f
Show file tree

Hide file tree

Showing 5 changed files with 460 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2f13a68c37c13a7147b279b77b8fb2a36846059
+refs/heads/master: e60fea794e6ecb9ea4df2623c9498412afe31d4d
diff --git a/trunk/drivers/power/Kconfig b/trunk/drivers/power/Kconfig
@@ -29,6 +29,13 @@ config APM_POWER
 	  Say Y here to enable support APM status emulation using
 	  battery class devices.
 
+config GENERIC_ADC_BATTERY
+	tristate "Generic battery support using IIO"
+	depends on IIO
+	help
+	  Say Y here to enable support for the generic battery driver
+	  which uses IIO framework to read adc.
+
 config MAX8925_POWER
 	tristate "MAX8925 battery charger support"
 	depends on MFD_MAX8925

diff --git a/trunk/drivers/power/Makefile b/trunk/drivers/power/Makefile
@@ -5,6 +5,7 @@ power_supply-$(CONFIG_SYSFS)		+= power_supply_sysfs.o
 power_supply-$(CONFIG_LEDS_TRIGGERS)	+= power_supply_leds.o
 
 obj-$(CONFIG_POWER_SUPPLY)	+= power_supply.o
+obj-$(CONFIG_GENERIC_ADC_BATTERY)	+= generic-adc-battery.o
 
 obj-$(CONFIG_PDA_POWER)		+= pda_power.o
 obj-$(CONFIG_APM_POWER)		+= apm_power.o