summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/ste-hrefv60plus.dtsi
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2015-11-03 15:20:31 +0100
committerLinus Walleij <linus.walleij@linaro.org>2015-11-17 09:37:09 +0100
commit250656b4bc442d8e8c264733241b7b083dabb1a8 (patch)
tree19cf69b62abdf8ff10afb321820543dcc615cfbc /arch/arm/boot/dts/ste-hrefv60plus.dtsi
parentLinux 4.4-rc1 (diff)
downloadlinux-250656b4bc442d8e8c264733241b7b083dabb1a8.tar.xz
linux-250656b4bc442d8e8c264733241b7b083dabb1a8.zip
ARM: ux500: push down Rohm TS to STUIB
The Rohm touchscreen reset and IRQ lines were registered and configured at the HREF board level of the design, but it is an integral part of the UIB (User Interface Board). Fix this by pushing down the pin control node to the u8500 UIB file. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/ste-hrefv60plus.dtsi')
-rw-r--r--arch/arm/boot/dts/ste-hrefv60plus.dtsi18
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
index 9c2387b34d0c..149a72e7e37a 100644
--- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
@@ -43,7 +43,6 @@
<&vaudio_hf_hrefv60_mode>,
<&gbf_hrefv60_mode>,
<&hdtv_hrefv60_mode>,
- <&touch_hrefv60_mode>,
<&gpios_hrefv60_mode>;
sdi0 {
@@ -190,23 +189,6 @@
};
};
};
- touch {
- touch_hrefv60_mode: touch_hrefv60 {
- /*
- * Touch screen uses GPIO 143 for RST1, GPIO 146 for RST2 and
- * GPIO 67 for interrupts. Pull-up the IRQ line and drive both
- * reset signals low.
- */
- hrefv60_cfg1 {
- pins = "GPIO143_D12", "GPIO146_D13";
- ste,config = <&gpio_out_lo>;
- };
- hrefv60_cfg2 {
- pins = "GPIO67_G2";
- ste,config = <&gpio_in_pu>;
- };
- };
- };
mcde {
lcd_hrefv60_mode: lcd_hrefv60 {
/*