Skip to content

Commit 45352bb

Browse files
torvaldstorvalds
committed
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: power_supply: Makefile cleanup bq27x00_battery: Add missing kfree(di->bus) in bq27x00_battery_remove() power_supply: Introduce maximum current property power_supply: Add types for USB chargers ds2782_battery: Fix units power_supply: Add driver for TWL4030/TPS65950 BCI charger bq20z75: Add support for more power supply properties wm831x_power: Add missing kfree(wm831x_power) in wm831x_power_remove() jz4740-battery: Add missing kfree(jz_battery) in jz_battery_remove() ds2760_battery: Add missing kfree(di) in ds2760_battery_remove() olpc_battery: Fix endian neutral breakage for s16 values ds2760_battery: Fix W1 and W1_SLAVE_DS2760 dependency pcf50633-charger: Add missing sysfs_remove_group() power_supply: Add driver for TI BQ20Z75 gas gauge IC wm831x_power: Remove duplicate chg mask omap: rx51: Add support for USB chargers power_supply: Add isp1704 charger detection driver
2 parents da62aa6 + 5789451 commit 45352bb

15 files changed

+1483
-27
lines changed

‎arch/arm/mach-omap2/board-rx51-peripherals.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = {
107107
},
108108
};
109109

110+
static struct platform_device rx51_charger_device = {
111+
.name = "isp1704_charger",
112+
};
113+
110114
#if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
111115

112116
#define RX51_GPIO_CAMERA_LENS_COVER 110
@@ -919,5 +923,6 @@ void __init rx51_peripherals_init(void)
919923
spi_register_board_info(rx51_peripherals_spi_board_info,
920924
ARRAY_SIZE(rx51_peripherals_spi_board_info));
921925
omap2_hsmmc_init(mmc);
926+
platform_device_register(&rx51_charger_device);
922927
}
923928

‎drivers/power/Kconfig

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ config TEST_POWER
6464

6565
config BATTERY_DS2760
6666
tristate "DS2760 battery driver (HP iPAQ & others)"
67-
select W1
68-
select W1_SLAVE_DS2760
67+
depends on W1 && W1_SLAVE_DS2760
6968
help
7069
Say Y here to enable support for batteries with ds2760 chip.
7170

@@ -109,6 +108,13 @@ config BATTERY_WM97XX
109108
help
110109
Say Y to enable support for battery measured by WM97xx aux port.
111110

111+
config BATTERY_BQ20Z75
112+
tristate "TI BQ20z75 gas gauge"
113+
depends on I2C
114+
help
115+
Say Y to include support for TI BQ20z75 SBS-compliant
116+
gas gauge and protection IC.
117+
112118
config BATTERY_BQ27x00
113119
tristate "BQ27x00 battery driver"
114120
depends on I2C
@@ -166,4 +172,17 @@ config BATTERY_INTEL_MID
166172
Say Y here to enable the battery driver on Intel MID
167173
platforms.
168174

175+
config CHARGER_ISP1704
176+
tristate "ISP1704 USB Charger Detection"
177+
depends on USB_OTG_UTILS
178+
help
179+
Say Y to enable support for USB Charger Detection with
180+
ISP1707/ISP1704 USB transceivers.
181+
182+
config CHARGER_TWL4030
183+
tristate "OMAP TWL4030 BCI charger driver"
184+
depends on TWL4030_CORE
185+
help
186+
Say Y here to enable support for TWL4030 Battery Charge Interface.
187+
169188
endif # POWER_SUPPLY

‎drivers/power/Makefile

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
1-
power_supply-objs := power_supply_core.o
1+
ccflags-$(CONFIG_POWER_SUPPLY_DEBUG) := -DDEBUG
22

3-
ifeq ($(CONFIG_SYSFS),y)
4-
power_supply-objs += power_supply_sysfs.o
5-
endif
6-
7-
ifeq ($(CONFIG_LEDS_TRIGGERS),y)
8-
power_supply-objs += power_supply_leds.o
9-
endif
10-
11-
ifeq ($(CONFIG_POWER_SUPPLY_DEBUG),y)
12-
EXTRA_CFLAGS += -DDEBUG
13-
endif
3+
power_supply-y := power_supply_core.o
4+
power_supply-$(CONFIG_SYSFS) += power_supply_sysfs.o
5+
power_supply-$(CONFIG_LEDS_TRIGGERS) += power_supply_leds.o
146

157
obj-$(CONFIG_POWER_SUPPLY) += power_supply.o
168

@@ -29,6 +21,7 @@ obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o
2921
obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o
3022
obj-$(CONFIG_BATTERY_COLLIE) += collie_battery.o
3123
obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o
24+
obj-$(CONFIG_BATTERY_BQ20Z75) += bq20z75.o
3225
obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o
3326
obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o
3427
obj-$(CONFIG_BATTERY_MAX17040) += max17040_battery.o
@@ -37,3 +30,5 @@ obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o
3730
obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
3831
obj-$(CONFIG_BATTERY_JZ4740) += jz4740-battery.o
3932
obj-$(CONFIG_BATTERY_INTEL_MID) += intel_mid_battery.o
33+
obj-$(CONFIG_CHARGER_ISP1704) += isp1704_charger.o
34+
obj-$(CONFIG_CHARGER_TWL4030) += twl4030_charger.o

0 commit comments

Comments
 (0)