diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-06 21:33:41 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-06 21:33:41 +0100 |
| commit | 7c623cac4939fb36916c029609dd22e3dec0a014 (patch) | |
| tree | daf4aad9a30418e1b7cee15ffd1b5a58785ea81a /arch | |
| parent | Merge tag 'devicetree-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Revert "ARM: dts: twl4030: Add iio properties for bci subnode" (diff) | |
| download | linux-7c623cac4939fb36916c029609dd22e3dec0a014.tar.xz linux-7c623cac4939fb36916c029609dd22e3dec0a014.zip | |
Merge tag 'for-v4.4-important-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
Pull power supply fix from Sebastian Reichel:
"Just a single revert for a patch, that I should not have queued.
Detailed description is inside the patch. It's totally my fault, that
this happened, sorry about that :("
* tag 'for-v4.4-important-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
Revert "ARM: dts: twl4030: Add iio properties for bci subnode"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/twl4030.dtsi | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi index 482b7aa37808..36ae9160b558 100644 --- a/arch/arm/boot/dts/twl4030.dtsi +++ b/arch/arm/boot/dts/twl4030.dtsi @@ -22,8 +22,6 @@ charger: bci { compatible = "ti,twl4030-bci"; interrupts = <9>, <2>; - io-channels = <&twl4030_madc 11>; - io-channel-name = "vac"; bci3v1-supply = <&vusb3v1>; }; |