Merge tag 'for-v4.4-important-fix' of git://git.kernel.org/pub/scm/linux/kernel/git...

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"

diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index 482b7aa37808ef78d68ce886f0b527774951b428..36ae9160b558cadfab86810dc84db4d5cec35695 100644 (file)
--- 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>;
        };