verdin-imx8mp: convert mezzanine overlaystoradex_5.15-2.0.x-imx

Related-to: ELB-4838
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>

6 files changed, 8 insertions, 22 deletions

diff --git a/overlays/Makefile b/overlays/Makefile
index 2c7f877..e3d877c 100644
--- a/overlays/Makefile
+++ b/overlays/Makefile
@@ -57,11 +57,10 @@ dtb-y += verdin-imx8mp_dsi-to-hdmi_overlay.dtbo
 dtb-y += verdin-imx8mp_dsi-to-lvds_panel-cap-touch-10inch-lvds_overlay.dtbo
 dtb-y += verdin-imx8mp_dsi-to-lvds_panel-lvds-dual-channel-1080p_overlay.dtbo
 dtb-y += verdin-imx8mp_hdmi_overlay.dtbo
-dtb-y += verdin-imx8mp_mezzanine-lvds-dual-channel_overlay.dtbo
-dtb-y += verdin-imx8mp_mezzanine-lvds-single-channel_overlay.dtbo
-dtb-y += verdin-imx8mp_mezzanine-ov5640_overlay.dtbo
-dtb-y += verdin-imx8mp_mezzanine-ov5640-2_overlay.dtbo
-dtb-y += verdin-imx8mp_mezzanine-touch-atmel-mxt_overlay.dtbo
+dtb-y += verdin-imx8mp_mezzanine_ov5640-alt-jumpers_overlay.dtbo
+dtb-y += verdin-imx8mp_mezzanine_ov5640-default-jumpers_overlay.dtbo
+dtb-y += verdin-imx8mp_mezzanine_panel-cap-touch-10inch-lvds_overlay.dtbo
+dtb-y += verdin-imx8mp_mezzanine_panel-lvds-dual-channel-1080p_overlay.dtbo
 dtb-y += verdin-imx8mp_ov5640_overlay.dtbo
 dtb-y += verdin-imx8mp_spidev_overlay.dtbo
 
diff --git a/overlays/verdin-imx8mp_mezzanine-touch-atmel-mxt_overlay.dts b/overlays/verdin-imx8mp_mezzanine-touch-atmel-mxt_overlay.dts
deleted file mode 100644
index 4a4f6b4..0000000
--- a/overlays/verdin-imx8mp_mezzanine-touch-atmel-mxt_overlay.dts
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/*
- * Copyright 2020-2021 Toradex
- */
-
-// Atmel MXT touchscreen on the Verdin iMX8M Plus Mezzanine
-
-/dts-v1/;
-/plugin/;
-
-/ {
-	compatible = "toradex,verdin-imx8mp";
-};
-
-&atmel_mxt_ts_mezzanine {
-	status = "okay";
-};
diff --git a/overlays/verdin-imx8mp_mezzanine-ov5640-2_overlay.dts b/overlays/verdin-imx8mp_mezzanine_ov5640-alt-jumpers_overlay.dts
index d94dc2e..d94dc2e 100644
--- a/overlays/verdin-imx8mp_mezzanine-ov5640-2_overlay.dts
+++ b/overlays/verdin-imx8mp_mezzanine_ov5640-alt-jumpers_overlay.dts
diff --git a/overlays/verdin-imx8mp_mezzanine-ov5640_overlay.dts b/overlays/verdin-imx8mp_mezzanine_ov5640-default-jumpers_overlay.dts
index dc6eb18..dc6eb18 100644
--- a/overlays/verdin-imx8mp_mezzanine-ov5640_overlay.dts
+++ b/overlays/verdin-imx8mp_mezzanine_ov5640-default-jumpers_overlay.dts
diff --git a/overlays/verdin-imx8mp_mezzanine-lvds-single-channel_overlay.dts b/overlays/verdin-imx8mp_mezzanine_panel-cap-touch-10inch-lvds_overlay.dts
index 0e9d34d..4aca1ae 100644
--- a/overlays/verdin-imx8mp_mezzanine-lvds-single-channel_overlay.dts
+++ b/overlays/verdin-imx8mp_mezzanine_panel-cap-touch-10inch-lvds_overlay.dts
@@ -12,6 +12,10 @@
 	compatible = "toradex,verdin-imx8mp";
 };
 
+&atmel_mxt_ts_mezzanine {
+	status = "okay";
+};
+
 &backlight_mezzanine {
 	status = "okay";
 };
diff --git a/overlays/verdin-imx8mp_mezzanine-lvds-dual-channel_overlay.dts b/overlays/verdin-imx8mp_mezzanine_panel-lvds-dual-channel-1080p_overlay.dts
index d8945b4..d8945b4 100644
--- a/overlays/verdin-imx8mp_mezzanine-lvds-dual-channel_overlay.dts
+++ b/overlays/verdin-imx8mp_mezzanine_panel-lvds-dual-channel-1080p_overlay.dts