summaryrefslogtreecommitdiff
path: root/drivers/power
diff options
context:
space:
mode:
authorSyed Rafiuddin <srafiuddin@nvidia.com>2012-01-31 20:32:43 +0530
committerSimone Willett <swillett@nvidia.com>2012-02-10 13:25:21 -0800
commitd9cf97654bc25b7044278cb9b56e444c776f7b5c (patch)
treebcda067ec6a13b1f39c5b741a6a11fd7cf328ee6 /drivers/power
parentf54bbef35a4e4ef385c087f05080bf5924e6ec80 (diff)
power: max17048: Kconfig and Makefile changes
This patch enables Kconfig and Makefile option Signed-off-by: Syed Rafiuddin <srafiuddin@nvidia.com> Reviewed-on: http://git-master/r/78289 (cherry picked from commit b0bc7843eff62ff0a0d2476645fb96b1b947baa4) Change-Id: Ib5928f88d041731b95713a97f894a0ee3a28ae1c Signed-off-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-on: http://git-master/r/82701 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/Kconfig9
-rw-r--r--drivers/power/Makefile1
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index d70887fa2e1e..e69fc2be3ccc 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -189,6 +189,15 @@ config BATTERY_MAX17042
multi-function devices that include fuel gauages that are compatible
with MAX17042.
+config BATTERY_MAX17048
+ tristate "Maxim MAX17048/17049 Fuel Gauge"
+ depends on I2C
+ help
+ MAX17048 is fuel-gauge systems for lithium-ion (Li+) batteries
+ in handheld and portable equipment. The MAX17048 is configured
+ to operate with a single lithium cell, and MAX17049 for two lithium
+ cells.
+
config BATTERY_Z2
tristate "Z2 battery driver"
depends on I2C && MACH_ZIPIT2
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 82bdd18e3d81..4532fba4ac05 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -29,6 +29,7 @@ obj-$(CONFIG_BATTERY_GAUGE_TPS8003X) += tps80031_battery_gauge.o
obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o
obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o
obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o
+obj-$(CONFIG_BATTERY_MAX17048) += max17048_battery.o
obj-$(CONFIG_BATTERY_Z2) += z2_battery.o
obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o
obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o