diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-10-03 10:29:24 +0200 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-10-03 10:29:24 +0200 |
| commit | 741a6c4c59cfa1266bc75aca9f66bdc6e421b0d5 (patch) | |
| tree | 4099ed3776b699aac2357c912b1ac3e3cb6e5011 /arch/arm/boot/dts/ste-hrefv60plus-stuib.dts | |
| parent | 84919b96feebaf95f1739232c2984d69c2ee0802 (diff) | |
| download | linux-741a6c4c59cfa1266bc75aca9f66bdc6e421b0d5.tar.gz linux-741a6c4c59cfa1266bc75aca9f66bdc6e421b0d5.tar.bz2 linux-741a6c4c59cfa1266bc75aca9f66bdc6e421b0d5.zip | |
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 <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/ste-hrefv60plus-stuib.dts')
| -rw-r--r-- | arch/arm/boot/dts/ste-hrefv60plus-stuib.dts | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts b/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts index 4da49e7988e9..8c6a2de56cf1 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts +++ b/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts @@ -22,8 +22,14 @@ soc { /* Reset line for the BU21013 touchscreen */ i2c@80110000 { - bu21013_tp@0x5c { - reset-gpio = <&gpio4 15 0x4>; + /* Only one of these will be used */ + bu21013_tp@5c { + touch-gpio = <&gpio2 20 0x4>; + reset-gpio = <&gpio4 17 0x4>; + }; + bu21013_tp@5d { + touch-gpio = <&gpio2 20 0x4>; + reset-gpio = <&gpio4 17 0x4>; }; }; }; |