aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorRhyland Klein <rklein@nvidia.com>2011-12-05 20:50:45 -0500
committerAnton Vorontsov <cbouatmailru@gmail.com>2012-01-05 20:22:12 -0500
commitc78f2b64963654419a8cd3b7e264251860e9f9eb (patch)
tree7705995811d4527753874d03264a0ba1301b8157 /drivers/power
parentdaf22c3c4444e10a852a2f460f5cb1a43038bd53 (diff)
bq20z75: Rename to sbs-battery
This driver for the bq20z75 implemented the register spec defined by the SBS standard. As this is not unique to this the TI part this was originally written for, we can generalize this driver to show its support for any SBS compliant battery. Signed-off-by: Rhyland Klein <rklein@nvidia.com> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/Kconfig8
-rw-r--r--drivers/power/Makefile2
-rw-r--r--drivers/power/sbs-battery.c (renamed from drivers/power/bq20z75.c)0
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
index 3bd2ed86fea2..e24485f35384 100644
--- a/drivers/power/Kconfig
+++ b/drivers/power/Kconfig
@@ -116,12 +116,12 @@ config BATTERY_WM97XX
116 help 116 help
117 Say Y to enable support for battery measured by WM97xx aux port. 117 Say Y to enable support for battery measured by WM97xx aux port.
118 118
119config BATTERY_BQ20Z75 119config BATTERY_SBS
120 tristate "TI BQ20z75 gas gauge" 120 tristate "SBS Compliant gas gauge"
121 depends on I2C 121 depends on I2C
122 help 122 help
123 Say Y to include support for TI BQ20z75 SBS-compliant 123 Say Y to include support for SBS battery driver for SBS-compliant
124 gas gauge and protection IC. 124 gas gauges.
125 125
126config BATTERY_BQ27x00 126config BATTERY_BQ27x00
127 tristate "BQ27x00 battery driver" 127 tristate "BQ27x00 battery driver"
diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 9a78b1dd570b..9c3bbf76a2bf 100644
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -22,7 +22,7 @@ obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o
22obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o 22obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o
23obj-$(CONFIG_BATTERY_COLLIE) += collie_battery.o 23obj-$(CONFIG_BATTERY_COLLIE) += collie_battery.o
24obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o 24obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o
25obj-$(CONFIG_BATTERY_BQ20Z75) += bq20z75.o 25obj-$(CONFIG_BATTERY_SBS) += sbs-battery.o
26obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o 26obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o
27obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o 27obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o
28obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o 28obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o
diff --git a/drivers/power/bq20z75.c b/drivers/power/sbs-battery.c
index ce95ff791016..ce95ff791016 100644
--- a/drivers/power/bq20z75.c
+++ b/drivers/power/sbs-battery.c