arm64:dts: Reorder EDT touch and FPGA in ATM0700 DTs

arch/arm64/boot/dts/seconorth/atm0700.dtsi

@@ -2,62 +2,13 @@
  * Copyright 2023 SECO Northern Europe GmbH
  */
 
-&i2c2 {
-	touch: edt-ft5x06@38 {
-		compatible = "edt,edt-ft5x06", "edt,edt-ft5406";
-		reg = <0x38>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_captouch>;
-		enable_wakeup = "true";
-#if defined(TOUCH_USE_INT2) && (TOUCH_USE_INT2==1)
-		interrupt-parent = <touch_int2_parent>;
-		interrupts = <touch_int2_pin IRQ_TYPE_LEVEL_LOW>;
-#else
-		interrupt-parent = <touch_int_parent>;
-		interrupts = <touch_int_pin IRQ_TYPE_LEVEL_LOW>;
-#endif
-		touch-threshold     = <30>;
-		touch-gain          = <3>;
-		touch-offset        = <0>;
-		touch-report-rate   = <8>;
-		linux,wakeup;
-	};
-};
 #ifndef ATM0700_DTSI
 #define ATM0700_DTSI
 
-&i2c3 {
-	tr8fpga@41 {
-		status = "ok";
-		compatible = "kuk,tr8fpga";
-		reg = <0x41>;
-		// AZ Display
-		// 0x00		I2C_REG_ID:	0x61
-		// 0x01		I2C_REG_TEMP:	simple memory register
-		// 0x10		I2C_REG_DISPLAY:
-		//	0x8.	invert PCLK polarity
-		//	0x4.	invert HSync polarity
-		// 	0x2.	invert VSync polarity
-		//	0x1.	invert Data-Enable polarity
-		//	0x.C	24 bpp
-		//	0x.8	18 bpp
-		//	0x.4	16 bpp
-		//	0x.1	Enable MIPI-DSI to RGB conversion
-		// 0x20
-		//      0x01    Enable Wireless Module 2 UART4
-		//      
-		tr8fpga,addresses = <	0x10 0x20 >;
-#ifdef DISPLAY_ONLY_18BPP
-		tr8fpga,values =    <	0x89 0x00 >;
-#else
-		tr8fpga,values =    <	0x8D 0x00 >;
 #ifndef TRIZEPS8PLUS
 #define TRIZEPS8PLUS 0
 #endif
 
-	};
-};
-
 &mipi_dsi {
 	status              = "okay";
 
@@ -87,6 +38,51 @@ mipi_dsi_out: endpoint {
 	};
 };
 
+&fpga {
+	// AZ Display
+	// 0x00		I2C_REG_ID:	0x61
+	// 0x01		I2C_REG_TEMP:	simple memory register
+	// 0x10		I2C_REG_DISPLAY:
+	//	0x8.	invert PCLK polarity
+	//	0x4.	invert HSync polarity
+	// 	0x2.	invert VSync polarity
+	//	0x1.	invert Data-Enable polarity
+	//	0x.C	24 bpp
+	//	0x.8	18 bpp
+	//	0x.4	16 bpp
+	//	0x.1	Enable MIPI-DSI to RGB conversion
+	// 0x20
+	//      0x01    Enable Wireless Module 2 UART4
+	//
+	tr8fpga,addresses = < 0x10 0x10 >;
+#if DISPLAY_ONLY_18BPP
+	tr8fpga,values    = < 0x00 0x89 >;
+#else
+	tr8fpga,values    = < 0x00 0x8D >;
+#endif
+	status = "okay";
+};
+
+&i2c2 {
+	touch: edt-ft5x06@38 {
+		// the Keith & Koep version of the touch driver
+		compatible          = "seco,edt-ft5406";
+		reg                 = <0x38>;
+		pinctrl-names       = "default";
+		pinctrl-0           = <&pinctrl_captouch>;
+		enable-gpio         = <touch_enable GPIO_ACTIVE_HIGH>;
+		interrupt-parent    = <touch_int_parent>;
+		interrupts          = <touch_int_pin IRQ_TYPE_LEVEL_LOW>;
+		touch-threshold     = <30>;
+		touch-gain          = <3>;
+		touch-offset        = <0>;
+		touch-report-rate   = <8>;
+
+		xres                = <800>;
+		yres	            = <480>;
+	};
+};
+
 /************************************************************************/
 #if defined (__DTS_TRIZEPS8_PINFUNC_H)
 &hdmi {

arch/arm64/boot/dts/seconorth/atm0700l61ct.dtsi

@@ -27,31 +27,6 @@ TOUCH_INT  		PAD_GPIO /* IRQ */
 #ifndef ATM0700L61CT_DTSI
 #define ATM0700L61CT_DTSI
 
-&i2c2 {
-	touch: edt-ft5x06@38 {
-		compatible = "edt,edt-ft5x06", "edt,edt-ft5406";
-		reg = <0x38>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_captouch>;
-		enable_wakeup = "true";
-#if defined(TOUCH_USE_INT2) && (TOUCH_USE_INT2==1)
-		interrupt-parent = <touch_int2_parent>;
-		interrupts = <touch_int2_pin IRQ_TYPE_LEVEL_LOW>;
-#else
-		interrupt-parent = <touch_int_parent>;
-		interrupts = <touch_int_pin IRQ_TYPE_LEVEL_LOW>;
-#endif
-		reset-gpios         = <touch_reset GPIO_ACTIVE_HIGH>;
-		touch-threshold     = <30>;
-		touch-gain          = <3>;
-		touch-offset        = <0>;
-		touch-report-rate   = <8>;
-		yreverse            = "true";
-		xreverse            = "true";
-		xres                = <1024>;
-		yres	            = <600>;
-
-		linux,wakeup;
 	};
 };
 
@@ -182,4 +157,27 @@ mipi_dsi_out: endpoint {
 #endif
 /************************************************************************/
 
+// at least for the touch no distinction is needed (by now)
+&i2c2 {
+	touch: edt-ft5x06@38 {
+		// the Keith & Koep version of the touch driver
+		compatible          = "seco,edt-ft5406";
+		reg                 = <0x38>;
+		pinctrl-names       = "default";
+		pinctrl-0           = <&pinctrl_captouch>;
+		enable-gpio         = <touch_enable GPIO_ACTIVE_HIGH>;
+		interrupt-parent    = <touch_int_parent>;
+		interrupts          = <touch_int_pin IRQ_TYPE_LEVEL_LOW>;
+		touch-threshold     = <30>;
+		touch-gain          = <3>;
+		touch-offset        = <0>;
+		touch-report-rate   = <8>;
+		yreverse            = "true";
+		xreverse            = "true";
+
+		xres                = <1024>;
+		yres	            = <600>;
+	};
+};
+
 #endif