Commit 7c623cac authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'for-v4.4-important-fix' of...

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"
parents 9bbd4b9f 829a7da0
...@@ -22,8 +22,6 @@ rtc { ...@@ -22,8 +22,6 @@ rtc {
charger: bci { charger: bci {
compatible = "ti,twl4030-bci"; compatible = "ti,twl4030-bci";
interrupts = <9>, <2>; interrupts = <9>, <2>;
io-channels = <&twl4030_madc 11>;
io-channel-name = "vac";
bci3v1-supply = <&vusb3v1>; bci3v1-supply = <&vusb3v1>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment