diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-18 15:35:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-18 15:35:09 -0800 |
| commit | a709bd585f291b9a6d0a3691ab4a0b9d3300a7a1 (patch) | |
| tree | e35ef74281f1aefd23bcdb712832685ddb6f0668 /arch | |
| parent | 3ea369eea07eb64adf36a6fb7fddb5d082c84143 (diff) | |
| parent | c8024234c20eaf7b163cc4dbd963cb9cd03a4ff1 (diff) | |
| download | kernel-common-a709bd585f291b9a6d0a3691ab4a0b9d3300a7a1.tar.gz kernel-common-a709bd585f291b9a6d0a3691ab4a0b9d3300a7a1.tar.bz2 kernel-common-a709bd585f291b9a6d0a3691ab4a0b9d3300a7a1.zip | |
Merge tag 'for-v3.13' of git://git.infradead.org/battery-2.6
Pull battery updates from Anton Vorontsov:
"Highlights:
- A new driver for TI BQ24735 Battery Chargers, courtesy of NVidia.
- Device tree bindings for TWL4030 chips.
- Random fixes and cleanups"
* tag 'for-v3.13' of git://git.infradead.org/battery-2.6:
pm2301-charger: Remove unneeded NULL checks
twl4030_charger: Add devicetree support
power_supply: Fix documentation for TEMP_*ALERT* properties
max17042_battery: Support regmap to access device's registers
max17042_battery: Use SIMPLE_DEV_PM_OPS
charger-manager : Replace kzalloc to devm_kzalloc and remove uneccessary code
bq2415x_charger: Fix max battery regulation voltage
tps65090-charger: Use "IS_ENABLED(CONFIG_OF)" for DT code
tps65090-charger: Drop devm_free_irq of devm_ allocated irq
power_supply: Add support for bq24735 charger
pm2301-charger: Staticize pm2xxx_charger_die_therm_mngt
pm2301-charger: Check return value of regulator_enable
ab8500-charger: Remove redundant break
ab8500-charger: Check return value of regulator_enable
isp1704_charger: Fix driver to work with changes introduced in v3.5
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/twl4030.dtsi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi index fb1b2ec8eaa9..4217096ee677 100644 --- a/arch/arm/boot/dts/twl4030.dtsi +++ b/arch/arm/boot/dts/twl4030.dtsi @@ -19,6 +19,12 @@ interrupts = <11>; }; + charger: bci { + compatible = "ti,twl4030-bci"; + interrupts = <9>, <2>; + bci3v1-supply = <&vusb3v1>; + }; + watchdog { compatible = "ti,twl4030-wdt"; }; |