5 files changed, 14 insertions, 16 deletions

diff --git a/arch/arm/boot/dts/ste-href-stuib.dtsi b/arch/arm/boot/dts/ste-href-stuib.dtsi
index 524e33240ad4..76704ec0ffcc 100644
--- a/arch/arm/boot/dts/ste-href-stuib.dtsi
+++ b/arch/arm/boot/dts/ste-href-stuib.dtsi
@@ -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>;
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>;
                         };
                 };
diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi
index de6b0a0c5a54..b2cd7bc2752f 100644
--- a/arch/arm/boot/dts/ste-hrefprev60.dtsi
+++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi
@@ -49,12 +49,6 @@
                         };
                 };
 
-                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>;
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>;
                         };
                 };
         };
diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
index d0f116555c0e..aed511b47a9e 100644
--- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi
@@ -23,12 +23,6 @@
         };
 
         soc {
-                i2c@80110000 {
-                        bu21013_tp@0x5c {
-                                reset-gpio = <&gpio4 15 0x4>;
-                        };
-                };
-
                 // External Micro SD slot
                 sdi0_per1@80126000 {
                         arm,primecell-periphid = <0x10480180>;