summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-06 23:33:41 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-06 23:33:41 +0300
commit7c623cac4939fb36916c029609dd22e3dec0a014 (patch)
treedaf4aad9a30418e1b7cee15ffd1b5a58785ea81a /arch/arm
parent9bbd4b9f38f56b4ee2c8ff268a1104ff38333e90 (diff)
parent829a7da03fd5f94c3a3ee1f8e22371e81cf73c79 (diff)
downloadlinux-7c623cac4939fb36916c029609dd22e3dec0a014.tar.xz
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/arm')
-rw-r--r--arch/arm/boot/dts/twl4030.dtsi2
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>;
};