diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 11:18:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-14 11:18:51 -0800 |
| commit | bbcd9c53c743cfee9feb0ee3b25070691d76c5ee (patch) | |
| tree | edca636a488f1192f6c886f80455c9bb6bdbefd6 /drivers/power/supply/bq27xxx_battery_i2c.c | |
| parent | ce38207f161513ee3d2bd3860489f07ebe65bc78 (diff) | |
| parent | 6480af4915d6ffb66afc39eee4e9e66cbf59b938 (diff) | |
| download | linux-bbcd9c53c743cfee9feb0ee3b25070691d76c5ee.tar.bz2 | |
Merge tag 'for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply and reset updates from Sebastian Reichel:
- new driver for Intel PIIX4
- lots of module autoload fixes
- misc fixes
* tag 'for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
power_supply: wm97xx_battery: use power_supply_get_drvdata
wm8350_power: use permission-specific DEVICE_ATTR variants
power: ipaq_micro_battery: fix alias
power: supply: bq27xxx_battery: Fix register map for BQ27510 and BQ27520
bq24190_charger: Fix PM runtime use for bq24190_battery_set_property
power: supply: lp8788: remove an unneeded NULL check
power: reset: zx-reboot: Fix module autoload
power: reset: syscon-reboot-mode: Fix module autoload
power: reset: at91-poweroff: Fix module autoload
power: reset: at91-reset: Fix module autoload
power: supply: axp288_fuel_gauge: Fix module autoload
power: supply: max8997_charger: Fix module autoload
power: supply: max17040: Change register transaction length from 8 bits to 16 bits
power: supply: bq27xxx_battery: don't update poll_interval param if same
power: supply: improve function-level documentation
power: reset: Add Intel PIIX4 poweroff driver
Diffstat (limited to 'drivers/power/supply/bq27xxx_battery_i2c.c')
| -rw-r--r-- | drivers/power/supply/bq27xxx_battery_i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c index 85d4ea2a9c20..5c5c3a6f9923 100644 --- a/drivers/power/supply/bq27xxx_battery_i2c.c +++ b/drivers/power/supply/bq27xxx_battery_i2c.c @@ -149,8 +149,8 @@ static const struct i2c_device_id bq27xxx_i2c_id_table[] = { { "bq27200", BQ27000 }, { "bq27210", BQ27010 }, { "bq27500", BQ27500 }, - { "bq27510", BQ27500 }, - { "bq27520", BQ27500 }, + { "bq27510", BQ27510 }, + { "bq27520", BQ27510 }, { "bq27530", BQ27530 }, { "bq27531", BQ27530 }, { "bq27541", BQ27541 }, |