From 4c0c68385bf9472936f97f4af7203ebd5f4d2887 Mon Sep 17 00:00:00 2001
From: Hiago De Franco <hiago.franco@toradex.com>
Date: Fri, 26 Jan 2024 11:05:51 -0300
Subject: arm64: dts: freescale: imx8qp: add apalis eval v1.2 carrier board

Add support for the new version, v1.2, of Apalis Evaluation Board with
Apalis iMX8 v1.1 QP module.

Board versions v1.0 and v1.1 are compatible with each other and should
use imx8qp-apalis-v1.1-eval.dts file dts file.

Upstream-Status: Inappropriate [other]

- Apalis iMX8 QP has no specific device tree file mainline, there the
  device file for iMX8 QM is used.

Related-to: ELB-5535
Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
---
 arch/arm64/boot/dts/freescale/Makefile             |  1 +
 .../dts/freescale/imx8qp-apalis-v1.1-eval-v1.2.dts | 27 ++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 arch/arm64/boot/dts/freescale/imx8qp-apalis-v1.1-eval-v1.2.dts

diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile
index 04ec628d7b54..2435ef179a2c 100644
--- a/arch/arm64/boot/dts/freescale/Makefile
+++ b/arch/arm64/boot/dts/freescale/Makefile
@@ -127,6 +127,7 @@ dtb-$(CONFIG_ARCH_MXC) += imx8qm-mek.dtb imx8qm-mek-ov5640.dtb \
 			  imx8qm-apalis-v1.1-ixora-v1.1.dtb \
 			  imx8qm-apalis-v1.1-ixora-v1.2.dtb \
 			  imx8qp-apalis-v1.1-eval.dtb \
+			  imx8qp-apalis-v1.1-eval-v1.2.dtb \
 			  imx8qp-apalis-v1.1-ixora-v1.1.dtb \
 			  imx8qp-apalis-v1.1-ixora-v1.2.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx8qm-mek-dom0.dtb imx8qm-mek-domu.dtb \
diff --git a/arch/arm64/boot/dts/freescale/imx8qp-apalis-v1.1-eval-v1.2.dts b/arch/arm64/boot/dts/freescale/imx8qp-apalis-v1.1-eval-v1.2.dts
new file mode 100644
index 000000000000..7545e22b35b2
--- /dev/null
+++ b/arch/arm64/boot/dts/freescale/imx8qp-apalis-v1.1-eval-v1.2.dts
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2024 Toradex
+ */
+
+/dts-v1/;
+
+#include "imx8qp-apalis-v1.1.dtsi"
+#include "imx8-apalis-eval-v1.2.dtsi"
+
+/ {
+	model = "Toradex Apalis iMX8QP V1.1 on Apalis Evaluation Board V1.2";
+	compatible = "toradex,apalis-imx8-v1.1-eval-v1.2",
+		     "toradex,apalis-imx8-v1.1",
+		     "fsl,imx8qp",
+		     "fsl,imx8qm";
+};
+
+/* Apalis MMC1 */
+&usdhc2 {
+	/delete-property/ no-1-8-v;
+};
+
+/* Apalis SD1 */
+&usdhc3 {
+	/delete-property/ no-1-8-v;
+};
-- 
cgit v1.2.3