From 741a6c4c59cfa1266bc75aca9f66bdc6e421b0d5 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Thu, 3 Oct 2013 10:29:24 +0200 Subject: ARM: ux500: move BU21013 touchpad GPIOs into top-level DTS The BU21013 touchscreen GPIOs have been pretty confused, correct them per board, and move the GPIO assignments up to the top level DTS file so we can control it from there, and avoid defining the GPIO assignments for non-ST UIB equipped boards. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-hrefprev60-stuib.dts | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arch/arm/boot/dts/ste-hrefprev60-stuib.dts') diff --git a/arch/arm/boot/dts/ste-hrefprev60-stuib.dts b/arch/arm/boot/dts/ste-hrefprev60-stuib.dts index 3e1b974b43a1..2b1cb5b584b6 100644 --- a/arch/arm/boot/dts/ste-hrefprev60-stuib.dts +++ b/arch/arm/boot/dts/ste-hrefprev60-stuib.dts @@ -20,7 +20,13 @@ soc { /* Reset line for the BU21013 touchscreen */ i2c@80110000 { + /* Only one of these will be used */ bu21013_tp@5c { + touch-gpio = <&gpio2 12 0x4>; + reset-gpio = <&tc3589x_gpio 13 0x4>; + }; + bu21013_tp@5d { + touch-gpio = <&gpio2 12 0x4>; reset-gpio = <&tc3589x_gpio 13 0x4>; }; }; -- cgit v1.2.1