kernel/Revert-ARM-dts-twl4030-Add-iio-properties-for-bci-su.patch
2015-11-06 14:19:33 -08:00

38 lines
1.3 KiB
Diff

From ebcb3fbbf9ce01d641e5e0ea7d232a6cc225fb96 Mon Sep 17 00:00:00 2001
From: Sebastian Reichel <sre@kernel.org>
Date: Fri, 6 Nov 2015 17:13:50 +0100
Subject: [PATCH] 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's tree.
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>
---
arch/arm/boot/dts/twl4030.dtsi | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index 482b7aa..36ae916 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>;
};
--
2.5.0