From cbc949447df22dd17e543be74702d372a3b0cefd Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Fri, 5 Jul 2024 10:22:23 +0200
Subject: [PATCH] linux-dey-6.1: add support to ConnectCore MP25 DVK platform

Add support based on v6.1.28 kernel version from STM release
openstlinux-6.1-yocto-mickledore-mp2-v23.12.06.

https://onedigi.atlassian.net/browse/DEL-8995

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../recipes-kernel/linux/linux-dey_6.1.bb     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb
index e9b736632..781d9829a 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb
@@ -3,6 +3,7 @@
 require recipes-kernel/linux/linux-dey.inc
 
 SRCBRANCH = "v6.1.55/nxp/master"
+SRCBRANCH:stm32mp2common = "v6.1.28/stm/master"
 
 # Patch series for RT Kernel
 NXP_RT_PATCHES = " \
@@ -30,3 +31,25 @@ KERNEL_MODULE_PROBECONF += "btnxpuart"
 module_conf_btnxpuart = "blacklist btnxpuart"
 
 COMPATIBLE_MACHINE = "(ccimx9)"
+
+# ---------------------------------------------------------------------
+# stub for devicetree which are located on digi directory
+do_install:prepend:ccmp2() {
+    if [ -d "${B}/arch/${ARCH}/boot/dts/digi" ]; then
+        for dtbf in ${KERNEL_DEVICETREE}; do
+            install -m 0644 "${B}/arch/${ARCH}/boot/dts/digi/${dtbf}" "${B}/arch/${ARCH}/boot/dts/"
+        done
+    fi
+}
+
+do_install:append:ccmp2() {
+    if ${@bb.utils.contains('MACHINE_FEATURES','gpu','true','false',d)}; then
+        # when ACCEPT_EULA are filled
+        install -d ${D}/${sysconfdir}/modprobe.d/
+        echo "blacklist etnaviv" > ${D}/${sysconfdir}/modprobe.d/blacklist.conf
+    fi
+}
+
+FILES:${KERNEL_PACKAGE_NAME}-modules:ccmp2 += "${sysconfdir}/modprobe.d"
+
+COMPATIBLE_MACHINE = "(ccimx9|ccmp2)"