power: move power supply drivers to power/supply

This moves all power supply drivers from drivers/power/
to drivers/power/supply/. The intention is a cleaner
source tree, since drivers/power/ also contains frameworks
unrelated to power supply, like adaptive voltage scaling.

Signed-off-by: Sebastian Reichel <[e-mail]>

Documentation/power/power_supply_class.txt

···
 manner. Results for different power supplies and machines are also directly
 comparable.
 
-See drivers/power/ds2760_battery.c and drivers/power/pda_power.c for the
-example how to declare and handle attributes.
+See drivers/power/supply/ds2760_battery.c and drivers/power/supply/pda_power.c
+for the example how to declare and handle attributes.
 
 
 Units

MAINTAINERS

···
 F:	drivers/mfd/da903x.c
 F:	drivers/mfd/da90??-*.c
 F:	drivers/mfd/da91??-*.c
-F:	drivers/power/da9052-battery.c
-F:	drivers/power/da91??-*.c
+F:	drivers/power/supply/da9052-battery.c
+F:	drivers/power/supply/da91??-*.c
 F:	drivers/regulator/da903x.c
 F:	drivers/regulator/da9???-regulator.[ch]
 F:	drivers/rtc/rtc-da90??.c
···
 M:	Krzysztof Kozlowski <[e-mail]>
 L:	[e-mail]
 S:	Supported
-F:	drivers/power/max14577_charger.c
-F:	drivers/power/max77693_charger.c
+F:	drivers/power/supply/max14577_charger.c
+F:	drivers/power/supply/max77693_charger.c
 
 MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS
 M:	Javier Martinez Canillas <[e-mail]>
···
 F:	include/linux/power/bq2415x_charger.h
 F:	include/linux/power/bq27xxx_battery.h
 F:	include/linux/power/isp1704_charger.h
-F:	drivers/power/bq2415x_charger.c
-F:	drivers/power/bq27xxx_battery.c
-F:	drivers/power/bq27xxx_battery_i2c.c
-F:	drivers/power/isp1704_charger.c
-F:	drivers/power/rx51_battery.c
+F:	drivers/power/supply/bq2415x_charger.c
+F:	drivers/power/supply/bq27xxx_battery.c
+F:	drivers/power/supply/bq27xxx_battery_i2c.c
+F:	drivers/power/supply/isp1704_charger.c
+F:	drivers/power/supply/rx51_battery.c
 
 NTB DRIVER CORE
 M:	Jon Mason <[e-mail]>
···
 F:	Documentation/devicetree/bindings/power/
 F:	Documentation/devicetree/bindings/power_supply/
 F:	include/linux/power_supply.h
-F:	drivers/power/
-X:	drivers/power/avs/
+F:	drivers/power/supply/
 
 POWER STATE COORDINATION INTERFACE (PSCI)
 M:	Mark Rutland <[e-mail]>
···
 TI BQ27XXX POWER SUPPLY DRIVER
 R:	Andrew F. Davis <[e-mail]>
 F:	include/linux/power/bq27xxx_battery.h
-F:	drivers/power/bq27xxx_battery.c
-F:	drivers/power/bq27xxx_battery_i2c.c
+F:	drivers/power/supply/bq27xxx_battery.c
+F:	drivers/power/supply/bq27xxx_battery_i2c.c
 
 TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
 M:	John Stultz <[e-mail]>
···
 S:	Supported
 F:	drivers/mfd/syscon.c
 
+SYSTEM RESET/SHUTDOWN DRIVERS
+M:	Sebastian Reichel <[e-mail]>
+M:	Dmitry Eremin-Solenikov <[e-mail]>
+M:	David Woodhouse <[e-mail]>
+L:	[e-mail]
+T:	git git://git.infradead.org/battery-2.6.git
+S:	Maintained
+F:	Documentation/devicetree/bindings/power/reset/
+F:	drivers/power/reset/
+
 SYSV FILESYSTEM
 M:	Christoph Hellwig <[e-mail]>
 S:	Maintained
···
 TI LP8727 CHARGER DRIVER
 M:	Milo Kim <[e-mail]>
 S:	Maintained
-F:	drivers/power/lp8727_charger.c
+F:	drivers/power/supply/lp8727_charger.c
 F:	include/linux/platform_data/lp8727.h
 
 TI LP8788 MFD DRIVER
···
 F:	drivers/iio/adc/lp8788_adc.c
 F:	drivers/leds/leds-lp8788.c
 F:	drivers/mfd/lp8788*.c
-F:	drivers/power/lp8788-charger.c
+F:	drivers/power/supply/lp8788-charger.c
 F:	drivers/regulator/lp8788-*.c
 F:	include/linux/mfd/lp8788*.h
 
···
 F:	drivers/mfd/arizona*
 F:	drivers/mfd/wm*.c
 F:	drivers/mfd/cs47l24*
-F:	drivers/power/wm83*.c
+F:	drivers/power/supply/wm83*.c
 F:	drivers/rtc/rtc-wm83*.c
 F:	drivers/regulator/wm8*.c
 F:	drivers/video/backlight/wm83*_bl.c

drivers/power/Kconfig

···
-menuconfig POWER_SUPPLY
-	bool "Power supply class support"
-	help
-	  Say Y here to enable power supply class support. This allows
-	  power supply (batteries, AC, USB) monitoring by userspace
-	  via sysfs and uevent (if available) and/or APM kernel interface
-	  (if selected below).
-
-if POWER_SUPPLY
-
-config POWER_SUPPLY_DEBUG
-	bool "Power supply debug"
-	help
-	  Say Y here to enable debugging messages for power supply class
-	  and drivers.
-
-config PDA_POWER
-	tristate "Generic PDA/phone power driver"
-	depends on !S390
-	help
-	  Say Y here to enable generic power driver for PDAs and phones with
-	  one or two external power supplies (AC/USB) connected to main and
-	  backup batteries, and optional builtin charger.
-
-config APM_POWER
-	tristate "APM emulation for class batteries"
-	depends on APM_EMULATION
-	help
-	  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
-	help
-	  Say Y here to enable support for the battery charger in the Maxim
-	  MAX8925 PMIC.
-
-config WM831X_BACKUP
-	tristate "WM831X backup battery charger support"
-	depends on MFD_WM831X
-	help
-	  Say Y here to enable support for the backup battery charger
-	  in the Wolfson Microelectronics WM831x PMICs.
-
-config WM831X_POWER
-	tristate "WM831X PMU support"
-	depends on MFD_WM831X
-	help
-	  Say Y here to enable support for the power management unit
-	  provided by Wolfson Microelectronics WM831x PMICs.
-
-config WM8350_POWER
-        tristate "WM8350 PMU support"
-        depends on MFD_WM8350
-        help
-          Say Y here to enable support for the power management unit
-	  provided by the Wolfson Microelectronics WM8350 PMIC.
-
-config TEST_POWER
-	tristate "Test power driver"
-	help
-	  This driver is used for testing. It's safe to say M here.
-
-config BATTERY_88PM860X
-	tristate "Marvell 88PM860x battery driver"
-	depends on MFD_88PM860X
-	help
-	  Say Y here to enable battery monitor for Marvell 88PM860x chip.
-
-config BATTERY_ACT8945A
-	tristate "Active-semi ACT8945A charger driver"
-	depends on MFD_ACT8945A || COMPILE_TEST
-	help
-	  Say Y here to enable support for power supply provided by
-	  Active-semi ActivePath ACT8945A charger.
-
-config BATTERY_DS2760
-	tristate "DS2760 battery driver (HP iPAQ & others)"
-	depends on W1 && W1_SLAVE_DS2760
-	help
-	  Say Y here to enable support for batteries with ds2760 chip.
-
-config BATTERY_DS2780
-	tristate "DS2780 battery driver"
-	depends on HAS_IOMEM
-	select W1
-	select W1_SLAVE_DS2780
-	help
-	  Say Y here to enable support for batteries with ds2780 chip.
-
-config BATTERY_DS2781
-	tristate "DS2781 battery driver"
-	depends on HAS_IOMEM
-	select W1
-	select W1_SLAVE_DS2781
-	help
-	  If you enable this you will have the DS2781 battery driver support.
-
-	  The battery monitor chip is used in many batteries/devices
-	  as the one who is responsible for charging/discharging/monitoring
-	  Li+ batteries.
-
-	  If you are unsure, say N.
-
-config BATTERY_DS2782
-	tristate "DS2782/DS2786 standalone gas-gauge"
-	depends on I2C
-	help
-	  Say Y here to enable support for the DS2782/DS2786 standalone battery
-	  gas-gauge.
-
-config BATTERY_PMU
-	tristate "Apple PMU battery"
-	depends on PPC32 && ADB_PMU
-	help
-	  Say Y here to expose battery information on Apple machines
-	  through the generic battery class.
-
-config BATTERY_OLPC
-	tristate "One Laptop Per Child battery"
-	depends on X86_32 && OLPC
-	help
-	  Say Y to enable support for the battery on the OLPC laptop.
-
-config BATTERY_TOSA
-	tristate "Sharp SL-6000 (tosa) battery"
-	depends on MACH_TOSA && MFD_TC6393XB && TOUCHSCREEN_WM97XX
-	help
-	  Say Y to enable support for the battery on the Sharp Zaurus
-	  SL-6000 (tosa) models.
-
-config BATTERY_COLLIE
-	tristate "Sharp SL-5500 (collie) battery"
-	depends on SA1100_COLLIE && MCP_UCB1200
-	help
-	  Say Y to enable support for the battery on the Sharp Zaurus
-	  SL-5500 (collie) models.
-
-config BATTERY_IPAQ_MICRO
-	tristate "iPAQ Atmel Micro ASIC battery driver"
-	depends on MFD_IPAQ_MICRO
-	help
-	  Choose this option if you want to monitor battery status on
-	  Compaq/HP iPAQ h3100 and h3600.
-
-config BATTERY_WM97XX
-	bool "WM97xx generic battery driver"
-	depends on TOUCHSCREEN_WM97XX=y
-	help
-	  Say Y to enable support for battery measured by WM97xx aux port.
-
-config BATTERY_SBS
-        tristate "SBS Compliant gas gauge"
-        depends on I2C
-        help
-	  Say Y to include support for SBS battery driver for SBS-compliant
-	  gas gauges.
-
-config BATTERY_BQ27XXX
-	tristate "BQ27xxx battery driver"
-	help
-	  Say Y here to enable support for batteries with BQ27xxx chips.
-
-config BATTERY_BQ27XXX_I2C
-	tristate "BQ27xxx I2C support"
-	depends on BATTERY_BQ27XXX
-	depends on I2C
-	default y
-	help
-	  Say Y here to enable support for batteries with BQ27xxx chips
-	  connected over an I2C bus.
-
-config BATTERY_DA9030
-	tristate "DA9030 battery driver"
-	depends on PMIC_DA903X
-	help
-	  Say Y here to enable support for batteries charger integrated into
-	  DA9030 PMIC.
-
-config BATTERY_DA9052
-	tristate "Dialog DA9052 Battery"
-	depends on PMIC_DA9052
-	help
-	  Say Y here to enable support for batteries charger integrated into
-	  DA9052 PMIC.
-
-config CHARGER_DA9150
-	tristate "Dialog Semiconductor DA9150 Charger support"
-	depends on MFD_DA9150
-	depends on DA9150_GPADC
-	depends on IIO
-	help
-	  Say Y here to enable support for charger unit of the DA9150
-	  Integrated Charger & Fuel-Gauge IC.
-
-	  This driver can also be built as a module. If so, the module will be
-	  called da9150-charger.
-
-config BATTERY_DA9150
-	tristate "Dialog Semiconductor DA9150 Fuel Gauge support"
-	depends on MFD_DA9150
-	help
-	  Say Y here to enable support for the Fuel-Gauge unit of the DA9150
-	  Integrated Charger & Fuel-Gauge IC
-
-	  This driver can also be built as a module. If so, the module will be
-	  called da9150-fg.
-
-config AXP288_CHARGER
-	tristate "X-Powers AXP288 Charger"
-	depends on MFD_AXP20X && EXTCON_AXP288
-	help
-	  Say yes here to have support X-Power AXP288 power management IC (PMIC)
-	  integrated charger.
-
-config AXP288_FUEL_GAUGE
-	tristate "X-Powers AXP288 Fuel Gauge"
-	depends on MFD_AXP20X && IIO
-	help
-	  Say yes here to have support for X-Power power management IC (PMIC)
-	  Fuel Gauge. The device provides battery statistics and status
-	  monitoring as well as alerts for battery over/under voltage and
-	  over/under temperature.
-
-config BATTERY_MAX17040
-	tristate "Maxim MAX17040 Fuel Gauge"
-	depends on I2C
-	help
-	  MAX17040 is fuel-gauge systems for lithium-ion (Li+) batteries
-	  in handheld and portable equipment. The MAX17040 is configured
-	  to operate with a single lithium cell
-
-config BATTERY_MAX17042
-	tristate "Maxim MAX17042/17047/17050/8997/8966 Fuel Gauge"
-	depends on I2C
-	select REGMAP_I2C
-	help
-	  MAX17042 is fuel-gauge systems for lithium-ion (Li+) batteries
-	  in handheld and portable equipment. The MAX17042 is configured
-	  to operate with a single lithium cell. MAX8997 and MAX8966 are
-	  multi-function devices that include fuel gauages that are compatible
-	  with MAX17042. This driver also supports max17047/50 chips which are
-	  improved version of max17042.
-
-config BATTERY_Z2
-	tristate "Z2 battery driver"
-	depends on I2C && MACH_ZIPIT2
-	help
-	  Say Y to include support for the battery on the Zipit Z2.
-
-config BATTERY_S3C_ADC
-	tristate "Battery driver for Samsung ADC based monitoring"
-	depends on S3C_ADC
-	help
-	  Say Y here to enable support for iPAQ h1930/h1940/rx1950 battery
-
-config BATTERY_TWL4030_MADC
-	tristate "TWL4030 MADC battery driver"
-	depends on TWL4030_MADC
-	help
-	  Say Y here to enable this dumb driver for batteries managed
-	  through the TWL4030 MADC.
-
-config CHARGER_88PM860X
-	tristate "Marvell 88PM860x Charger driver"
-	depends on MFD_88PM860X && BATTERY_88PM860X
-	help
-	  Say Y here to enable charger for Marvell 88PM860x chip.
-
-config CHARGER_PCF50633
-	tristate "NXP PCF50633 MBC"
-	depends on MFD_PCF50633
-	help
-	 Say Y to include support for NXP PCF50633 Main Battery Charger.
-
-config BATTERY_JZ4740
-	tristate "Ingenic JZ4740 battery"
-	depends on MACH_JZ4740
-	depends on MFD_JZ4740_ADC
-	help
-	  Say Y to enable support for the battery on Ingenic JZ4740 based
-	  boards.
-
-	  This driver can be build as a module. If so, the module will be
-	  called jz4740-battery.
-
-config BATTERY_INTEL_MID
-	tristate "Battery driver for Intel MID platforms"
-	depends on INTEL_SCU_IPC && SPI
-	help
-	  Say Y here to enable the battery driver on Intel MID
-	  platforms.
-
-config BATTERY_RX51
-	tristate "Nokia RX-51 (N900) battery driver"
-	depends on TWL4030_MADC
-	help
-	  Say Y here to enable support for battery information on Nokia
-	  RX-51, also known as N900 tablet.
-
-config CHARGER_ISP1704
-	tristate "ISP1704 USB Charger Detection"
-	depends on USB_PHY
-	depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y'
-	help
-	  Say Y to enable support for USB Charger Detection with
-	  ISP1707/ISP1704 USB transceivers.
-
-config CHARGER_MAX8903
-	tristate "MAX8903 Battery DC-DC Charger for USB and Adapter Power"
-	help
-	  Say Y to enable support for the MAX8903 DC-DC charger and sysfs.
-	  The driver supports controlling charger-enable and current-limit
-	  pins based on the status of charger connections with interrupt
-	  handlers.
-
-config CHARGER_TWL4030
-	tristate "OMAP TWL4030 BCI charger driver"
-	depends on IIO && TWL4030_CORE
-	help
-	  Say Y here to enable support for TWL4030 Battery Charge Interface.
-
-config CHARGER_LP8727
-	tristate "TI/National Semiconductor LP8727 charger driver"
-	depends on I2C
-	help
-	  Say Y here to enable support for LP8727 Charger Driver.
-
-config CHARGER_LP8788
-	tristate "TI LP8788 charger driver"
-	depends on MFD_LP8788
-	depends on LP8788_ADC
-	depends on IIO
-	help
-	  Say Y to enable support for the LP8788 linear charger.
-
-config CHARGER_GPIO
-	tristate "GPIO charger"
-	depends on GPIOLIB || COMPILE_TEST
-	help
-	  Say Y to include support for chargers which report their online status
-	  through a GPIO pin.
-
-	  This driver can be build as a module. If so, the module will be
-	  called gpio-charger.
-
-config CHARGER_MANAGER
-	bool "Battery charger manager for multiple chargers"
-	depends on REGULATOR
-	select EXTCON
-	help
-          Say Y to enable charger-manager support, which allows multiple
-          chargers attached to a battery and multiple batteries attached to a
-          system. The charger-manager also can monitor charging status in
-          runtime and in suspend-to-RAM by waking up the system periodically
-          with help of suspend_again support.
-
-config CHARGER_MAX14577
-	tristate "Maxim MAX14577/77836 battery charger driver"
-	depends on MFD_MAX14577
-	help
-	  Say Y to enable support for the battery charger control sysfs and
-	  platform data of MAX14577/77836 MUICs.
-
-config CHARGER_MAX77693
-	tristate "Maxim MAX77693 battery charger driver"
-	depends on MFD_MAX77693
-	help
-	  Say Y to enable support for the Maxim MAX77693 battery charger.
-
-config CHARGER_MAX8997
-	tristate "Maxim MAX8997/MAX8966 PMIC battery charger driver"
-	depends on MFD_MAX8997 && REGULATOR_MAX8997
-	help
-	  Say Y to enable support for the battery charger control sysfs and
-	  platform data of MAX8997/LP3974 PMICs.
-
-config CHARGER_MAX8998
-	tristate "Maxim MAX8998/LP3974 PMIC battery charger driver"
-	depends on MFD_MAX8998 && REGULATOR_MAX8998
-	help
-	  Say Y to enable support for the battery charger control sysfs and
-	  platform data of MAX8998/LP3974 PMICs.
-
-config CHARGER_QCOM_SMBB
-	tristate "Qualcomm Switch-Mode Battery Charger and Boost"
-	depends on MFD_SPMI_PMIC || COMPILE_TEST
-	depends on OF
-	depends on EXTCON
-	help
-	  Say Y to include support for the Switch-Mode Battery Charger and
-	  Boost (SMBB) hardware found in Qualcomm PM8941 PMICs.  The charger
-	  is an integrated, single-cell lithium-ion battery charger.  DT
-	  configuration is required for loading, see the devicetree
-	  documentation for more detail.  The base name for this driver is
-	  'pm8941_charger'.
-
-config CHARGER_BQ2415X
-	tristate "TI BQ2415x battery charger driver"
-	depends on I2C
-	help
-	  Say Y to enable support for the TI BQ2415x battery charger
-	  PMICs.
-
-	  You'll need this driver to charge batteries on e.g. Nokia
-	  RX-51/N900.
-
-config CHARGER_BQ24190
-	tristate "TI BQ24190 battery charger driver"
-	depends on I2C
-	depends on GPIOLIB || COMPILE_TEST
-	help
-	  Say Y to enable support for the TI BQ24190 battery charger.
-
-config CHARGER_BQ24257
-	tristate "TI BQ24250/24251/24257 battery charger driver"
-	depends on I2C
-	depends on GPIOLIB || COMPILE_TEST
-	depends on REGMAP_I2C
-	help
-	  Say Y to enable support for the TI BQ24250, BQ24251, and BQ24257 battery
-	  chargers.
-
-config CHARGER_BQ24735
-	tristate "TI BQ24735 battery charger support"
-	depends on I2C
-	depends on GPIOLIB || COMPILE_TEST
-	help
-	  Say Y to enable support for the TI BQ24735 battery charger.
-
-config CHARGER_BQ25890
-	tristate "TI BQ25890 battery charger driver"
-	depends on I2C
-	depends on GPIOLIB || COMPILE_TEST
-	select REGMAP_I2C
-	help
-	  Say Y to enable support for the TI BQ25890 battery charger.
-
-config CHARGER_SMB347
-	tristate "Summit Microelectronics SMB347 Battery Charger"
-	depends on I2C
-	select REGMAP_I2C
-	help
-	  Say Y to include support for Summit Microelectronics SMB347
-	  Battery Charger.
-
-config CHARGER_TPS65090
-	tristate "TPS65090 battery charger driver"
-	depends on MFD_TPS65090
-	help
-	 Say Y here to enable support for battery charging with TPS65090
-	 PMIC chips.
-
-config CHARGER_TPS65217
-	tristate "TPS65217 battery charger driver"
-	depends on MFD_TPS65217
-	help
-	 Say Y here to enable support for battery charging with TPS65217
-	 PMIC chips.
-
-config BATTERY_GAUGE_LTC2941
-	tristate "LTC2941/LTC2943 Battery Gauge Driver"
-	depends on I2C
-	help
-	  Say Y here to include support for LTC2941 and LTC2943 Battery
-	  Gauge IC. The driver reports the charge count continuously, and
-	  measures the voltage and temperature every 10 seconds.
-
-config AB8500_BM
-	bool "AB8500 Battery Management Driver"
-	depends on AB8500_CORE && AB8500_GPADC
-	help
-	  Say Y to include support for AB8500 battery management.
-
-config BATTERY_GOLDFISH
-	tristate "Goldfish battery driver"
-	depends on GOLDFISH || COMPILE_TEST
-	depends on HAS_IOMEM
-	help
-	  Say Y to enable support for the battery and AC power in the
-	  Goldfish emulator.
-
-config BATTERY_RT5033
-	tristate "RT5033 fuel gauge support"
-	depends on MFD_RT5033
-	help
-	  This adds support for battery fuel gauge in Richtek RT5033 PMIC.
-	  The fuelgauge calculates and determines the battery state of charge
-	  according to battery open circuit voltage.
-
-config CHARGER_RT9455
-	tristate "Richtek RT9455 battery charger driver"
-	depends on I2C
-	depends on GPIOLIB || COMPILE_TEST
-	select REGMAP_I2C
-	help
-	  Say Y to enable support for Richtek RT9455 battery charger.
-
-config AXP20X_POWER
-	tristate "AXP20x power supply driver"
-	depends on MFD_AXP20X
-	help
-	  This driver provides support for the power supply features of
-	  AXP20x PMIC.
-
-endif # POWER_SUPPLY
-
-source "drivers/power/reset/Kconfig"
 source "drivers/power/avs/Kconfig"
+source "drivers/power/reset/Kconfig"
+source "drivers/power/supply/Kconfig"

drivers/power/Makefile

···
-subdir-ccflags-$(CONFIG_POWER_SUPPLY_DEBUG) := -DDEBUG
-
-power_supply-y				:= power_supply_core.o
-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
-obj-$(CONFIG_AXP20X_POWER)	+= axp20x_usb_power.o
-obj-$(CONFIG_MAX8925_POWER)	+= max8925_power.o
-obj-$(CONFIG_WM831X_BACKUP)	+= wm831x_backup.o
-obj-$(CONFIG_WM831X_POWER)	+= wm831x_power.o
-obj-$(CONFIG_WM8350_POWER)	+= wm8350_power.o
-obj-$(CONFIG_TEST_POWER)	+= test_power.o
-
-obj-$(CONFIG_BATTERY_88PM860X)	+= 88pm860x_battery.o
-obj-$(CONFIG_BATTERY_ACT8945A)	+= act8945a_charger.o
-obj-$(CONFIG_BATTERY_DS2760)	+= ds2760_battery.o
-obj-$(CONFIG_BATTERY_DS2780)	+= ds2780_battery.o
-obj-$(CONFIG_BATTERY_DS2781)	+= ds2781_battery.o
-obj-$(CONFIG_BATTERY_DS2782)	+= ds2782_battery.o
-obj-$(CONFIG_BATTERY_GAUGE_LTC2941)	+= ltc2941-battery-gauge.o
-obj-$(CONFIG_BATTERY_GOLDFISH)	+= goldfish_battery.o
-obj-$(CONFIG_BATTERY_PMU)	+= pmu_battery.o
-obj-$(CONFIG_BATTERY_OLPC)	+= olpc_battery.o
-obj-$(CONFIG_BATTERY_TOSA)	+= tosa_battery.o
-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_BQ27XXX)	+= bq27xxx_battery.o
-obj-$(CONFIG_BATTERY_BQ27XXX_I2C) += bq27xxx_battery_i2c.o
-obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
-obj-$(CONFIG_BATTERY_DA9052)	+= da9052-battery.o
-obj-$(CONFIG_CHARGER_DA9150)	+= da9150-charger.o
-obj-$(CONFIG_BATTERY_DA9150)	+= da9150-fg.o
-obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o
-obj-$(CONFIG_BATTERY_MAX17042)	+= max17042_battery.o
-obj-$(CONFIG_BATTERY_Z2)	+= z2_battery.o
-obj-$(CONFIG_BATTERY_RT5033)	+= rt5033_battery.o
-obj-$(CONFIG_CHARGER_RT9455)	+= rt9455_charger.o
-obj-$(CONFIG_BATTERY_S3C_ADC)	+= s3c_adc_battery.o
-obj-$(CONFIG_BATTERY_TWL4030_MADC)	+= twl4030_madc_battery.o
-obj-$(CONFIG_CHARGER_88PM860X)	+= 88pm860x_charger.o
-obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
-obj-$(CONFIG_BATTERY_JZ4740)	+= jz4740-battery.o
-obj-$(CONFIG_BATTERY_INTEL_MID)	+= intel_mid_battery.o
-obj-$(CONFIG_BATTERY_RX51)	+= rx51_battery.o
-obj-$(CONFIG_AB8500_BM)		+= ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o pm2301_charger.o
-obj-$(CONFIG_CHARGER_ISP1704)	+= isp1704_charger.o
-obj-$(CONFIG_CHARGER_MAX8903)	+= max8903_charger.o
-obj-$(CONFIG_CHARGER_TWL4030)	+= twl4030_charger.o
-obj-$(CONFIG_CHARGER_LP8727)	+= lp8727_charger.o
-obj-$(CONFIG_CHARGER_LP8788)	+= lp8788-charger.o
-obj-$(CONFIG_CHARGER_GPIO)	+= gpio-charger.o
-obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o
-obj-$(CONFIG_CHARGER_MAX14577)	+= max14577_charger.o
-obj-$(CONFIG_CHARGER_MAX77693)	+= max77693_charger.o
-obj-$(CONFIG_CHARGER_MAX8997)	+= max8997_charger.o
-obj-$(CONFIG_CHARGER_MAX8998)	+= max8998_charger.o
-obj-$(CONFIG_CHARGER_QCOM_SMBB)	+= qcom_smbb.o
-obj-$(CONFIG_CHARGER_BQ2415X)	+= bq2415x_charger.o
-obj-$(CONFIG_CHARGER_BQ24190)	+= bq24190_charger.o
-obj-$(CONFIG_CHARGER_BQ24257)	+= bq24257_charger.o
-obj-$(CONFIG_CHARGER_BQ24735)	+= bq24735-charger.o
-obj-$(CONFIG_CHARGER_BQ25890)	+= bq25890_charger.o
 obj-$(CONFIG_POWER_AVS)		+= avs/
-obj-$(CONFIG_CHARGER_SMB347)	+= smb347-charger.o
-obj-$(CONFIG_CHARGER_TPS65090)	+= tps65090-charger.o
-obj-$(CONFIG_CHARGER_TPS65217)	+= tps65217_charger.o
 obj-$(CONFIG_POWER_RESET)	+= reset/
-obj-$(CONFIG_AXP288_FUEL_GAUGE) += axp288_fuel_gauge.o
-obj-$(CONFIG_AXP288_CHARGER)	+= axp288_charger.o
+obj-$(CONFIG_POWER_SUPPLY)	+= supply/

drivers/power/ds2760_battery.c drivers/power/supply/ds2760_battery.c

···
 #include <linux/platform_device.h>
 #include <linux/power_supply.h>
 
-#include "../w1/w1.h"
-#include "../w1/slaves/w1_ds2760.h"
+#include "../../w1/w1.h"
+#include "../../w1/slaves/w1_ds2760.h"
 
 struct ds2760_device_info {
 	struct device *dev;

drivers/power/ds2780_battery.c drivers/power/supply/ds2781_battery.c

···
 /*
- * 1-wire client/driver for the Maxim/Dallas DS2780 Stand-Alone Fuel Gauge IC
+ * 1-wire client/driver for the Maxim/Dallas DS2781 Stand-Alone Fuel Gauge IC
  *
- * Copyright (C) 2010 Indesign, LLC
+ * Author: Renata Sayakhova <[e-mail]>
  *
- * Author: Clifton Barnes <[e-mail]>
- *
- * Based on ds2760_battery and ds2782_battery drivers
+ * Based on ds2780_battery drivers
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #include <linux/power_supply.h>
 #include <linux/idr.h>
 
-#include "../w1/w1.h"
-#include "../w1/slaves/w1_ds2780.h"
+#include "../../w1/w1.h"
+#include "../../w1/slaves/w1_ds2781.h"
 
 /* Current unit measurement in uA for a 1 milli-ohm sense resistor */
-#define DS2780_CURRENT_UNITS	1563
+#define DS2781_CURRENT_UNITS	1563
 /* Charge unit measurement in uAh for a 1 milli-ohm sense resistor */
-#define DS2780_CHARGE_UNITS		6250
+#define DS2781_CHARGE_UNITS		6250
 /* Number of bytes in user EEPROM space */
-#define DS2780_USER_EEPROM_SIZE		(DS2780_EEPROM_BLOCK0_END - \
-					DS2780_EEPROM_BLOCK0_START + 1)
+#define DS2781_USER_EEPROM_SIZE		(DS2781_EEPROM_BLOCK0_END - \
+					DS2781_EEPROM_BLOCK0_START + 1)
 /* Number of bytes in parameter EEPROM space */
-#define DS2780_PARAM_EEPROM_SIZE	(DS2780_EEPROM_BLOCK1_END - \
-					DS2780_EEPROM_BLOCK1_START + 1)
+#define DS2781_PARAM_EEPROM_SIZE	(DS2781_EEPROM_BLOCK1_END - \
+					DS2781_EEPROM_BLOCK1_START + 1)
 
-struct ds2780_device_info {
+struct ds2781_device_info {
 	struct device *dev;
 	struct power_supply *bat;
 	struct power_supply_desc bat_desc;
···
 	CURRENT_AVG,
 };
 
-static const char model[] = "DS2780";
+static const char model[] = "DS2781";
 static const char manufacturer[] = "Maxim/Dallas";
 
-static inline struct ds2780_device_info *
-to_ds2780_device_info(struct power_supply *psy)
+static inline struct ds2781_device_info *
+to_ds2781_device_info(struct power_supply *psy)
 {
 	return power_supply_get_drvdata(psy);
 }
···
 	return dev_get_drvdata(dev);
 }
 
-static inline int ds2780_battery_io(struct ds2780_device_info *dev_info,
+static inline int ds2781_battery_io(struct ds2781_device_info *dev_info,
 	char *buf, int addr, size_t count, int io)
 {
-	return w1_ds2780_io(dev_info->w1_dev, buf, addr, count, io);
+	return w1_ds2781_io(dev_info->w1_dev, buf, addr, count, io);
 }
 
-static inline int ds2780_read8(struct ds2780_device_info *dev_info, u8 *val,
+static int w1_ds2781_read(struct ds2781_device_info *dev_info, char *buf,
+		int addr, size_t count)
+{
+	return ds2781_battery_io(dev_info, buf, addr, count, 0);
+}
+
+static inline int ds2781_read8(struct ds2781_device_info *dev_info, u8 *val,
 	int addr)
 {
-	return ds2780_battery_io(dev_info, val, addr, sizeof(u8), 0);
+	return ds2781_battery_io(dev_info, val, addr, sizeof(u8), 0);
 }
 
-static int ds2780_read16(struct ds2780_device_info *dev_info, s16 *val,
+static int ds2781_read16(struct ds2781_device_info *dev_info, s16 *val,
 	int addr)
 {
 	int ret;
 	u8 raw[2];
 
-	ret = ds2780_battery_io(dev_info, raw, addr, sizeof(raw), 0);
+	ret = ds2781_battery_io(dev_info, raw, addr, sizeof(raw), 0);
 	if (ret < 0)
 		return ret;
 
···
 	return 0;
 }
 
-static inline int ds2780_read_block(struct ds2780_device_info *dev_info,
+static inline int ds2781_read_block(struct ds2781_device_info *dev_info,
 	u8 *val, int addr, size_t count)
 {
-	return ds2780_battery_io(dev_info, val, addr, count, 0);
+	return ds2781_battery_io(dev_info, val, addr, count, 0);
 }
 
-static inline int ds2780_write(struct ds2780_device_info *dev_info, u8 *val,
+static inline int ds2781_write(struct ds2781_device_info *dev_info, u8 *val,
 	int addr, size_t count)
 {
-	return ds2780_battery_io(dev_info, val, addr, count, 1);
+	return ds2781_battery_io(dev_info, val, addr, count, 1);
 }
 
-static inline int ds2780_store_eeprom(struct device *dev, int addr)
+static inline int ds2781_store_eeprom(struct device *dev, int addr)
 {
-	return w1_ds2780_eeprom_cmd(dev, addr, W1_DS2780_COPY_DATA);
+	return w1_ds2781_eeprom_cmd(dev, addr, W1_DS2781_COPY_DATA);
 }
 
-static inline int ds2780_recall_eeprom(struct device *dev, int addr)
+static inline int ds2781_recall_eeprom(struct device *dev, int addr)
 {
-	return w1_ds2780_eeprom_cmd(dev, addr, W1_DS2780_RECALL_DATA);
+	return w1_ds2781_eeprom_cmd(dev, addr, W1_DS2781_RECALL_DATA);
 }
 
-static int ds2780_save_eeprom(struct ds2780_device_info *dev_info, int reg)
+static int ds2781_save_eeprom(struct ds2781_device_info *dev_info, int reg)
 {
 	int ret;
 
-	ret = ds2780_store_eeprom(dev_info->w1_dev, reg);
+	ret = ds2781_store_eeprom(dev_info->w1_dev, reg);
 	if (ret < 0)
 		return ret;
 
-	ret = ds2780_recall_eeprom(dev_info->w1_dev, reg);
+	ret = ds2781_recall_eeprom(dev_info->w1_dev, reg);
 	if (ret < 0)
 		return ret;
 
···
 }
 
 /* Set sense resistor value in mhos */
-static int ds2780_set_sense_register(struct ds2780_device_info *dev_info,
+static int ds2781_set_sense_register(struct ds2781_device_info *dev_info,
 	u8 conductance)
 {
 	int ret;
 
-	ret = ds2780_write(dev_info, &conductance,
-				DS2780_RSNSP_REG, sizeof(u8));
+	ret = ds2781_write(dev_info, &conductance,
+				DS2781_RSNSP, sizeof(u8));
 	if (ret < 0)
 		return ret;
 
-	return ds2780_save_eeprom(dev_info, DS2780_RSNSP_REG);
+	return ds2781_save_eeprom(dev_info, DS2781_RSNSP);
 }
 
 /* Get RSGAIN value from 0 to 1.999 in steps of 0.001 */
-static int ds2780_get_rsgain_register(struct ds2780_device_info *dev_info,
+static int ds2781_get_rsgain_register(struct ds2781_device_info *dev_info,
 	u16 *rsgain)
 {
-	return ds2780_read16(dev_info, rsgain, DS2780_RSGAIN_MSB_REG);
+	return ds2781_read16(dev_info, rsgain, DS2781_RSGAIN_MSB);
 }
 
 /* Set RSGAIN value from 0 to 1.999 in steps of 0.001 */
-static int ds2780_set_rsgain_register(struct ds2780_device_info *dev_info,
+static int ds2781_set_rsgain_register(struct ds2781_device_info *dev_info,
 	u16 rsgain)
 {
 	int ret;
 	u8 raw[] = {rsgain >> 8, rsgain & 0xFF};
 
-	ret = ds2780_write(dev_info, raw,
-				DS2780_RSGAIN_MSB_REG, sizeof(raw));
+	ret = ds2781_write(dev_info, raw,
+				DS2781_RSGAIN_MSB, sizeof(raw));
 	if (ret < 0)
 		return ret;
 
-	return ds2780_save_eeprom(dev_info, DS2780_RSGAIN_MSB_REG);
+	return ds2781_save_eeprom(dev_info, DS2781_RSGAIN_MSB);
 }
 
-static int ds2780_get_voltage(struct ds2780_device_info *dev_info,
+static int ds2781_get_voltage(struct ds2781_device_info *dev_info,
 	int *voltage_uV)
 {
 	int ret;
-	s16 voltage_raw;
+	char val[2];
+	int voltage_raw;
 
+	ret = w1_ds2781_read(dev_info, val, DS2781_VOLT_MSB, 2 * sizeof(u8));
+	if (ret < 0)
+		return ret;
 	/*
 	 * The voltage value is located in 10 bits across the voltage MSB
 	 * and LSB registers in two's compliment form
···
 	 * Bits 2 - 0 of the voltage value are in bits 7 - 5 of the
 	 * voltage LSB register
 	 */
-	ret = ds2780_read16(dev_info, &voltage_raw,
-				DS2780_VOLT_MSB_REG);
-	if (ret < 0)
-		return ret;
+	voltage_raw = (val[0] << 3) |
+		(val[1] >> 5);
 
-	/*
-	 * DS2780 reports voltage in units of 4.88mV, but the battery class
-	 * reports in units of uV, so convert by multiplying by 4880.
-	 */
-	*voltage_uV = (voltage_raw / 32) * 4880;
+	/* DS2781 reports voltage in units of 9.76mV, but the battery class
+	 * reports in units of uV, so convert by multiplying by 9760. */
+	*voltage_uV = voltage_raw * 9760;
+
 	return 0;
 }
 
-static int ds2780_get_temperature(struct ds2780_device_info *dev_info,
-	int *temperature)
+static int ds2781_get_temperature(struct ds2781_device_info *dev_info,
+	int *temp)
 {
 	int ret;
-	s16 temperature_raw;
+	char val[2];
+	int temp_raw;
 
+	ret = w1_ds2781_read(dev_info, val, DS2781_TEMP_MSB, 2 * sizeof(u8));
+	if (ret < 0)
+		return ret;
 	/*
 	 * The temperature value is located in 10 bits across the temperature
 	 * MSB and LSB registers in two's compliment form
···
 	 * Bits 2 - 0 of the temperature value are in bits 7 - 5 of the
 	 * temperature LSB register
 	 */
-	ret = ds2780_read16(dev_info, &temperature_raw,
-				DS2780_TEMP_MSB_REG);
-	if (ret < 0)
-		return ret;
+	temp_raw = ((val[0]) << 3) |
+		(val[1] >> 5);
+	*temp = temp_raw + (temp_raw / 4);
 
-	/*
-	 * Temperature is measured in units of 0.125 degrees celcius, the
-	 * power_supply class measures temperature in tenths of degrees
-	 * celsius. The temperature value is stored as a 10 bit number, plus
-	 * sign in the upper bits of a 16 bit register.
-	 */
-	*temperature = ((temperature_raw / 32) * 125) / 100;
 	return 0;
 }
 
-static int ds2780_get_current(struct ds2780_device_info *dev_info,
+static int ds2781_get_current(struct ds2781_device_info *dev_info,
 	enum current_types type, int *current_uA)
 {
 	int ret, sense_res;
···
 	 * The units of measurement for current are dependent on the value of
 	 * the sense resistor.
 	 */
-	ret = ds2780_read8(dev_info, &sense_res_raw, DS2780_RSNSP_REG);
+	ret = ds2781_read8(dev_info, &sense_res_raw, DS2781_RSNSP);
 	if (ret < 0)
 		return ret;
 
···
 	sense_res = 1000 / sense_res_raw;
 
 	if (type == CURRENT_NOW)
-		reg_msb = DS2780_CURRENT_MSB_REG;
+		reg_msb = DS2781_CURRENT_MSB;
 	else if (type == CURRENT_AVG)
-		reg_msb = DS2780_IAVG_MSB_REG;
+		reg_msb = DS2781_IAVG_MSB;
 	else
 		return -EINVAL;
 
···
 	 * Bits 7 - 0 of the current value are in bits 7 - 0 of the current
 	 * LSB register
 	 */
-	ret = ds2780_read16(dev_info, &current_raw, reg_msb);
+	ret = ds2781_read16(dev_info, &current_raw, reg_msb);
 	if (ret < 0)
 		return ret;
 
-	*current_uA = current_raw * (DS2780_CURRENT_UNITS / sense_res);
+	*current_uA = current_raw * (DS2781_CURRENT_UNITS / sense_res);
 	return 0;
 }
 
-static int ds2780_get_accumulated_current(struct ds2780_device_info *dev_info,
+static int ds2781_get_accumulated_current(struct ds2781_device_info *dev_info,
 	int *accumulated_current)
 {
 	int ret, sense_res;
···
 	 * The units of measurement for accumulated current are dependent on
 	 * the value of the sense resistor.
 	 */
-	ret = ds2780_read8(dev_info, &sense_res_raw, DS2780_RSNSP_REG);
+	ret = ds2781_read8(dev_info, &sense_res_raw, DS2781_RSNSP);
 	if (ret < 0)
 		return ret;
 
 	if (sense_res_raw == 0) {
 		dev_err(dev_info->dev, "sense resistor value is 0\n");
-		return -ENXIO;
+		return -EINVAL;
 	}
 	sense_res = 1000 / sense_res_raw;
 
···
 	 * Bits 7 - 0 of the ACR value are in bits 7 - 0 of the ACR
 	 * LSB register
 	 */
-	ret = ds2780_read16(dev_info, &current_raw, DS2780_ACR_MSB_REG);
+	ret = ds2781_read16(dev_info, &current_raw, DS2781_ACR_MSB);
 	if (ret < 0)
 		return ret;
 
-	*accumulated_current = current_raw * (DS2780_CHARGE_UNITS / sense_res);
+	*accumulated_current = current_raw * (DS2781_CHARGE_UNITS / sense_res);
 	return 0;
 }
 
-static int ds2780_get_capacity(struct ds2780_device_info *dev_info,
+static int ds2781_get_capacity(struct ds2781_device_info *dev_info,
 	int *capacity)
 {
 	int ret;
 	u8 raw;
 
-	ret = ds2780_read8(dev_info, &raw, DS2780_RARC_REG);
+	ret = ds2781_read8(dev_info, &raw, DS2781_RARC);
 	if (ret < 0)
 		return ret;
 
 	*capacity = raw;
-	return raw;
-}
-
-static int ds2780_get_status(struct ds2780_device_info *dev_info, int *status)
-{
-	int ret, current_uA, capacity;
-
-	ret = ds2780_get_current(dev_info, CURRENT_NOW, &current_uA);
-	if (ret < 0)
-		return ret;
-
-	ret = ds2780_get_capacity(dev_info, &capacity);
-	if (ret < 0)
-		return ret;
-
-	if (capacity == 100)
-		*status = POWER_SUPPLY_STATUS_FULL;
-	else if (current_uA == 0)
-		*status = POWER_SUPPLY_STATUS_NOT_CHARGING;
-	else if (current_uA < 0)
-		*status = POWER_SUPPLY_STATUS_DISCHARGING;
-	else
-		*status = POWER_SUPPLY_STATUS_CHARGING;
-
 	return 0;
 }
 
-static int ds2780_get_charge_now(struct ds2780_device_info *dev_info,
+static int ds2781_get_status(struct ds2781_device_info *dev_info, int *status)
+{
+	int ret, current_uA, capacity;
+
+	ret = ds2781_get_current(dev_info, CURRENT_NOW, &current_uA);
+	if (ret < 0)
+		return ret;
+
+	ret = ds2781_get_capacity(dev_info, &capacity);
+	if (ret < 0)
+		return ret;
+
+	if (power_supply_am_i_supplied(dev_info->bat)) {
+		if (capacity == 100)
+			*status = POWER_SUPPLY_STATUS_FULL;
+		else if (current_uA > 50000)
+			*status = POWER_SUPPLY_STATUS_CHARGING;
+		else
+			*status = POWER_SUPPLY_STATUS_NOT_CHARGING;
+	} else {
+		*status = POWER_SUPPLY_STATUS_DISCHARGING;
+	}
+	return 0;
+}
+
+static int ds2781_get_charge_now(struct ds2781_device_info *dev_info,
 	int *charge_now)
 {
 	int ret;
···
 	 * Bits 7 - 0 of the RAAC value are in bits 7 - 0 of the RAAC
 	 * LSB register
 	 */
-	ret = ds2780_read16(dev_info, &charge_raw, DS2780_RAAC_MSB_REG);
+	ret = ds2781_read16(dev_info, &charge_raw, DS2781_RAAC_MSB);
 	if (ret < 0)
 		return ret;
 
···
 	return 0;
 }
 
-static int ds2780_get_control_register(struct ds2780_device_info *dev_info,
+static int ds2781_get_control_register(struct ds2781_device_info *dev_info,
 	u8 *control_reg)
 {
-	return ds2780_read8(dev_info, control_reg, DS2780_CONTROL_REG);
+	return ds2781_read8(dev_info, control_reg, DS2781_CONTROL);
 }
 
-static int ds2780_set_control_register(struct ds2780_device_info *dev_info,
+static int ds2781_set_control_register(struct ds2781_device_info *dev_info,
 	u8 control_reg)
 {
 	int ret;
 
-	ret = ds2780_write(dev_info, &control_reg,
-				DS2780_CONTROL_REG, sizeof(u8));
+	ret = ds2781_write(dev_info, &control_reg,
+				DS2781_CONTROL, sizeof(u8));
 	if (ret < 0)
 		return ret;
 
-	return ds2780_save_eeprom(dev_info, DS2780_CONTROL_REG);
+	return ds2781_save_eeprom(dev_info, DS2781_CONTROL);
 }
 
-static int ds2780_battery_get_property(struct power_supply *psy,
+static int ds2781_battery_get_property(struct power_supply *psy,
 	enum power_supply_property psp,
 	union power_supply_propval *val)
 {
 	int ret = 0;
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
 	switch (psp) {
 	case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-		ret = ds2780_get_voltage(dev_info, &val->intval);
+		ret = ds2781_get_voltage(dev_info, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_TEMP:
-		ret = ds2780_get_temperature(dev_info, &val->intval);
+		ret = ds2781_get_temperature(dev_info, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_MODEL_NAME:
···
 		break;
 
 	case POWER_SUPPLY_PROP_CURRENT_NOW:
-		ret = ds2780_get_current(dev_info, CURRENT_NOW, &val->intval);
+		ret = ds2781_get_current(dev_info, CURRENT_NOW, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_CURRENT_AVG:
-		ret = ds2780_get_current(dev_info, CURRENT_AVG, &val->intval);
+		ret = ds2781_get_current(dev_info, CURRENT_AVG, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_STATUS:
-		ret = ds2780_get_status(dev_info, &val->intval);
+		ret = ds2781_get_status(dev_info, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_CAPACITY:
-		ret = ds2780_get_capacity(dev_info, &val->intval);
+		ret = ds2781_get_capacity(dev_info, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_CHARGE_COUNTER:
-		ret = ds2780_get_accumulated_current(dev_info, &val->intval);
+		ret = ds2781_get_accumulated_current(dev_info, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_CHARGE_NOW:
-		ret = ds2780_get_charge_now(dev_info, &val->intval);
+		ret = ds2781_get_charge_now(dev_info, &val->intval);
 		break;
 
 	default:
···
 	return ret;
 }
 
-static enum power_supply_property ds2780_battery_props[] = {
+static enum power_supply_property ds2781_battery_props[] = {
 	POWER_SUPPLY_PROP_STATUS,
 	POWER_SUPPLY_PROP_VOLTAGE_NOW,
 	POWER_SUPPLY_PROP_TEMP,
···
 	POWER_SUPPLY_PROP_CHARGE_NOW,
 };
 
-static ssize_t ds2780_get_pmod_enabled(struct device *dev,
+static ssize_t ds2781_get_pmod_enabled(struct device *dev,
 	struct device_attribute *attr,
 	char *buf)
 {
 	int ret;
 	u8 control_reg;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
 	/* Get power mode */
-	ret = ds2780_get_control_register(dev_info, &control_reg);
+	ret = ds2781_get_control_register(dev_info, &control_reg);
 	if (ret < 0)
 		return ret;
 
 	return sprintf(buf, "%d\n",
-		 !!(control_reg & DS2780_CONTROL_REG_PMOD));
+		 !!(control_reg & DS2781_CONTROL_PMOD));
 }
 
-static ssize_t ds2780_set_pmod_enabled(struct device *dev,
+static ssize_t ds2781_set_pmod_enabled(struct device *dev,
 	struct device_attribute *attr,
 	const char *buf,
 	size_t count)
···
 	int ret;
 	u8 control_reg, new_setting;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
 	/* Set power mode */
-	ret = ds2780_get_control_register(dev_info, &control_reg);
+	ret = ds2781_get_control_register(dev_info, &control_reg);
 	if (ret < 0)
 		return ret;
 
···
 	}
 
 	if (new_setting)
-		control_reg |= DS2780_CONTROL_REG_PMOD;
+		control_reg |= DS2781_CONTROL_PMOD;
 	else
-		control_reg &= ~DS2780_CONTROL_REG_PMOD;
+		control_reg &= ~DS2781_CONTROL_PMOD;
 
-	ret = ds2780_set_control_register(dev_info, control_reg);
+	ret = ds2781_set_control_register(dev_info, control_reg);
 	if (ret < 0)
 		return ret;
 
 	return count;
 }
 
-static ssize_t ds2780_get_sense_resistor_value(struct device *dev,
+static ssize_t ds2781_get_sense_resistor_value(struct device *dev,
 	struct device_attribute *attr,
 	char *buf)
 {
 	int ret;
 	u8 sense_resistor;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
-	ret = ds2780_read8(dev_info, &sense_resistor, DS2780_RSNSP_REG);
+	ret = ds2781_read8(dev_info, &sense_resistor, DS2781_RSNSP);
 	if (ret < 0)
 		return ret;
 
···
 	return ret;
 }
 
-static ssize_t ds2780_set_sense_resistor_value(struct device *dev,
+static ssize_t ds2781_set_sense_resistor_value(struct device *dev,
 	struct device_attribute *attr,
 	const char *buf,
 	size_t count)
···
 	int ret;
 	u8 new_setting;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
 	ret = kstrtou8(buf, 0, &new_setting);
 	if (ret < 0)
 		return ret;
 
-	ret = ds2780_set_sense_register(dev_info, new_setting);
+	ret = ds2781_set_sense_register(dev_info, new_setting);
 	if (ret < 0)
 		return ret;
 
 	return count;
 }
 
-static ssize_t ds2780_get_rsgain_setting(struct device *dev,
+static ssize_t ds2781_get_rsgain_setting(struct device *dev,
 	struct device_attribute *attr,
 	char *buf)
 {
 	int ret;
 	u16 rsgain;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
-	ret = ds2780_get_rsgain_register(dev_info, &rsgain);
+	ret = ds2781_get_rsgain_register(dev_info, &rsgain);
 	if (ret < 0)
 		return ret;
 
 	return sprintf(buf, "%d\n", rsgain);
 }
 
-static ssize_t ds2780_set_rsgain_setting(struct device *dev,
+static ssize_t ds2781_set_rsgain_setting(struct device *dev,
 	struct device_attribute *attr,
 	const char *buf,
 	size_t count)
···
 	int ret;
 	u16 new_setting;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
 	ret = kstrtou16(buf, 0, &new_setting);
 	if (ret < 0)
···
 		return -EINVAL;
 	}
 
-	ret = ds2780_set_rsgain_register(dev_info, new_setting);
+	ret = ds2781_set_rsgain_register(dev_info, new_setting);
 	if (ret < 0)
 		return ret;
 
 	return count;
 }
 
-static ssize_t ds2780_get_pio_pin(struct device *dev,
+static ssize_t ds2781_get_pio_pin(struct device *dev,
 	struct device_attribute *attr,
 	char *buf)
 {
 	int ret;
 	u8 sfr;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
-	ret = ds2780_read8(dev_info, &sfr, DS2780_SFR_REG);
+	ret = ds2781_read8(dev_info, &sfr, DS2781_SFR);
 	if (ret < 0)
 		return ret;
 
-	ret = sprintf(buf, "%d\n", sfr & DS2780_SFR_REG_PIOSC);
+	ret = sprintf(buf, "%d\n", sfr & DS2781_SFR_PIOSC);
 	return ret;
 }
 
-static ssize_t ds2780_set_pio_pin(struct device *dev,
+static ssize_t ds2781_set_pio_pin(struct device *dev,
 	struct device_attribute *attr,
 	const char *buf,
 	size_t count)
···
 	int ret;
 	u8 new_setting;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
 	ret = kstrtou8(buf, 0, &new_setting);
 	if (ret < 0)
···
 		return -EINVAL;
 	}
 
-	ret = ds2780_write(dev_info, &new_setting,
-				DS2780_SFR_REG, sizeof(u8));
+	ret = ds2781_write(dev_info, &new_setting,
+				DS2781_SFR, sizeof(u8));
 	if (ret < 0)
 		return ret;
 
 	return count;
 }
 
-static ssize_t ds2780_read_param_eeprom_bin(struct file *filp,
+static ssize_t ds2781_read_param_eeprom_bin(struct file *filp,
 				struct kobject *kobj,
 				struct bin_attribute *bin_attr,
 				char *buf, loff_t off, size_t count)
 {
 	struct device *dev = container_of(kobj, struct device, kobj);
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
-	return ds2780_read_block(dev_info, buf,
-				DS2780_EEPROM_BLOCK1_START + off, count);
+	return ds2781_read_block(dev_info, buf,
+				DS2781_EEPROM_BLOCK1_START + off, count);
 }
 
-static ssize_t ds2780_write_param_eeprom_bin(struct file *filp,
+static ssize_t ds2781_write_param_eeprom_bin(struct file *filp,
 				struct kobject *kobj,
 				struct bin_attribute *bin_attr,
 				char *buf, loff_t off, size_t count)
 {
 	struct device *dev = container_of(kobj, struct device, kobj);
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 	int ret;
 
-	ret = ds2780_write(dev_info, buf,
-				DS2780_EEPROM_BLOCK1_START + off, count);
+	ret = ds2781_write(dev_info, buf,
+				DS2781_EEPROM_BLOCK1_START + off, count);
 	if (ret < 0)
 		return ret;
 
-	ret = ds2780_save_eeprom(dev_info, DS2780_EEPROM_BLOCK1_START);
+	ret = ds2781_save_eeprom(dev_info, DS2781_EEPROM_BLOCK1_START);
 	if (ret < 0)
 		return ret;
 
 	return count;
 }
 
-static struct bin_attribute ds2780_param_eeprom_bin_attr = {
+static struct bin_attribute ds2781_param_eeprom_bin_attr = {
 	.attr = {
 		.name = "param_eeprom",
 		.mode = S_IRUGO | S_IWUSR,
 	},
-	.size = DS2780_PARAM_EEPROM_SIZE,
-	.read = ds2780_read_param_eeprom_bin,
-	.write = ds2780_write_param_eeprom_bin,
+	.size = DS2781_PARAM_EEPROM_SIZE,
+	.read = ds2781_read_param_eeprom_bin,
+	.write = ds2781_write_param_eeprom_bin,
 };
 
-static ssize_t ds2780_read_user_eeprom_bin(struct file *filp,
+static ssize_t ds2781_read_user_eeprom_bin(struct file *filp,
 				struct kobject *kobj,
 				struct bin_attribute *bin_attr,
 				char *buf, loff_t off, size_t count)
 {
 	struct device *dev = container_of(kobj, struct device, kobj);
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 
-	return ds2780_read_block(dev_info, buf,
-				DS2780_EEPROM_BLOCK0_START + off, count);
+	return ds2781_read_block(dev_info, buf,
+				DS2781_EEPROM_BLOCK0_START + off, count);
+
 }
 
-static ssize_t ds2780_write_user_eeprom_bin(struct file *filp,
+static ssize_t ds2781_write_user_eeprom_bin(struct file *filp,
 				struct kobject *kobj,
 				struct bin_attribute *bin_attr,
 				char *buf, loff_t off, size_t count)
 {
 	struct device *dev = container_of(kobj, struct device, kobj);
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
+	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
 	int ret;
 
-	ret = ds2780_write(dev_info, buf,
-				DS2780_EEPROM_BLOCK0_START + off, count);
+	ret = ds2781_write(dev_info, buf,
+				DS2781_EEPROM_BLOCK0_START + off, count);
 	if (ret < 0)
 		return ret;
 
-	ret = ds2780_save_eeprom(dev_info, DS2780_EEPROM_BLOCK0_START);
+	ret = ds2781_save_eeprom(dev_info, DS2781_EEPROM_BLOCK0_START);
 	if (ret < 0)
 		return ret;
 
 	return count;
 }
 
-static struct bin_attribute ds2780_user_eeprom_bin_attr = {
+static struct bin_attribute ds2781_user_eeprom_bin_attr = {
 	.attr = {
 		.name = "user_eeprom",
 		.mode = S_IRUGO | S_IWUSR,
 	},
-	.size = DS2780_USER_EEPROM_SIZE,
-	.read = ds2780_read_user_eeprom_bin,
-	.write = ds2780_write_user_eeprom_bin,
+	.size = DS2781_USER_EEPROM_SIZE,
+	.read = ds2781_read_user_eeprom_bin,
+	.write = ds2781_write_user_eeprom_bin,
 };
 
-static DEVICE_ATTR(pmod_enabled, S_IRUGO | S_IWUSR, ds2780_get_pmod_enabled,
-	ds2780_set_pmod_enabled);
+static DEVICE_ATTR(pmod_enabled, S_IRUGO | S_IWUSR, ds2781_get_pmod_enabled,
+	ds2781_set_pmod_enabled);
 static DEVICE_ATTR(sense_resistor_value, S_IRUGO | S_IWUSR,
-	ds2780_get_sense_resistor_value, ds2780_set_sense_resistor_value);
-static DEVICE_ATTR(rsgain_setting, S_IRUGO | S_IWUSR, ds2780_get_rsgain_setting,
-	ds2780_set_rsgain_setting);
-static DEVICE_ATTR(pio_pin, S_IRUGO | S_IWUSR, ds2780_get_pio_pin,
-	ds2780_set_pio_pin);
+	ds2781_get_sense_resistor_value, ds2781_set_sense_resistor_value);
+static DEVICE_ATTR(rsgain_setting, S_IRUGO | S_IWUSR, ds2781_get_rsgain_setting,
+	ds2781_set_rsgain_setting);
+static DEVICE_ATTR(pio_pin, S_IRUGO | S_IWUSR, ds2781_get_pio_pin,
+	ds2781_set_pio_pin);
 
 
-static struct attribute *ds2780_attributes[] = {
+static struct attribute *ds2781_attributes[] = {
 	&dev_attr_pmod_enabled.attr,
 	&dev_attr_sense_resistor_value.attr,
 	&dev_attr_rsgain_setting.attr,
···
 	NULL
 };
 
-static const struct attribute_group ds2780_attr_group = {
-	.attrs = ds2780_attributes,
+static const struct attribute_group ds2781_attr_group = {
+	.attrs = ds2781_attributes,
 };
 
-static int ds2780_battery_probe(struct platform_device *pdev)
+static int ds2781_battery_probe(struct platform_device *pdev)
 {
 	struct power_supply_config psy_cfg = {};
 	int ret = 0;
-	struct ds2780_device_info *dev_info;
+	struct ds2781_device_info *dev_info;
 
 	dev_info = devm_kzalloc(&pdev->dev, sizeof(*dev_info), GFP_KERNEL);
-	if (!dev_info) {
-		ret = -ENOMEM;
-		goto fail;
-	}
+	if (!dev_info)
+		return -ENOMEM;
 
 	platform_set_drvdata(pdev, dev_info);
 
···
 	dev_info->w1_dev		= pdev->dev.parent;
 	dev_info->bat_desc.name		= dev_name(&pdev->dev);
 	dev_info->bat_desc.type		= POWER_SUPPLY_TYPE_BATTERY;
-	dev_info->bat_desc.properties	= ds2780_battery_props;
-	dev_info->bat_desc.num_properties = ARRAY_SIZE(ds2780_battery_props);
-	dev_info->bat_desc.get_property	= ds2780_battery_get_property;
+	dev_info->bat_desc.properties	= ds2781_battery_props;
+	dev_info->bat_desc.num_properties = ARRAY_SIZE(ds2781_battery_props);
+	dev_info->bat_desc.get_property	= ds2781_battery_get_property;
 
 	psy_cfg.drv_data		= dev_info;
 
 	dev_info->bat = power_supply_register(&pdev->dev, &dev_info->bat_desc,
-					      &psy_cfg);
+						&psy_cfg);
 	if (IS_ERR(dev_info->bat)) {
 		dev_err(dev_info->dev, "failed to register battery\n");
 		ret = PTR_ERR(dev_info->bat);
 		goto fail;
 	}
 
-	ret = sysfs_create_group(&dev_info->bat->dev.kobj, &ds2780_attr_group);
+	ret = sysfs_create_group(&dev_info->bat->dev.kobj, &ds2781_attr_group);
 	if (ret) {
 		dev_err(dev_info->dev, "failed to create sysfs group\n");
 		goto fail_unregister;
 	}
 
 	ret = sysfs_create_bin_file(&dev_info->bat->dev.kobj,
-					&ds2780_param_eeprom_bin_attr);
+					&ds2781_param_eeprom_bin_attr);
 	if (ret) {
 		dev_err(dev_info->dev,
 				"failed to create param eeprom bin file");
···
 	}
 
 	ret = sysfs_create_bin_file(&dev_info->bat->dev.kobj,
-					&ds2780_user_eeprom_bin_attr);
+					&ds2781_user_eeprom_bin_attr);
 	if (ret) {
 		dev_err(dev_info->dev,
 				"failed to create user eeprom bin file");
···
 
 fail_remove_bin_file:
 	sysfs_remove_bin_file(&dev_info->bat->dev.kobj,
-				&ds2780_param_eeprom_bin_attr);
+				&ds2781_param_eeprom_bin_attr);
 fail_remove_group:
-	sysfs_remove_group(&dev_info->bat->dev.kobj, &ds2780_attr_group);
+	sysfs_remove_group(&dev_info->bat->dev.kobj, &ds2781_attr_group);
 fail_unregister:
 	power_supply_unregister(dev_info->bat);
 fail:
 	return ret;
 }
 
-static int ds2780_battery_remove(struct platform_device *pdev)
+static int ds2781_battery_remove(struct platform_device *pdev)
 {
-	struct ds2780_device_info *dev_info = platform_get_drvdata(pdev);
+	struct ds2781_device_info *dev_info = platform_get_drvdata(pdev);
 
 	/*
 	 * Remove attributes before unregistering power supply
 	 * because 'bat' will be freed on power_supply_unregister() call.
 	 */
-	sysfs_remove_group(&dev_info->bat->dev.kobj, &ds2780_attr_group);
+	sysfs_remove_group(&dev_info->bat->dev.kobj, &ds2781_attr_group);
 
 	power_supply_unregister(dev_info->bat);
 
 	return 0;
 }
 
-static struct platform_driver ds2780_battery_driver = {
+static struct platform_driver ds2781_battery_driver = {
 	.driver = {
-		.name = "ds2780-battery",
+		.name = "ds2781-battery",
 	},
-	.probe	  = ds2780_battery_probe,
-	.remove   = ds2780_battery_remove,
+	.probe	  = ds2781_battery_probe,
+	.remove   = ds2781_battery_remove,
 };
-
-module_platform_driver(ds2780_battery_driver);
+module_platform_driver(ds2781_battery_driver);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Clifton Barnes <[e-mail]>");
-MODULE_DESCRIPTION("Maxim/Dallas DS2780 Stand-Alone Fuel Gauage IC driver");
-MODULE_ALIAS("platform:ds2780-battery");
+MODULE_AUTHOR("Renata Sayakhova <[e-mail]>");
+MODULE_DESCRIPTION("Maxim/Dallas DS2781 Stand-Alone Fuel Gauage IC driver");
+MODULE_ALIAS("platform:ds2781-battery");
+

drivers/power/ds2781_battery.c drivers/power/supply/ds2780_battery.c

···
 /*
- * 1-wire client/driver for the Maxim/Dallas DS2781 Stand-Alone Fuel Gauge IC
+ * 1-wire client/driver for the Maxim/Dallas DS2780 Stand-Alone Fuel Gauge IC
  *
- * Author: Renata Sayakhova <[e-mail]>
+ * Copyright (C) 2010 Indesign, LLC
  *
- * Based on ds2780_battery drivers
+ * Author: Clifton Barnes <[e-mail]>
+ *
+ * Based on ds2760_battery and ds2782_battery drivers
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
···
 #include <linux/power_supply.h>
 #include <linux/idr.h>
 
-#include "../w1/w1.h"
-#include "../w1/slaves/w1_ds2781.h"
+#include "../../w1/w1.h"
+#include "../../w1/slaves/w1_ds2780.h"
 
 /* Current unit measurement in uA for a 1 milli-ohm sense resistor */
-#define DS2781_CURRENT_UNITS	1563
+#define DS2780_CURRENT_UNITS	1563
 /* Charge unit measurement in uAh for a 1 milli-ohm sense resistor */
-#define DS2781_CHARGE_UNITS		6250
+#define DS2780_CHARGE_UNITS		6250
 /* Number of bytes in user EEPROM space */
-#define DS2781_USER_EEPROM_SIZE		(DS2781_EEPROM_BLOCK0_END - \
-					DS2781_EEPROM_BLOCK0_START + 1)
+#define DS2780_USER_EEPROM_SIZE		(DS2780_EEPROM_BLOCK0_END - \
+					DS2780_EEPROM_BLOCK0_START + 1)
 /* Number of bytes in parameter EEPROM space */
-#define DS2781_PARAM_EEPROM_SIZE	(DS2781_EEPROM_BLOCK1_END - \
-					DS2781_EEPROM_BLOCK1_START + 1)
+#define DS2780_PARAM_EEPROM_SIZE	(DS2780_EEPROM_BLOCK1_END - \
+					DS2780_EEPROM_BLOCK1_START + 1)
 
-struct ds2781_device_info {
+struct ds2780_device_info {
 	struct device *dev;
 	struct power_supply *bat;
 	struct power_supply_desc bat_desc;
···
 	CURRENT_AVG,
 };
 
-static const char model[] = "DS2781";
+static const char model[] = "DS2780";
 static const char manufacturer[] = "Maxim/Dallas";
 
-static inline struct ds2781_device_info *
-to_ds2781_device_info(struct power_supply *psy)
+static inline struct ds2780_device_info *
+to_ds2780_device_info(struct power_supply *psy)
 {
 	return power_supply_get_drvdata(psy);
 }
···
 	return dev_get_drvdata(dev);
 }
 
-static inline int ds2781_battery_io(struct ds2781_device_info *dev_info,
+static inline int ds2780_battery_io(struct ds2780_device_info *dev_info,
 	char *buf, int addr, size_t count, int io)
 {
-	return w1_ds2781_io(dev_info->w1_dev, buf, addr, count, io);
+	return w1_ds2780_io(dev_info->w1_dev, buf, addr, count, io);
 }
 
-static int w1_ds2781_read(struct ds2781_device_info *dev_info, char *buf,
-		int addr, size_t count)
-{
-	return ds2781_battery_io(dev_info, buf, addr, count, 0);
-}
-
-static inline int ds2781_read8(struct ds2781_device_info *dev_info, u8 *val,
+static inline int ds2780_read8(struct ds2780_device_info *dev_info, u8 *val,
 	int addr)
 {
-	return ds2781_battery_io(dev_info, val, addr, sizeof(u8), 0);
+	return ds2780_battery_io(dev_info, val, addr, sizeof(u8), 0);
 }
 
-static int ds2781_read16(struct ds2781_device_info *dev_info, s16 *val,
+static int ds2780_read16(struct ds2780_device_info *dev_info, s16 *val,
 	int addr)
 {
 	int ret;
 	u8 raw[2];
 
-	ret = ds2781_battery_io(dev_info, raw, addr, sizeof(raw), 0);
+	ret = ds2780_battery_io(dev_info, raw, addr, sizeof(raw), 0);
 	if (ret < 0)
 		return ret;
 
···
 	return 0;
 }
 
-static inline int ds2781_read_block(struct ds2781_device_info *dev_info,
+static inline int ds2780_read_block(struct ds2780_device_info *dev_info,
 	u8 *val, int addr, size_t count)
 {
-	return ds2781_battery_io(dev_info, val, addr, count, 0);
+	return ds2780_battery_io(dev_info, val, addr, count, 0);
 }
 
-static inline int ds2781_write(struct ds2781_device_info *dev_info, u8 *val,
+static inline int ds2780_write(struct ds2780_device_info *dev_info, u8 *val,
 	int addr, size_t count)
 {
-	return ds2781_battery_io(dev_info, val, addr, count, 1);
+	return ds2780_battery_io(dev_info, val, addr, count, 1);
 }
 
-static inline int ds2781_store_eeprom(struct device *dev, int addr)
+static inline int ds2780_store_eeprom(struct device *dev, int addr)
 {
-	return w1_ds2781_eeprom_cmd(dev, addr, W1_DS2781_COPY_DATA);
+	return w1_ds2780_eeprom_cmd(dev, addr, W1_DS2780_COPY_DATA);
 }
 
-static inline int ds2781_recall_eeprom(struct device *dev, int addr)
+static inline int ds2780_recall_eeprom(struct device *dev, int addr)
 {
-	return w1_ds2781_eeprom_cmd(dev, addr, W1_DS2781_RECALL_DATA);
+	return w1_ds2780_eeprom_cmd(dev, addr, W1_DS2780_RECALL_DATA);
 }
 
-static int ds2781_save_eeprom(struct ds2781_device_info *dev_info, int reg)
+static int ds2780_save_eeprom(struct ds2780_device_info *dev_info, int reg)
 {
 	int ret;
 
-	ret = ds2781_store_eeprom(dev_info->w1_dev, reg);
+	ret = ds2780_store_eeprom(dev_info->w1_dev, reg);
 	if (ret < 0)
 		return ret;
 
-	ret = ds2781_recall_eeprom(dev_info->w1_dev, reg);
+	ret = ds2780_recall_eeprom(dev_info->w1_dev, reg);
 	if (ret < 0)
 		return ret;
 
···
 }
 
 /* Set sense resistor value in mhos */
-static int ds2781_set_sense_register(struct ds2781_device_info *dev_info,
+static int ds2780_set_sense_register(struct ds2780_device_info *dev_info,
 	u8 conductance)
 {
 	int ret;
 
-	ret = ds2781_write(dev_info, &conductance,
-				DS2781_RSNSP, sizeof(u8));
+	ret = ds2780_write(dev_info, &conductance,
+				DS2780_RSNSP_REG, sizeof(u8));
 	if (ret < 0)
 		return ret;
 
-	return ds2781_save_eeprom(dev_info, DS2781_RSNSP);
+	return ds2780_save_eeprom(dev_info, DS2780_RSNSP_REG);
 }
 
 /* Get RSGAIN value from 0 to 1.999 in steps of 0.001 */
-static int ds2781_get_rsgain_register(struct ds2781_device_info *dev_info,
+static int ds2780_get_rsgain_register(struct ds2780_device_info *dev_info,
 	u16 *rsgain)
 {
-	return ds2781_read16(dev_info, rsgain, DS2781_RSGAIN_MSB);
+	return ds2780_read16(dev_info, rsgain, DS2780_RSGAIN_MSB_REG);
 }
 
 /* Set RSGAIN value from 0 to 1.999 in steps of 0.001 */
-static int ds2781_set_rsgain_register(struct ds2781_device_info *dev_info,
+static int ds2780_set_rsgain_register(struct ds2780_device_info *dev_info,
 	u16 rsgain)
 {
 	int ret;
 	u8 raw[] = {rsgain >> 8, rsgain & 0xFF};
 
-	ret = ds2781_write(dev_info, raw,
-				DS2781_RSGAIN_MSB, sizeof(raw));
+	ret = ds2780_write(dev_info, raw,
+				DS2780_RSGAIN_MSB_REG, sizeof(raw));
 	if (ret < 0)
 		return ret;
 
-	return ds2781_save_eeprom(dev_info, DS2781_RSGAIN_MSB);
+	return ds2780_save_eeprom(dev_info, DS2780_RSGAIN_MSB_REG);
 }
 
-static int ds2781_get_voltage(struct ds2781_device_info *dev_info,
+static int ds2780_get_voltage(struct ds2780_device_info *dev_info,
 	int *voltage_uV)
 {
 	int ret;
-	char val[2];
-	int voltage_raw;
+	s16 voltage_raw;
 
-	ret = w1_ds2781_read(dev_info, val, DS2781_VOLT_MSB, 2 * sizeof(u8));
-	if (ret < 0)
-		return ret;
 	/*
 	 * The voltage value is located in 10 bits across the voltage MSB
 	 * and LSB registers in two's compliment form
···
 	 * Bits 2 - 0 of the voltage value are in bits 7 - 5 of the
 	 * voltage LSB register
 	 */
-	voltage_raw = (val[0] << 3) |
-		(val[1] >> 5);
+	ret = ds2780_read16(dev_info, &voltage_raw,
+				DS2780_VOLT_MSB_REG);
+	if (ret < 0)
+		return ret;
 
-	/* DS2781 reports voltage in units of 9.76mV, but the battery class
-	 * reports in units of uV, so convert by multiplying by 9760. */
-	*voltage_uV = voltage_raw * 9760;
-
+	/*
+	 * DS2780 reports voltage in units of 4.88mV, but the battery class
+	 * reports in units of uV, so convert by multiplying by 4880.
+	 */
+	*voltage_uV = (voltage_raw / 32) * 4880;
 	return 0;
 }
 
-static int ds2781_get_temperature(struct ds2781_device_info *dev_info,
-	int *temp)
+static int ds2780_get_temperature(struct ds2780_device_info *dev_info,
+	int *temperature)
 {
 	int ret;
-	char val[2];
-	int temp_raw;
+	s16 temperature_raw;
 
-	ret = w1_ds2781_read(dev_info, val, DS2781_TEMP_MSB, 2 * sizeof(u8));
-	if (ret < 0)
-		return ret;
 	/*
 	 * The temperature value is located in 10 bits across the temperature
 	 * MSB and LSB registers in two's compliment form
···
 	 * Bits 2 - 0 of the temperature value are in bits 7 - 5 of the
 	 * temperature LSB register
 	 */
-	temp_raw = ((val[0]) << 3) |
-		(val[1] >> 5);
-	*temp = temp_raw + (temp_raw / 4);
+	ret = ds2780_read16(dev_info, &temperature_raw,
+				DS2780_TEMP_MSB_REG);
+	if (ret < 0)
+		return ret;
 
+	/*
+	 * Temperature is measured in units of 0.125 degrees celcius, the
+	 * power_supply class measures temperature in tenths of degrees
+	 * celsius. The temperature value is stored as a 10 bit number, plus
+	 * sign in the upper bits of a 16 bit register.
+	 */
+	*temperature = ((temperature_raw / 32) * 125) / 100;
 	return 0;
 }
 
-static int ds2781_get_current(struct ds2781_device_info *dev_info,
+static int ds2780_get_current(struct ds2780_device_info *dev_info,
 	enum current_types type, int *current_uA)
 {
 	int ret, sense_res;
···
 	 * The units of measurement for current are dependent on the value of
 	 * the sense resistor.
 	 */
-	ret = ds2781_read8(dev_info, &sense_res_raw, DS2781_RSNSP);
+	ret = ds2780_read8(dev_info, &sense_res_raw, DS2780_RSNSP_REG);
 	if (ret < 0)
 		return ret;
 
···
 	sense_res = 1000 / sense_res_raw;
 
 	if (type == CURRENT_NOW)
-		reg_msb = DS2781_CURRENT_MSB;
+		reg_msb = DS2780_CURRENT_MSB_REG;
 	else if (type == CURRENT_AVG)
-		reg_msb = DS2781_IAVG_MSB;
+		reg_msb = DS2780_IAVG_MSB_REG;
 	else
 		return -EINVAL;
 
···
 	 * Bits 7 - 0 of the current value are in bits 7 - 0 of the current
 	 * LSB register
 	 */
-	ret = ds2781_read16(dev_info, &current_raw, reg_msb);
+	ret = ds2780_read16(dev_info, &current_raw, reg_msb);
 	if (ret < 0)
 		return ret;
 
-	*current_uA = current_raw * (DS2781_CURRENT_UNITS / sense_res);
+	*current_uA = current_raw * (DS2780_CURRENT_UNITS / sense_res);
 	return 0;
 }
 
-static int ds2781_get_accumulated_current(struct ds2781_device_info *dev_info,
+static int ds2780_get_accumulated_current(struct ds2780_device_info *dev_info,
 	int *accumulated_current)
 {
 	int ret, sense_res;
···
 	 * The units of measurement for accumulated current are dependent on
 	 * the value of the sense resistor.
 	 */
-	ret = ds2781_read8(dev_info, &sense_res_raw, DS2781_RSNSP);
+	ret = ds2780_read8(dev_info, &sense_res_raw, DS2780_RSNSP_REG);
 	if (ret < 0)
 		return ret;
 
 	if (sense_res_raw == 0) {
 		dev_err(dev_info->dev, "sense resistor value is 0\n");
-		return -EINVAL;
+		return -ENXIO;
 	}
 	sense_res = 1000 / sense_res_raw;
 
···
 	 * Bits 7 - 0 of the ACR value are in bits 7 - 0 of the ACR
 	 * LSB register
 	 */
-	ret = ds2781_read16(dev_info, &current_raw, DS2781_ACR_MSB);
+	ret = ds2780_read16(dev_info, &current_raw, DS2780_ACR_MSB_REG);
 	if (ret < 0)
 		return ret;
 
-	*accumulated_current = current_raw * (DS2781_CHARGE_UNITS / sense_res);
+	*accumulated_current = current_raw * (DS2780_CHARGE_UNITS / sense_res);
 	return 0;
 }
 
-static int ds2781_get_capacity(struct ds2781_device_info *dev_info,
+static int ds2780_get_capacity(struct ds2780_device_info *dev_info,
 	int *capacity)
 {
 	int ret;
 	u8 raw;
 
-	ret = ds2781_read8(dev_info, &raw, DS2781_RARC);
+	ret = ds2780_read8(dev_info, &raw, DS2780_RARC_REG);
 	if (ret < 0)
 		return ret;
 
 	*capacity = raw;
-	return 0;
+	return raw;
 }
 
-static int ds2781_get_status(struct ds2781_device_info *dev_info, int *status)
+static int ds2780_get_status(struct ds2780_device_info *dev_info, int *status)
 {
 	int ret, current_uA, capacity;
 
-	ret = ds2781_get_current(dev_info, CURRENT_NOW, &current_uA);
+	ret = ds2780_get_current(dev_info, CURRENT_NOW, &current_uA);
 	if (ret < 0)
 		return ret;
 
-	ret = ds2781_get_capacity(dev_info, &capacity);
+	ret = ds2780_get_capacity(dev_info, &capacity);
 	if (ret < 0)
 		return ret;
 
-	if (power_supply_am_i_supplied(dev_info->bat)) {
-		if (capacity == 100)
-			*status = POWER_SUPPLY_STATUS_FULL;
-		else if (current_uA > 50000)
-			*status = POWER_SUPPLY_STATUS_CHARGING;
-		else
-			*status = POWER_SUPPLY_STATUS_NOT_CHARGING;
-	} else {
+	if (capacity == 100)
+		*status = POWER_SUPPLY_STATUS_FULL;
+	else if (current_uA == 0)
+		*status = POWER_SUPPLY_STATUS_NOT_CHARGING;
+	else if (current_uA < 0)
 		*status = POWER_SUPPLY_STATUS_DISCHARGING;
-	}
+	else
+		*status = POWER_SUPPLY_STATUS_CHARGING;
+
 	return 0;
 }
 
-static int ds2781_get_charge_now(struct ds2781_device_info *dev_info,
+static int ds2780_get_charge_now(struct ds2780_device_info *dev_info,
 	int *charge_now)
 {
 	int ret;
···
 	 * Bits 7 - 0 of the RAAC value are in bits 7 - 0 of the RAAC
 	 * LSB register
 	 */
-	ret = ds2781_read16(dev_info, &charge_raw, DS2781_RAAC_MSB);
+	ret = ds2780_read16(dev_info, &charge_raw, DS2780_RAAC_MSB_REG);
 	if (ret < 0)
 		return ret;
 
···
 	return 0;
 }
 
-static int ds2781_get_control_register(struct ds2781_device_info *dev_info,
+static int ds2780_get_control_register(struct ds2780_device_info *dev_info,
 	u8 *control_reg)
 {
-	return ds2781_read8(dev_info, control_reg, DS2781_CONTROL);
+	return ds2780_read8(dev_info, control_reg, DS2780_CONTROL_REG);
 }
 
-static int ds2781_set_control_register(struct ds2781_device_info *dev_info,
+static int ds2780_set_control_register(struct ds2780_device_info *dev_info,
 	u8 control_reg)
 {
 	int ret;
 
-	ret = ds2781_write(dev_info, &control_reg,
-				DS2781_CONTROL, sizeof(u8));
+	ret = ds2780_write(dev_info, &control_reg,
+				DS2780_CONTROL_REG, sizeof(u8));
 	if (ret < 0)
 		return ret;
 
-	return ds2781_save_eeprom(dev_info, DS2781_CONTROL);
+	return ds2780_save_eeprom(dev_info, DS2780_CONTROL_REG);
 }
 
-static int ds2781_battery_get_property(struct power_supply *psy,
+static int ds2780_battery_get_property(struct power_supply *psy,
 	enum power_supply_property psp,
 	union power_supply_propval *val)
 {
 	int ret = 0;
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 
 	switch (psp) {
 	case POWER_SUPPLY_PROP_VOLTAGE_NOW:
-		ret = ds2781_get_voltage(dev_info, &val->intval);
+		ret = ds2780_get_voltage(dev_info, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_TEMP:
-		ret = ds2781_get_temperature(dev_info, &val->intval);
+		ret = ds2780_get_temperature(dev_info, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_MODEL_NAME:
···
 		break;
 
 	case POWER_SUPPLY_PROP_CURRENT_NOW:
-		ret = ds2781_get_current(dev_info, CURRENT_NOW, &val->intval);
+		ret = ds2780_get_current(dev_info, CURRENT_NOW, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_CURRENT_AVG:
-		ret = ds2781_get_current(dev_info, CURRENT_AVG, &val->intval);
+		ret = ds2780_get_current(dev_info, CURRENT_AVG, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_STATUS:
-		ret = ds2781_get_status(dev_info, &val->intval);
+		ret = ds2780_get_status(dev_info, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_CAPACITY:
-		ret = ds2781_get_capacity(dev_info, &val->intval);
+		ret = ds2780_get_capacity(dev_info, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_CHARGE_COUNTER:
-		ret = ds2781_get_accumulated_current(dev_info, &val->intval);
+		ret = ds2780_get_accumulated_current(dev_info, &val->intval);
 		break;
 
 	case POWER_SUPPLY_PROP_CHARGE_NOW:
-		ret = ds2781_get_charge_now(dev_info, &val->intval);
+		ret = ds2780_get_charge_now(dev_info, &val->intval);
 		break;
 
 	default:
···
 	return ret;
 }
 
-static enum power_supply_property ds2781_battery_props[] = {
+static enum power_supply_property ds2780_battery_props[] = {
 	POWER_SUPPLY_PROP_STATUS,
 	POWER_SUPPLY_PROP_VOLTAGE_NOW,
 	POWER_SUPPLY_PROP_TEMP,
···
 	POWER_SUPPLY_PROP_CHARGE_NOW,
 };
 
-static ssize_t ds2781_get_pmod_enabled(struct device *dev,
+static ssize_t ds2780_get_pmod_enabled(struct device *dev,
 	struct device_attribute *attr,
 	char *buf)
 {
 	int ret;
 	u8 control_reg;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 
 	/* Get power mode */
-	ret = ds2781_get_control_register(dev_info, &control_reg);
+	ret = ds2780_get_control_register(dev_info, &control_reg);
 	if (ret < 0)
 		return ret;
 
 	return sprintf(buf, "%d\n",
-		 !!(control_reg & DS2781_CONTROL_PMOD));
+		 !!(control_reg & DS2780_CONTROL_REG_PMOD));
 }
 
-static ssize_t ds2781_set_pmod_enabled(struct device *dev,
+static ssize_t ds2780_set_pmod_enabled(struct device *dev,
 	struct device_attribute *attr,
 	const char *buf,
 	size_t count)
···
 	int ret;
 	u8 control_reg, new_setting;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 
 	/* Set power mode */
-	ret = ds2781_get_control_register(dev_info, &control_reg);
+	ret = ds2780_get_control_register(dev_info, &control_reg);
 	if (ret < 0)
 		return ret;
 
···
 	}
 
 	if (new_setting)
-		control_reg |= DS2781_CONTROL_PMOD;
+		control_reg |= DS2780_CONTROL_REG_PMOD;
 	else
-		control_reg &= ~DS2781_CONTROL_PMOD;
+		control_reg &= ~DS2780_CONTROL_REG_PMOD;
 
-	ret = ds2781_set_control_register(dev_info, control_reg);
+	ret = ds2780_set_control_register(dev_info, control_reg);
 	if (ret < 0)
 		return ret;
 
 	return count;
 }
 
-static ssize_t ds2781_get_sense_resistor_value(struct device *dev,
+static ssize_t ds2780_get_sense_resistor_value(struct device *dev,
 	struct device_attribute *attr,
 	char *buf)
 {
 	int ret;
 	u8 sense_resistor;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 
-	ret = ds2781_read8(dev_info, &sense_resistor, DS2781_RSNSP);
+	ret = ds2780_read8(dev_info, &sense_resistor, DS2780_RSNSP_REG);
 	if (ret < 0)
 		return ret;
 
···
 	return ret;
 }
 
-static ssize_t ds2781_set_sense_resistor_value(struct device *dev,
+static ssize_t ds2780_set_sense_resistor_value(struct device *dev,
 	struct device_attribute *attr,
 	const char *buf,
 	size_t count)
···
 	int ret;
 	u8 new_setting;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 
 	ret = kstrtou8(buf, 0, &new_setting);
 	if (ret < 0)
 		return ret;
 
-	ret = ds2781_set_sense_register(dev_info, new_setting);
+	ret = ds2780_set_sense_register(dev_info, new_setting);
 	if (ret < 0)
 		return ret;
 
 	return count;
 }
 
-static ssize_t ds2781_get_rsgain_setting(struct device *dev,
+static ssize_t ds2780_get_rsgain_setting(struct device *dev,
 	struct device_attribute *attr,
 	char *buf)
 {
 	int ret;
 	u16 rsgain;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 
-	ret = ds2781_get_rsgain_register(dev_info, &rsgain);
+	ret = ds2780_get_rsgain_register(dev_info, &rsgain);
 	if (ret < 0)
 		return ret;
 
 	return sprintf(buf, "%d\n", rsgain);
 }
 
-static ssize_t ds2781_set_rsgain_setting(struct device *dev,
+static ssize_t ds2780_set_rsgain_setting(struct device *dev,
 	struct device_attribute *attr,
 	const char *buf,
 	size_t count)
···
 	int ret;
 	u16 new_setting;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 
 	ret = kstrtou16(buf, 0, &new_setting);
 	if (ret < 0)
···
 		return -EINVAL;
 	}
 
-	ret = ds2781_set_rsgain_register(dev_info, new_setting);
+	ret = ds2780_set_rsgain_register(dev_info, new_setting);
 	if (ret < 0)
 		return ret;
 
 	return count;
 }
 
-static ssize_t ds2781_get_pio_pin(struct device *dev,
+static ssize_t ds2780_get_pio_pin(struct device *dev,
 	struct device_attribute *attr,
 	char *buf)
 {
 	int ret;
 	u8 sfr;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 
-	ret = ds2781_read8(dev_info, &sfr, DS2781_SFR);
+	ret = ds2780_read8(dev_info, &sfr, DS2780_SFR_REG);
 	if (ret < 0)
 		return ret;
 
-	ret = sprintf(buf, "%d\n", sfr & DS2781_SFR_PIOSC);
+	ret = sprintf(buf, "%d\n", sfr & DS2780_SFR_REG_PIOSC);
 	return ret;
 }
 
-static ssize_t ds2781_set_pio_pin(struct device *dev,
+static ssize_t ds2780_set_pio_pin(struct device *dev,
 	struct device_attribute *attr,
 	const char *buf,
 	size_t count)
···
 	int ret;
 	u8 new_setting;
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 
 	ret = kstrtou8(buf, 0, &new_setting);
 	if (ret < 0)
···
 		return -EINVAL;
 	}
 
-	ret = ds2781_write(dev_info, &new_setting,
-				DS2781_SFR, sizeof(u8));
+	ret = ds2780_write(dev_info, &new_setting,
+				DS2780_SFR_REG, sizeof(u8));
 	if (ret < 0)
 		return ret;
 
 	return count;
 }
 
-static ssize_t ds2781_read_param_eeprom_bin(struct file *filp,
+static ssize_t ds2780_read_param_eeprom_bin(struct file *filp,
 				struct kobject *kobj,
 				struct bin_attribute *bin_attr,
 				char *buf, loff_t off, size_t count)
 {
 	struct device *dev = container_of(kobj, struct device, kobj);
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 
-	return ds2781_read_block(dev_info, buf,
-				DS2781_EEPROM_BLOCK1_START + off, count);
+	return ds2780_read_block(dev_info, buf,
+				DS2780_EEPROM_BLOCK1_START + off, count);
 }
 
-static ssize_t ds2781_write_param_eeprom_bin(struct file *filp,
+static ssize_t ds2780_write_param_eeprom_bin(struct file *filp,
 				struct kobject *kobj,
 				struct bin_attribute *bin_attr,
 				char *buf, loff_t off, size_t count)
 {
 	struct device *dev = container_of(kobj, struct device, kobj);
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 	int ret;
 
-	ret = ds2781_write(dev_info, buf,
-				DS2781_EEPROM_BLOCK1_START + off, count);
+	ret = ds2780_write(dev_info, buf,
+				DS2780_EEPROM_BLOCK1_START + off, count);
 	if (ret < 0)
 		return ret;
 
-	ret = ds2781_save_eeprom(dev_info, DS2781_EEPROM_BLOCK1_START);
+	ret = ds2780_save_eeprom(dev_info, DS2780_EEPROM_BLOCK1_START);
 	if (ret < 0)
 		return ret;
 
 	return count;
 }
 
-static struct bin_attribute ds2781_param_eeprom_bin_attr = {
+static struct bin_attribute ds2780_param_eeprom_bin_attr = {
 	.attr = {
 		.name = "param_eeprom",
 		.mode = S_IRUGO | S_IWUSR,
 	},
-	.size = DS2781_PARAM_EEPROM_SIZE,
-	.read = ds2781_read_param_eeprom_bin,
-	.write = ds2781_write_param_eeprom_bin,
+	.size = DS2780_PARAM_EEPROM_SIZE,
+	.read = ds2780_read_param_eeprom_bin,
+	.write = ds2780_write_param_eeprom_bin,
 };
 
-static ssize_t ds2781_read_user_eeprom_bin(struct file *filp,
+static ssize_t ds2780_read_user_eeprom_bin(struct file *filp,
 				struct kobject *kobj,
 				struct bin_attribute *bin_attr,
 				char *buf, loff_t off, size_t count)
 {
 	struct device *dev = container_of(kobj, struct device, kobj);
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 
-	return ds2781_read_block(dev_info, buf,
-				DS2781_EEPROM_BLOCK0_START + off, count);
-
+	return ds2780_read_block(dev_info, buf,
+				DS2780_EEPROM_BLOCK0_START + off, count);
 }
 
-static ssize_t ds2781_write_user_eeprom_bin(struct file *filp,
+static ssize_t ds2780_write_user_eeprom_bin(struct file *filp,
 				struct kobject *kobj,
 				struct bin_attribute *bin_attr,
 				char *buf, loff_t off, size_t count)
 {
 	struct device *dev = container_of(kobj, struct device, kobj);
 	struct power_supply *psy = to_power_supply(dev);
-	struct ds2781_device_info *dev_info = to_ds2781_device_info(psy);
+	struct ds2780_device_info *dev_info = to_ds2780_device_info(psy);
 	int ret;
 
-	ret = ds2781_write(dev_info, buf,
-				DS2781_EEPROM_BLOCK0_START + off, count);
+	ret = ds2780_write(dev_info, buf,
+				DS2780_EEPROM_BLOCK0_START + off, count);
 	if (ret < 0)
 		return ret;
 
-	ret = ds2781_save_eeprom(dev_info, DS2781_EEPROM_BLOCK0_START);
+	ret = ds2780_save_eeprom(dev_info, DS2780_EEPROM_BLOCK0_START);
 	if (ret < 0)
 		return ret;
 
 	return count;
 }
 
-static struct bin_attribute ds2781_user_eeprom_bin_attr = {
+static struct bin_attribute ds2780_user_eeprom_bin_attr = {
 	.attr = {
 		.name = "user_eeprom",
 		.mode = S_IRUGO | S_IWUSR,
 	},
-	.size = DS2781_USER_EEPROM_SIZE,
-	.read = ds2781_read_user_eeprom_bin,
-	.write = ds2781_write_user_eeprom_bin,
+	.size = DS2780_USER_EEPROM_SIZE,
+	.read = ds2780_read_user_eeprom_bin,
+	.write = ds2780_write_user_eeprom_bin,
 };
 
-static DEVICE_ATTR(pmod_enabled, S_IRUGO | S_IWUSR, ds2781_get_pmod_enabled,
-	ds2781_set_pmod_enabled);
+static DEVICE_ATTR(pmod_enabled, S_IRUGO | S_IWUSR, ds2780_get_pmod_enabled,
+	ds2780_set_pmod_enabled);
 static DEVICE_ATTR(sense_resistor_value, S_IRUGO | S_IWUSR,
-	ds2781_get_sense_resistor_value, ds2781_set_sense_resistor_value);
-static DEVICE_ATTR(rsgain_setting, S_IRUGO | S_IWUSR, ds2781_get_rsgain_setting,
-	ds2781_set_rsgain_setting);
-static DEVICE_ATTR(pio_pin, S_IRUGO | S_IWUSR, ds2781_get_pio_pin,
-	ds2781_set_pio_pin);
+	ds2780_get_sense_resistor_value, ds2780_set_sense_resistor_value);
+static DEVICE_ATTR(rsgain_setting, S_IRUGO | S_IWUSR, ds2780_get_rsgain_setting,
+	ds2780_set_rsgain_setting);
+static DEVICE_ATTR(pio_pin, S_IRUGO | S_IWUSR, ds2780_get_pio_pin,
+	ds2780_set_pio_pin);
 
 
-static struct attribute *ds2781_attributes[] = {
+static struct attribute *ds2780_attributes[] = {
 	&dev_attr_pmod_enabled.attr,
 	&dev_attr_sense_resistor_value.attr,
 	&dev_attr_rsgain_setting.attr,
···
 	NULL
 };
 
-static const struct attribute_group ds2781_attr_group = {
-	.attrs = ds2781_attributes,
+static const struct attribute_group ds2780_attr_group = {
+	.attrs = ds2780_attributes,
 };
 
-static int ds2781_battery_probe(struct platform_device *pdev)
+static int ds2780_battery_probe(struct platform_device *pdev)
 {
 	struct power_supply_config psy_cfg = {};
 	int ret = 0;
-	struct ds2781_device_info *dev_info;
+	struct ds2780_device_info *dev_info;
 
 	dev_info = devm_kzalloc(&pdev->dev, sizeof(*dev_info), GFP_KERNEL);
-	if (!dev_info)
-		return -ENOMEM;
+	if (!dev_info) {
+		ret = -ENOMEM;
+		goto fail;
+	}
 
 	platform_set_drvdata(pdev, dev_info);
 
···
 	dev_info->w1_dev		= pdev->dev.parent;
 	dev_info->bat_desc.name		= dev_name(&pdev->dev);
 	dev_info->bat_desc.type		= POWER_SUPPLY_TYPE_BATTERY;
-	dev_info->bat_desc.properties	= ds2781_battery_props;
-	dev_info->bat_desc.num_properties = ARRAY_SIZE(ds2781_battery_props);
-	dev_info->bat_desc.get_property	= ds2781_battery_get_property;
+	dev_info->bat_desc.properties	= ds2780_battery_props;
+	dev_info->bat_desc.num_properties = ARRAY_SIZE(ds2780_battery_props);
+	dev_info->bat_desc.get_property	= ds2780_battery_get_property;
 
 	psy_cfg.drv_data		= dev_info;
 
 	dev_info->bat = power_supply_register(&pdev->dev, &dev_info->bat_desc,
-						&psy_cfg);
+					      &psy_cfg);
 	if (IS_ERR(dev_info->bat)) {
 		dev_err(dev_info->dev, "failed to register battery\n");
 		ret = PTR_ERR(dev_info->bat);
 		goto fail;
 	}
 
-	ret = sysfs_create_group(&dev_info->bat->dev.kobj, &ds2781_attr_group);
+	ret = sysfs_create_group(&dev_info->bat->dev.kobj, &ds2780_attr_group);
 	if (ret) {
 		dev_err(dev_info->dev, "failed to create sysfs group\n");
 		goto fail_unregister;
 	}
 
 	ret = sysfs_create_bin_file(&dev_info->bat->dev.kobj,
-					&ds2781_param_eeprom_bin_attr);
+					&ds2780_param_eeprom_bin_attr);
 	if (ret) {
 		dev_err(dev_info->dev,
 				"failed to create param eeprom bin file");
···
 	}
 
 	ret = sysfs_create_bin_file(&dev_info->bat->dev.kobj,
-					&ds2781_user_eeprom_bin_attr);
+					&ds2780_user_eeprom_bin_attr);
 	if (ret) {
 		dev_err(dev_info->dev,
 				"failed to create user eeprom bin file");
···
 
 fail_remove_bin_file:
 	sysfs_remove_bin_file(&dev_info->bat->dev.kobj,
-				&ds2781_param_eeprom_bin_attr);
+				&ds2780_param_eeprom_bin_attr);
 fail_remove_group:
-	sysfs_remove_group(&dev_info->bat->dev.kobj, &ds2781_attr_group);
+	sysfs_remove_group(&dev_info->bat->dev.kobj, &ds2780_attr_group);
 fail_unregister:
 	power_supply_unregister(dev_info->bat);
 fail:
 	return ret;
 }
 
-static int ds2781_battery_remove(struct platform_device *pdev)
+static int ds2780_battery_remove(struct platform_device *pdev)
 {
-	struct ds2781_device_info *dev_info = platform_get_drvdata(pdev);
+	struct ds2780_device_info *dev_info = platform_get_drvdata(pdev);
 
 	/*
 	 * Remove attributes before unregistering power supply
 	 * because 'bat' will be freed on power_supply_unregister() call.
 	 */
-	sysfs_remove_group(&dev_info->bat->dev.kobj, &ds2781_attr_group);
+	sysfs_remove_group(&dev_info->bat->dev.kobj, &ds2780_attr_group);
 
 	power_supply_unregister(dev_info->bat);
 
 	return 0;
 }
 
-static struct platform_driver ds2781_battery_driver = {
+static struct platform_driver ds2780_battery_driver = {
 	.driver = {
-		.name = "ds2781-battery",
+		.name = "ds2780-battery",
 	},
-	.probe	  = ds2781_battery_probe,
-	.remove   = ds2781_battery_remove,
+	.probe	  = ds2780_battery_probe,
+	.remove   = ds2780_battery_remove,
 };
-module_platform_driver(ds2781_battery_driver);
+
+module_platform_driver(ds2780_battery_driver);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Renata Sayakhova <[e-mail]>");
-MODULE_DESCRIPTION("Maxim/Dallas DS2781 Stand-Alone Fuel Gauage IC driver");
-MODULE_ALIAS("platform:ds2781-battery");
-
+MODULE_AUTHOR("Clifton Barnes <[e-mail]>");
+MODULE_DESCRIPTION("Maxim/Dallas DS2780 Stand-Alone Fuel Gauage IC driver");
+MODULE_ALIAS("platform:ds2780-battery");

drivers/power/supply/Kconfig

···
+menuconfig POWER_SUPPLY
+	bool "Power supply class support"
+	help
+	  Say Y here to enable power supply class support. This allows
+	  power supply (batteries, AC, USB) monitoring by userspace
+	  via sysfs and uevent (if available) and/or APM kernel interface
+	  (if selected below).
+
+if POWER_SUPPLY
+
+config POWER_SUPPLY_DEBUG
+	bool "Power supply debug"
+	help
+	  Say Y here to enable debugging messages for power supply class
+	  and drivers.
+
+config PDA_POWER
+	tristate "Generic PDA/phone power driver"
+	depends on !S390
+	help
+	  Say Y here to enable generic power driver for PDAs and phones with
+	  one or two external power supplies (AC/USB) connected to main and
+	  backup batteries, and optional builtin charger.
+
+config APM_POWER
+	tristate "APM emulation for class batteries"
+	depends on APM_EMULATION
+	help
+	  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
+	help
+	  Say Y here to enable support for the battery charger in the Maxim
+	  MAX8925 PMIC.
+
+config WM831X_BACKUP
+	tristate "WM831X backup battery charger support"
+	depends on MFD_WM831X
+	help
+	  Say Y here to enable support for the backup battery charger
+	  in the Wolfson Microelectronics WM831x PMICs.
+
+config WM831X_POWER
+	tristate "WM831X PMU support"
+	depends on MFD_WM831X
+	help
+	  Say Y here to enable support for the power management unit
+	  provided by Wolfson Microelectronics WM831x PMICs.
+
+config WM8350_POWER
+        tristate "WM8350 PMU support"
+        depends on MFD_WM8350
+        help
+          Say Y here to enable support for the power management unit
+	  provided by the Wolfson Microelectronics WM8350 PMIC.
+
+config TEST_POWER
+	tristate "Test power driver"
+	help
+	  This driver is used for testing. It's safe to say M here.
+
+config BATTERY_88PM860X
+	tristate "Marvell 88PM860x battery driver"
+	depends on MFD_88PM860X
+	help
+	  Say Y here to enable battery monitor for Marvell 88PM860x chip.
+
+config BATTERY_ACT8945A
+	tristate "Active-semi ACT8945A charger driver"
+	depends on MFD_ACT8945A || COMPILE_TEST
+	help
+	  Say Y here to enable support for power supply provided by
+	  Active-semi ActivePath ACT8945A charger.
+
+config BATTERY_DS2760
+	tristate "DS2760 battery driver (HP iPAQ & others)"
+	depends on W1 && W1_SLAVE_DS2760
+	help
+	  Say Y here to enable support for batteries with ds2760 chip.
+
+config BATTERY_DS2780
+	tristate "DS2780 battery driver"
+	depends on HAS_IOMEM
+	select W1
+	select W1_SLAVE_DS2780
+	help
+	  Say Y here to enable support for batteries with ds2780 chip.
+
+config BATTERY_DS2781
+	tristate "DS2781 battery driver"
+	depends on HAS_IOMEM
+	select W1
+	select W1_SLAVE_DS2781
+	help
+	  If you enable this you will have the DS2781 battery driver support.
+
+	  The battery monitor chip is used in many batteries/devices
+	  as the one who is responsible for charging/discharging/monitoring
+	  Li+ batteries.
+
+	  If you are unsure, say N.
+
+config BATTERY_DS2782
+	tristate "DS2782/DS2786 standalone gas-gauge"
+	depends on I2C
+	help
+	  Say Y here to enable support for the DS2782/DS2786 standalone battery
+	  gas-gauge.
+
+config BATTERY_PMU
+	tristate "Apple PMU battery"
+	depends on PPC32 && ADB_PMU
+	help
+	  Say Y here to expose battery information on Apple machines
+	  through the generic battery class.
+
+config BATTERY_OLPC
+	tristate "One Laptop Per Child battery"
+	depends on X86_32 && OLPC
+	help
+	  Say Y to enable support for the battery on the OLPC laptop.
+
+config BATTERY_TOSA
+	tristate "Sharp SL-6000 (tosa) battery"
+	depends on MACH_TOSA && MFD_TC6393XB && TOUCHSCREEN_WM97XX
+	help
+	  Say Y to enable support for the battery on the Sharp Zaurus
+	  SL-6000 (tosa) models.
+
+config BATTERY_COLLIE
+	tristate "Sharp SL-5500 (collie) battery"
+	depends on SA1100_COLLIE && MCP_UCB1200
+	help
+	  Say Y to enable support for the battery on the Sharp Zaurus
+	  SL-5500 (collie) models.
+
+config BATTERY_IPAQ_MICRO
+	tristate "iPAQ Atmel Micro ASIC battery driver"
+	depends on MFD_IPAQ_MICRO
+	help
+	  Choose this option if you want to monitor battery status on
+	  Compaq/HP iPAQ h3100 and h3600.
+
+config BATTERY_WM97XX
+	bool "WM97xx generic battery driver"
+	depends on TOUCHSCREEN_WM97XX=y
+	help
+	  Say Y to enable support for battery measured by WM97xx aux port.
+
+config BATTERY_SBS
+        tristate "SBS Compliant gas gauge"
+        depends on I2C
+        help
+	  Say Y to include support for SBS battery driver for SBS-compliant
+	  gas gauges.
+
+config BATTERY_BQ27XXX
+	tristate "BQ27xxx battery driver"
+	help
+	  Say Y here to enable support for batteries with BQ27xxx chips.
+
+config BATTERY_BQ27XXX_I2C
+	tristate "BQ27xxx I2C support"
+	depends on BATTERY_BQ27XXX
+	depends on I2C
+	default y
+	help
+	  Say Y here to enable support for batteries with BQ27xxx chips
+	  connected over an I2C bus.
+
+config BATTERY_DA9030
+	tristate "DA9030 battery driver"
+	depends on PMIC_DA903X
+	help
+	  Say Y here to enable support for batteries charger integrated into
+	  DA9030 PMIC.
+
+config BATTERY_DA9052
+	tristate "Dialog DA9052 Battery"
+	depends on PMIC_DA9052
+	help
+	  Say Y here to enable support for batteries charger integrated into
+	  DA9052 PMIC.
+
+config CHARGER_DA9150
+	tristate "Dialog Semiconductor DA9150 Charger support"
+	depends on MFD_DA9150
+	depends on DA9150_GPADC
+	depends on IIO
+	help
+	  Say Y here to enable support for charger unit of the DA9150
+	  Integrated Charger & Fuel-Gauge IC.
+
+	  This driver can also be built as a module. If so, the module will be
+	  called da9150-charger.
+
+config BATTERY_DA9150
+	tristate "Dialog Semiconductor DA9150 Fuel Gauge support"
+	depends on MFD_DA9150
+	help
+	  Say Y here to enable support for the Fuel-Gauge unit of the DA9150
+	  Integrated Charger & Fuel-Gauge IC
+
+	  This driver can also be built as a module. If so, the module will be
+	  called da9150-fg.
+
+config AXP288_CHARGER
+	tristate "X-Powers AXP288 Charger"
+	depends on MFD_AXP20X && EXTCON_AXP288
+	help
+	  Say yes here to have support X-Power AXP288 power management IC (PMIC)
+	  integrated charger.
+
+config AXP288_FUEL_GAUGE
+	tristate "X-Powers AXP288 Fuel Gauge"
+	depends on MFD_AXP20X && IIO
+	help
+	  Say yes here to have support for X-Power power management IC (PMIC)
+	  Fuel Gauge. The device provides battery statistics and status
+	  monitoring as well as alerts for battery over/under voltage and
+	  over/under temperature.
+
+config BATTERY_MAX17040
+	tristate "Maxim MAX17040 Fuel Gauge"
+	depends on I2C
+	help
+	  MAX17040 is fuel-gauge systems for lithium-ion (Li+) batteries
+	  in handheld and portable equipment. The MAX17040 is configured
+	  to operate with a single lithium cell
+
+config BATTERY_MAX17042
+	tristate "Maxim MAX17042/17047/17050/8997/8966 Fuel Gauge"
+	depends on I2C
+	select REGMAP_I2C
+	help
+	  MAX17042 is fuel-gauge systems for lithium-ion (Li+) batteries
+	  in handheld and portable equipment. The MAX17042 is configured
+	  to operate with a single lithium cell. MAX8997 and MAX8966 are
+	  multi-function devices that include fuel gauages that are compatible
+	  with MAX17042. This driver also supports max17047/50 chips which are
+	  improved version of max17042.
+
+config BATTERY_Z2
+	tristate "Z2 battery driver"
+	depends on I2C && MACH_ZIPIT2
+	help
+	  Say Y to include support for the battery on the Zipit Z2.
+
+config BATTERY_S3C_ADC
+	tristate "Battery driver for Samsung ADC based monitoring"
+	depends on S3C_ADC
+	help
+	  Say Y here to enable support for iPAQ h1930/h1940/rx1950 battery
+
+config BATTERY_TWL4030_MADC
+	tristate "TWL4030 MADC battery driver"
+	depends on TWL4030_MADC
+	help
+	  Say Y here to enable this dumb driver for batteries managed
+	  through the TWL4030 MADC.
+
+config CHARGER_88PM860X
+	tristate "Marvell 88PM860x Charger driver"
+	depends on MFD_88PM860X && BATTERY_88PM860X
+	help
+	  Say Y here to enable charger for Marvell 88PM860x chip.
+
+config CHARGER_PCF50633
+	tristate "NXP PCF50633 MBC"
+	depends on MFD_PCF50633
+	help
+	 Say Y to include support for NXP PCF50633 Main Battery Charger.
+
+config BATTERY_JZ4740
+	tristate "Ingenic JZ4740 battery"
+	depends on MACH_JZ4740
+	depends on MFD_JZ4740_ADC
+	help
+	  Say Y to enable support for the battery on Ingenic JZ4740 based
+	  boards.
+
+	  This driver can be build as a module. If so, the module will be
+	  called jz4740-battery.
+
+config BATTERY_INTEL_MID
+	tristate "Battery driver for Intel MID platforms"
+	depends on INTEL_SCU_IPC && SPI
+	help
+	  Say Y here to enable the battery driver on Intel MID
+	  platforms.
+
+config BATTERY_RX51
+	tristate "Nokia RX-51 (N900) battery driver"
+	depends on TWL4030_MADC
+	help
+	  Say Y here to enable support for battery information on Nokia
+	  RX-51, also known as N900 tablet.
+
+config CHARGER_ISP1704
+	tristate "ISP1704 USB Charger Detection"
+	depends on USB_PHY
+	depends on USB_GADGET || !USB_GADGET # if USB_GADGET=m, this can't be 'y'
+	help
+	  Say Y to enable support for USB Charger Detection with
+	  ISP1707/ISP1704 USB transceivers.
+
+config CHARGER_MAX8903
+	tristate "MAX8903 Battery DC-DC Charger for USB and Adapter Power"
+	help
+	  Say Y to enable support for the MAX8903 DC-DC charger and sysfs.
+	  The driver supports controlling charger-enable and current-limit
+	  pins based on the status of charger connections with interrupt
+	  handlers.
+
+config CHARGER_TWL4030
+	tristate "OMAP TWL4030 BCI charger driver"
+	depends on IIO && TWL4030_CORE
+	help
+	  Say Y here to enable support for TWL4030 Battery Charge Interface.
+
+config CHARGER_LP8727
+	tristate "TI/National Semiconductor LP8727 charger driver"
+	depends on I2C
+	help
+	  Say Y here to enable support for LP8727 Charger Driver.
+
+config CHARGER_LP8788
+	tristate "TI LP8788 charger driver"
+	depends on MFD_LP8788
+	depends on LP8788_ADC
+	depends on IIO
+	help
+	  Say Y to enable support for the LP8788 linear charger.
+
+config CHARGER_GPIO
+	tristate "GPIO charger"
+	depends on GPIOLIB || COMPILE_TEST
+	help
+	  Say Y to include support for chargers which report their online status
+	  through a GPIO pin.
+
+	  This driver can be build as a module. If so, the module will be
+	  called gpio-charger.
+
+config CHARGER_MANAGER
+	bool "Battery charger manager for multiple chargers"
+	depends on REGULATOR
+	select EXTCON
+	help
+          Say Y to enable charger-manager support, which allows multiple
+          chargers attached to a battery and multiple batteries attached to a
+          system. The charger-manager also can monitor charging status in
+          runtime and in suspend-to-RAM by waking up the system periodically
+          with help of suspend_again support.
+
+config CHARGER_MAX14577
+	tristate "Maxim MAX14577/77836 battery charger driver"
+	depends on MFD_MAX14577
+	help
+	  Say Y to enable support for the battery charger control sysfs and
+	  platform data of MAX14577/77836 MUICs.
+
+config CHARGER_MAX77693
+	tristate "Maxim MAX77693 battery charger driver"
+	depends on MFD_MAX77693
+	help
+	  Say Y to enable support for the Maxim MAX77693 battery charger.
+
+config CHARGER_MAX8997
+	tristate "Maxim MAX8997/MAX8966 PMIC battery charger driver"
+	depends on MFD_MAX8997 && REGULATOR_MAX8997
+	help
+	  Say Y to enable support for the battery charger control sysfs and
+	  platform data of MAX8997/LP3974 PMICs.
+
+config CHARGER_MAX8998
+	tristate "Maxim MAX8998/LP3974 PMIC battery charger driver"
+	depends on MFD_MAX8998 && REGULATOR_MAX8998
+	help
+	  Say Y to enable support for the battery charger control sysfs and
+	  platform data of MAX8998/LP3974 PMICs.
+
+config CHARGER_QCOM_SMBB
+	tristate "Qualcomm Switch-Mode Battery Charger and Boost"
+	depends on MFD_SPMI_PMIC || COMPILE_TEST
+	depends on OF
+	depends on EXTCON
+	help
+	  Say Y to include support for the Switch-Mode Battery Charger and
+	  Boost (SMBB) hardware found in Qualcomm PM8941 PMICs.  The charger
+	  is an integrated, single-cell lithium-ion battery charger.  DT
+	  configuration is required for loading, see the devicetree
+	  documentation for more detail.  The base name for this driver is
+	  'pm8941_charger'.
+
+config CHARGER_BQ2415X
+	tristate "TI BQ2415x battery charger driver"
+	depends on I2C
+	help
+	  Say Y to enable support for the TI BQ2415x battery charger
+	  PMICs.
+
+	  You'll need this driver to charge batteries on e.g. Nokia
+	  RX-51/N900.
+
+config CHARGER_BQ24190
+	tristate "TI BQ24190 battery charger driver"
+	depends on I2C
+	depends on GPIOLIB || COMPILE_TEST
+	help
+	  Say Y to enable support for the TI BQ24190 battery charger.
+
+config CHARGER_BQ24257
+	tristate "TI BQ24250/24251/24257 battery charger driver"
+	depends on I2C
+	depends on GPIOLIB || COMPILE_TEST
+	depends on REGMAP_I2C
+	help
+	  Say Y to enable support for the TI BQ24250, BQ24251, and BQ24257 battery
+	  chargers.
+
+config CHARGER_BQ24735
+	tristate "TI BQ24735 battery charger support"
+	depends on I2C
+	depends on GPIOLIB || COMPILE_TEST
+	help
+	  Say Y to enable support for the TI BQ24735 battery charger.
+
+config CHARGER_BQ25890
+	tristate "TI BQ25890 battery charger driver"
+	depends on I2C
+	depends on GPIOLIB || COMPILE_TEST
+	select REGMAP_I2C
+	help
+	  Say Y to enable support for the TI BQ25890 battery charger.
+
+config CHARGER_SMB347
+	tristate "Summit Microelectronics SMB347 Battery Charger"
+	depends on I2C
+	select REGMAP_I2C
+	help
+	  Say Y to include support for Summit Microelectronics SMB347
+	  Battery Charger.
+
+config CHARGER_TPS65090
+	tristate "TPS65090 battery charger driver"
+	depends on MFD_TPS65090
+	help
+	 Say Y here to enable support for battery charging with TPS65090
+	 PMIC chips.
+
+config CHARGER_TPS65217
+	tristate "TPS65217 battery charger driver"
+	depends on MFD_TPS65217
+	help
+	 Say Y here to enable support for battery charging with TPS65217
+	 PMIC chips.
+
+config BATTERY_GAUGE_LTC2941
+	tristate "LTC2941/LTC2943 Battery Gauge Driver"
+	depends on I2C
+	help
+	  Say Y here to include support for LTC2941 and LTC2943 Battery
+	  Gauge IC. The driver reports the charge count continuously, and
+	  measures the voltage and temperature every 10 seconds.
+
+config AB8500_BM
+	bool "AB8500 Battery Management Driver"
+	depends on AB8500_CORE && AB8500_GPADC
+	help
+	  Say Y to include support for AB8500 battery management.
+
+config BATTERY_GOLDFISH
+	tristate "Goldfish battery driver"
+	depends on GOLDFISH || COMPILE_TEST
+	depends on HAS_IOMEM
+	help
+	  Say Y to enable support for the battery and AC power in the
+	  Goldfish emulator.
+
+config BATTERY_RT5033
+	tristate "RT5033 fuel gauge support"
+	depends on MFD_RT5033
+	help
+	  This adds support for battery fuel gauge in Richtek RT5033 PMIC.
+	  The fuelgauge calculates and determines the battery state of charge
+	  according to battery open circuit voltage.
+
+config CHARGER_RT9455
+	tristate "Richtek RT9455 battery charger driver"
+	depends on I2C
+	depends on GPIOLIB || COMPILE_TEST
+	select REGMAP_I2C
+	help
+	  Say Y to enable support for Richtek RT9455 battery charger.
+
+config AXP20X_POWER
+	tristate "AXP20x power supply driver"
+	depends on MFD_AXP20X
+	help
+	  This driver provides support for the power supply features of
+	  AXP20x PMIC.
+
+endif # POWER_SUPPLY

drivers/power/supply/Makefile

···
+subdir-ccflags-$(CONFIG_POWER_SUPPLY_DEBUG) := -DDEBUG
+
+power_supply-y				:= power_supply_core.o
+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
+obj-$(CONFIG_AXP20X_POWER)	+= axp20x_usb_power.o
+obj-$(CONFIG_MAX8925_POWER)	+= max8925_power.o
+obj-$(CONFIG_WM831X_BACKUP)	+= wm831x_backup.o
+obj-$(CONFIG_WM831X_POWER)	+= wm831x_power.o
+obj-$(CONFIG_WM8350_POWER)	+= wm8350_power.o
+obj-$(CONFIG_TEST_POWER)	+= test_power.o
+
+obj-$(CONFIG_BATTERY_88PM860X)	+= 88pm860x_battery.o
+obj-$(CONFIG_BATTERY_ACT8945A)	+= act8945a_charger.o
+obj-$(CONFIG_BATTERY_DS2760)	+= ds2760_battery.o
+obj-$(CONFIG_BATTERY_DS2780)	+= ds2780_battery.o
+obj-$(CONFIG_BATTERY_DS2781)	+= ds2781_battery.o
+obj-$(CONFIG_BATTERY_DS2782)	+= ds2782_battery.o
+obj-$(CONFIG_BATTERY_GAUGE_LTC2941)	+= ltc2941-battery-gauge.o
+obj-$(CONFIG_BATTERY_GOLDFISH)	+= goldfish_battery.o
+obj-$(CONFIG_BATTERY_PMU)	+= pmu_battery.o
+obj-$(CONFIG_BATTERY_OLPC)	+= olpc_battery.o
+obj-$(CONFIG_BATTERY_TOSA)	+= tosa_battery.o
+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_BQ27XXX)	+= bq27xxx_battery.o
+obj-$(CONFIG_BATTERY_BQ27XXX_I2C) += bq27xxx_battery_i2c.o
+obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
+obj-$(CONFIG_BATTERY_DA9052)	+= da9052-battery.o
+obj-$(CONFIG_CHARGER_DA9150)	+= da9150-charger.o
+obj-$(CONFIG_BATTERY_DA9150)	+= da9150-fg.o
+obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o
+obj-$(CONFIG_BATTERY_MAX17042)	+= max17042_battery.o
+obj-$(CONFIG_BATTERY_Z2)	+= z2_battery.o
+obj-$(CONFIG_BATTERY_RT5033)	+= rt5033_battery.o
+obj-$(CONFIG_CHARGER_RT9455)	+= rt9455_charger.o
+obj-$(CONFIG_BATTERY_S3C_ADC)	+= s3c_adc_battery.o
+obj-$(CONFIG_BATTERY_TWL4030_MADC)	+= twl4030_madc_battery.o
+obj-$(CONFIG_CHARGER_88PM860X)	+= 88pm860x_charger.o
+obj-$(CONFIG_CHARGER_PCF50633)	+= pcf50633-charger.o
+obj-$(CONFIG_BATTERY_JZ4740)	+= jz4740-battery.o
+obj-$(CONFIG_BATTERY_INTEL_MID)	+= intel_mid_battery.o
+obj-$(CONFIG_BATTERY_RX51)	+= rx51_battery.o
+obj-$(CONFIG_AB8500_BM)		+= ab8500_bmdata.o ab8500_charger.o ab8500_fg.o ab8500_btemp.o abx500_chargalg.o pm2301_charger.o
+obj-$(CONFIG_CHARGER_ISP1704)	+= isp1704_charger.o
+obj-$(CONFIG_CHARGER_MAX8903)	+= max8903_charger.o
+obj-$(CONFIG_CHARGER_TWL4030)	+= twl4030_charger.o
+obj-$(CONFIG_CHARGER_LP8727)	+= lp8727_charger.o
+obj-$(CONFIG_CHARGER_LP8788)	+= lp8788-charger.o
+obj-$(CONFIG_CHARGER_GPIO)	+= gpio-charger.o
+obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o
+obj-$(CONFIG_CHARGER_MAX14577)	+= max14577_charger.o
+obj-$(CONFIG_CHARGER_MAX77693)	+= max77693_charger.o
+obj-$(CONFIG_CHARGER_MAX8997)	+= max8997_charger.o
+obj-$(CONFIG_CHARGER_MAX8998)	+= max8998_charger.o
+obj-$(CONFIG_CHARGER_QCOM_SMBB)	+= qcom_smbb.o
+obj-$(CONFIG_CHARGER_BQ2415X)	+= bq2415x_charger.o
+obj-$(CONFIG_CHARGER_BQ24190)	+= bq24190_charger.o
+obj-$(CONFIG_CHARGER_BQ24257)	+= bq24257_charger.o
+obj-$(CONFIG_CHARGER_BQ24735)	+= bq24735-charger.o
+obj-$(CONFIG_CHARGER_BQ25890)	+= bq25890_charger.o
+obj-$(CONFIG_CHARGER_SMB347)	+= smb347-charger.o
+obj-$(CONFIG_CHARGER_TPS65090)	+= tps65090-charger.o
+obj-$(CONFIG_CHARGER_TPS65217)	+= tps65217_charger.o
+obj-$(CONFIG_AXP288_FUEL_GAUGE) += axp288_fuel_gauge.o
+obj-$(CONFIG_AXP288_CHARGER)	+= axp288_charger.o

drivers/power/wm97xx_battery.c drivers/power/supply/wm97xx_battery.c

···
 /*
- * linux/drivers/power/wm97xx_battery.c
- *
  * Battery measurement code for WM97xx
  *
  * based on tosa_battery.c