[PATCH 1/3] ARM: dts: ux500: Move Synaptics to right include

[Linus Walleij]

The Synaptics RMI4 touchscreen is a property of the
TVK1281618 R2 UIB, so move it into that file instead
of the main TVK1281618 main include so we can define
another touchscreen for the R3 UIB.

Signed-off-by: Linus Walleij <linus.walleij at linaro.org>
---
 arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi | 29 ++++++++++++++++
 arch/arm/boot/dts/ste-href-tvk1281618.dtsi    | 34 -------------------
 2 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
index c55993c35bd9..de6acee738e5 100644
--- a/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
@@ -65,7 +65,25 @@ lis331dl at 1c {
 		};
 		i2c at 80110000 {
 			synaptics at 4b {
+				/* Synaptics RMI4 TM1217 touchscreen */
+				compatible = "syna,rmi4-i2c";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				reg = <0x4b>;
+				vdd-supply = <&ab8500_ldo_aux1_reg>;
+				vddio-supply = <&db8500_vsmps2_reg>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&synaptics_tvk_mode>;
+				interrupt-parent = <&gpio2>;
+				interrupts = <20 IRQ_TYPE_EDGE_FALLING>;
+
+				rmi4-f01 at 1 {
+					reg = <0x1>;
+					syna,nosleep = <1>;
+				};
 				rmi4-f11 at 11 {
+					reg = <0x11>;
+					syna,sensor-type = <1>;
 					/* This is a landscape display */
 					touchscreen-swapped-x-y;
 				};
@@ -83,5 +101,16 @@ panel {
 				};
 			};
 		};
+		pinctrl {
+			synaptics {
+				synaptics_tvk_mode: synaptics_tvk {
+					/* Touchscreen uses GPIO 84 */
+					tvk_cfg1 {
+						pins = "GPIO84_C2";
+						ste,config = <&gpio_in_pu>;
+					};
+				};
+			};
+		};
 	};
 };
diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
index 1ee7d001fd31..34b9f434b4b7 100644
--- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
@@ -125,31 +125,6 @@ lsp001wm at 5c {
 			};
 		};
 
-		i2c at 80110000 {
-			synaptics at 4b {
-				/* Synaptics RMI4 TM1217 touchscreen */
-				compatible = "syna,rmi4-i2c";
-				#address-cells = <1>;
-				#size-cells = <0>;
-				reg = <0x4b>;
-				vdd-supply = <&ab8500_ldo_aux1_reg>;
-				vddio-supply = <&db8500_vsmps2_reg>;
-				pinctrl-names = "default";
-				pinctrl-0 = <&synaptics_tvk_mode>;
-				interrupt-parent = <&gpio2>;
-				interrupts = <20 IRQ_TYPE_EDGE_FALLING>;
-
-				rmi4-f01 at 1 {
-					reg = <0x1>;
-					syna,nosleep = <1>;
-				};
-				rmi4-f11 at 11 {
-					reg = <0x11>;
-					syna,sensor-type = <1>;
-				};
-			};
-		};
-
 		pinctrl {
 			/* Pull up this GPIO pin */
 			tc35893 {
@@ -203,15 +178,6 @@ tvk_cfg2 {
 					};
 				};
 			};
-			synaptics {
-				synaptics_tvk_mode: synaptics_tvk {
-					/* Touchscreen uses GPIO 84 */
-					tvk_cfg1 {
-						pins = "GPIO84_C2";
-						ste,config = <&gpio_in_pu>;
-					};
-				};
-			};
 		};
 	};
 };
-- 
2.29.2