ARM: ux500: move BU21013 touchpad GPIOs into top-level DTS
authorLinus Walleij <linus.walleij@linaro.org>
Thu, 3 Oct 2013 08:29:24 +0000 (10:29 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Thu, 3 Oct 2013 08:29:24 +0000 (10:29 +0200)
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>
arch/arm/boot/dts/ste-href-stuib.dtsi
arch/arm/boot/dts/ste-hrefprev60-stuib.dts
arch/arm/boot/dts/ste-hrefprev60.dtsi
arch/arm/boot/dts/ste-hrefv60plus-stuib.dts
arch/arm/boot/dts/ste-hrefv60plus.dtsi

index 524e33240ad418e739e7dfd7a6d41cce642b3261..76704ec0ffcc89bf3fd0d7e90726c6cc1502807b 100644 (file)
@@ -57,7 +57,6 @@
                        bu21013_tp@5c {
                                compatible = "rohm,bu21013_tp";
                                reg = <0x5c>;
-                               touch-gpio = <&gpio2 20 0x4>;
                                avdd-supply = <&ab8500_ldo_aux1_reg>;
 
                                rohm,touch-max-x = <384>;
@@ -68,7 +67,6 @@
                        bu21013_tp@5d {
                                compatible = "rohm,bu21013_tp";
                                reg = <0x5d>;
-                               touch-gpio = <&gpio2 20 0x4>;
                                avdd-supply = <&ab8500_ldo_aux1_reg>;
 
                                rohm,touch-max-x = <384>;
index 3e1b974b43a19e55aa38424a30255c8b70023071..2b1cb5b584b664033bd5eaba7c7f527ad35c5cf5 100644 (file)
        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>;
                        };
                };
index de6b0a0c5a54653c65d568eb5315c84fc37ad114..b2cd7bc2752f2a6ea67e0849593410cc61dd176a 100644 (file)
                        };
                };
 
-               i2c@80110000 {
-                       bu21013_tp@5c {
-                               reset-gpio = <&tc3589x_gpio 13 0x4>;
-                       };
-               };
-
                vmmci: regulator-gpio {
                        gpios = <&tc3589x_gpio 18 0x4>;
                        enable-gpio = <&tc3589x_gpio 17 0x4>;
index 4da49e7988e9ef531a42bac30fd6caf3c604206e..8c6a2de56cf121305a5f4bde0cf19255a60ff1fe 100644 (file)
        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>;
                        };
                };
        };
index d0f116555c0ec495bdaaba9e9ceb73b59bca257d..aed511b47a9e6fe015050920bb8ed3a0e19eb918 100644 (file)
        };
 
        soc {
-               i2c@80110000 {
-                       bu21013_tp@0x5c {
-                               reset-gpio = <&gpio4 15 0x4>;
-                       };
-               };
-
                // External Micro SD slot
                sdi0_per1@80126000 {
                        arm,primecell-periphid = <0x10480180>;