summary refs log tree commit diff
path: root/arch
diff options
context:
space:
mode:
authorSebastian Reichel <sre@kernel.org>2015-11-06 17:00:01 +0100
committerSebastian Reichel <sre@kernel.org>2015-11-06 21:17:53 +0100
commit829a7da03fd5f94c3a3ee1f8e22371e81cf73c79 (patch)
treecebc1800f1d507b8640d6a813f5aae62c51f0801 /arch
parent3e069adabc9487b5e28065a17e6a228da3412dfd (diff)
downloadlinux-829a7da03fd5f94c3a3ee1f8e22371e81cf73c79.tar.gz
Revert "ARM: dts: twl4030: Add iio properties for bci subnode"
This reverts commit af19161aaed7ff8d1a52b2e517460f2fa0774e32,
which breaks the omap3 device tree build due to a wrong reference.

I accidently queued this change via the power supply subsystem while
telling Marek at the same time, that it should go through Tony.
Following that I did miss Stephen's messages about the build failure in
linux-next and since he switched to merging an older snapshot nobody
else noticed the problem in my tree. I didn't notice myself, since I
did not build any device tree files assuming none have changed by me.

Signed-off-by: Sebastian Reichel <sre@kernel.org>
Reported-by: Felipe Balbi <balbi@ti.com>
Tested-by: Felipe Balbi <balbi@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Tested-by: Kevin Hilman <khilman@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-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>;
 	};