Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 081bab21 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Sebastian Reichel
Browse files

power: bq27x00_battery: Renaming for consistency 



Rename functions that are used by multiple devices. New devices
have been added and the function names and driver name are no longer
general enough for the functionality they provide.

Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarGUAN Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: default avatarSebastian Reichel <sre@kernel.org>
parent 95b8aff2

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -7393,10 +7393,10 @@ NOKIA N900 POWER SUPPLY DRIVERS 
M:	Pali Rohár <pali.rohar@gmail.com>

S:	Maintained

F:	include/linux/power/bq2415x_charger.h

F:	include/linux/power/bq27x00_battery.h

F:	include/linux/power/bq27xxx_battery.h

F:	include/linux/power/isp1704_charger.h

F:	drivers/power/bq2415x_charger.c

F:	drivers/power/bq27x00_battery.c

F:	drivers/power/bq27xxx_battery.c

F:	drivers/power/isp1704_charger.c

F:	drivers/power/rx51_battery.c

arch/arm/configs/omap2plus_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ CONFIG_GPIO_TWL4030=y 
CONFIG_GPIO_PALMAS=y

CONFIG_W1=m

CONFIG_HDQ_MASTER_OMAP=m

CONFIG_BATTERY_BQ27x00=m

CONFIG_BATTERY_BQ27XXX=m

CONFIG_CHARGER_ISP1704=m

CONFIG_CHARGER_TWL4030=m

CONFIG_CHARGER_BQ2415X=m

arch/unicore32/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ config I2C_BATTERY_BQ27200 
	tristate "I2C Battery BQ27200 Support"

	select I2C_PUV3

	select POWER_SUPPLY

	select BATTERY_BQ27x00

	select BATTERY_BQ27XXX



config I2C_EEPROM_AT24

	tristate "I2C EEPROMs AT24 support"

drivers/power/Kconfig

+11 −11
Original line number Diff line number Diff line
@@ -157,26 +157,26 @@ config BATTERY_SBS 
	  Say Y to include support for SBS battery driver for SBS-compliant

	  gas gauges.



config BATTERY_BQ27x00

	tristate "BQ27x00 battery driver"

config BATTERY_BQ27XXX

	tristate "BQ27xxx battery driver"

	depends on I2C || I2C=n

	help

	  Say Y here to enable support for batteries with BQ27x00 (I2C/HDQ) chips.

	  Say Y here to enable support for batteries with BQ27xxx (I2C/HDQ) chips.



config BATTERY_BQ27X00_I2C

	bool "BQ27200/BQ27500 support"

	depends on BATTERY_BQ27x00

config BATTERY_BQ27XXX_I2C

	bool "BQ27xxx I2C support"

	depends on BATTERY_BQ27XXX

	depends on I2C

	default y

	help

	  Say Y here to enable support for batteries with BQ27x00 (I2C) chips.

	  Say Y here to enable support for batteries with BQ27xxx (I2C) chips.



config BATTERY_BQ27X00_PLATFORM

	bool "BQ27000 support"

	depends on BATTERY_BQ27x00

config BATTERY_BQ27XXX_PLATFORM

	bool "BQ27xxx HDQ support"

	depends on BATTERY_BQ27XXX

	default y

	help

	  Say Y here to enable support for batteries with BQ27000 (HDQ) chips.

	  Say Y here to enable support for batteries with BQ27xxx (HDQ) chips.



config BATTERY_DA9030

	tristate "DA9030 battery driver"

drivers/power/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ obj-$(CONFIG_BATTERY_COLLIE) += collie_battery.o 
obj-$(CONFIG_BATTERY_IPAQ_MICRO) += ipaq_micro_battery.o

obj-$(CONFIG_BATTERY_WM97XX)	+= wm97xx_battery.o

obj-$(CONFIG_BATTERY_SBS)	+= sbs-battery.o

obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o

obj-$(CONFIG_BATTERY_BQ27XXX)	+= bq27xxx_battery.o

obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o

obj-$(CONFIG_BATTERY_DA9052)	+= da9052-battery.o

obj-$(CONFIG_CHARGER_DA9150)	+= da9150-charger.o