verdin-imx8mm: move most properties in disabled nodes

Move all non conflicting properties into nodes of the main device tree and
just set the status to okay for those nodes.

Split the touch controller from the lvds controller's overlay into its own.

This unifies with the way it is done for the Verdin iMX8M Plus.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>

4 files changed, 34 insertions, 109 deletions

diff --git a/overlays/Makefile b/overlays/Makefile
index d7dd449..f04ea1d 100644
--- a/overlays/Makefile
+++ b/overlays/Makefile
@@ -62,6 +62,7 @@ dtb-y += display-fullhd-imx6_overlay.dtbo
 dtb-y += display-lt161010_overlay.dtbo
 dtb-y += display-lt170410_overlay.dtbo
 dtb-y += display-vga_overlay.dtbo
+dtb-y += touch-atmel-mxt_overlay.dtbo
 dtb-y += verdin-imx8mm_lt8912_overlay.dtbo
 dtb-y += verdin-imx8mm_ov5640_overlay.dtbo
 dtb-y += verdin-imx8mm_sn65dsi84_overlay.dtbo
diff --git a/overlays/touch-atmel-mxt_overlay.dts b/overlays/touch-atmel-mxt_overlay.dts
new file mode 100644
index 0000000..732df0e
--- /dev/null
+++ b/overlays/touch-atmel-mxt_overlay.dts
@@ -0,0 +1,13 @@
+// Atmel MXT touchscreen for the 7inch and 10inch display orderable at Toradex.
+
+/dts-v1/;
+/plugin/;
+
+/ {
+	compatible = "toradex,verdin-imx8mm",
+		     "toradex,verdin-imx8mp";
+};
+
+&atmel_mxt_ts {
+	status = "okay";
+};
diff --git a/overlays/verdin-imx8mm_lt8912_overlay.dts b/overlays/verdin-imx8mm_lt8912_overlay.dts
index 89cbc03..724cf98 100644
--- a/overlays/verdin-imx8mm_lt8912_overlay.dts
+++ b/overlays/verdin-imx8mm_lt8912_overlay.dts
@@ -9,44 +9,25 @@
 	compatible = "toradex,verdin-imx8mm";
 };
 
-&{/soc@0/bus@32c00000/display-subsystem} {
-	status = "okay";
-};
-
-/* Verdin I2C_2_DSI */
-&i2c2 {
-	clock-frequency = <10000>;
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_i2c2>;
+&gpu {
 	status = "okay";
 };
 
-/* Verdin I2C_1 */
-&i2c4 {
-	#address-cells = <1>;
-	#size-cells = <0>;
+&hdmi_lontium_lt8912 {
 	status = "okay";
 
-	hdmi@48 {
-		compatible = "lontium,lt8912";
-		ddc-i2c-bus = <&i2c2>;
-		/* Verdin MEZ_DSI_1_INT HPD (SODIMM 17) shared with MEZ_GPIO_1 (SODIMM 206) */
-		hpd-gpios = <&gpio3 15 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_mez_dsi_1_int_hpd>, <&pinctrl_mez_gpio1>,
-			    <&pinctrl_mez_gpio2>;
-		reg = <0x48>;
-		/* Verdin MEZ_GPIO_2 (SODIMM 208) */
-		reset-gpios = <&gpio5 5 GPIO_ACTIVE_LOW>;
-
-		port {
-			lt8912_1_in: endpoint {
-				remote-endpoint = <&mipi_dsi_bridge1_out>;
-			};
+	port {
+		lt8912_1_in: endpoint {
+			remote-endpoint = <&mipi_dsi_bridge1_out>;
 		};
 	};
 };
 
+/* Verdin I2C_2_DSI */
+&i2c2 {
+	status = "okay";
+};
+
 &lcdif {
 	status = "okay";
 };
@@ -65,7 +46,3 @@
 		};
 	};
 };
-
-&gpu {
-	status = "okay";
-};
diff --git a/overlays/verdin-imx8mm_sn65dsi84_overlay.dts b/overlays/verdin-imx8mm_sn65dsi84_overlay.dts
index 0471224..0b68405 100644
--- a/overlays/verdin-imx8mm_sn65dsi84_overlay.dts
+++ b/overlays/verdin-imx8mm_sn65dsi84_overlay.dts
@@ -11,22 +11,11 @@
 	compatible = "toradex,verdin-imx8mm";
 };
 
-&{/} {
-	backlight {
-		compatible = "pwm-backlight";
-		brightness-levels = <0 45 63 88 119 158 203 255>;
-		default-brightness-level = <4>;
-		/* Verdin MEZ_DSI_1_BKL_EN (SODIMM 21) */
-		enable-gpios = <&gpio3 3 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_mez_dsi_1_bkl_en>;
-		power-supply = <&reg_3p3v>;
-		/* Verdin MEZ_PWM_3_DSI (SODIMM 19) */
-		pwms = <&pwm1 0 6666667 PWM_POLARITY_INVERTED>;
-	};
+&backlight {
+	status = "okay";
 };
 
-&{/soc@0/bus@32c00000/display-subsystem} {
+&gpu {
 	status = "okay";
 };
 
@@ -38,69 +27,18 @@
 	status = "okay";
 };
 
-/* Verdin I2C_1 */
-&i2c4 {
-	#address-cells = <1>;
-	#size-cells = <0>;
+&lcdif {
 	status = "okay";
+};
 
-	bridge@2c {
-		compatible = "ti,sn65dsi83";
-		/* Verdin MEZ_GPIO_1 (SODIMM 206) */
-		enable-gpios = <&gpio3 4 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_mez_gpio1>;
-		reg = <0x2c>;
-		ti,dsi-lanes = <4>;
-		ti,height-mm = <136>;
-		ti,lvds-bpp = <24>;
-		ti,lvds-format = <2>;
-		ti,width-mm = <217>;
-
-		display-timings {
-			native-mode = <&lvds_timing0>;
-
-			lvds_timing0: lt170410_2whc {
-				/*
-				 * Take the minimum pixelclock as 71.1 MHz is
-				 * not working on NXP i.MX8M Mini
-				 */
-				clock-frequency = <68900000>;
-				hactive = <1280 1280 1280>;
-				hfront-porch = <23 60 71>;
-				hback-porch = <23 60 71>;
-				hsync-len = <15 40 47>;
-				vactive = <800 800 800>;
-				vfront-porch = <5 7 10>;
-				vback-porch = <5 7 10>;
-				vsync-len = <6 9 12>;
-				de-active = <1>;
-				pixelclk-active = <0>;
-			};
-		};
+&lvds_ti_sn65dsi83 {
+	status = "okay";
 
-		port {
-			dsi85_in: endpoint {
-				remote-endpoint = <&mipi_dsi_bridge1_out>;
-			};
+	port {
+		dsi85_in: endpoint {
+			remote-endpoint = <&mipi_dsi_bridge1_out>;
 		};
 	};
-
-	touch@4a {
-		compatible = "atmel,maxtouch";
-		/* Verdin MEZ_DSI_1_INT# (SODIMM 17) */
-		interrupt-parent = <&gpio3>;
-		interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_mez_dsi_1_int_n>, <&pinctrl_mez_gpio2>;
-		reg = <0x4a>;
-		/* Verdin MEZ_GPIO_2 (SODIMM 208) */
-		reset-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>;
-	};
-};
-
-&lcdif {
-	status = "okay";
 };
 
 &mipi_dsi {
@@ -117,7 +55,3 @@
 		};
 	};
 };
-
-&gpu {
-	status = "okay";
-};