From 52cbd8eb17a73ea58391dd204cd0c874de58828e Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Fri, 29 Nov 2024 12:09:31 +0100
Subject: [PATCH] linux-dey: use kernel version v6.6 for ccmp2

Update ccmp2 platform to use the latest Linux kernel v6.6.48 based on the
openstlinux-6.6-yocto-scarthgap-mpu-v24.11.06 tag for Yocto 5.0 (scarthgap).

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

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../conf/machine/include/digi-defaults.inc    |  2 +-
 .../recipes-kernel/linux/linux-dey_6.1.bb     | 32 -------------------
 .../recipes-kernel/linux/linux-dey_6.6.bb     | 24 +++++++++++++-
 3 files changed, 24 insertions(+), 34 deletions(-)
 delete mode 100644 meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb

diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index b1b3517d1..029f08f5c 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -20,7 +20,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 # ccimx93       6.6               2024.04 (packaged in imx-boot)
 # ccmp15        5.15              2021.10
 # ccmp13        5.15              2021.10
-# ccmp25        6.1               2022.10
+# ccmp25        6.6               2022.10
 #
 
 # Help variables used in recipes
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
deleted file mode 100644
index 5b4cb858f..000000000
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 2023,2024, Digi International Inc.
-
-require recipes-kernel/linux/linux-dey.inc
-
-SRCBRANCH = "v6.1.28/stm/master"
-SRCREV = "${AUTOREV}"
-
-SRC_URI:append = " \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'file://tsn_conf.cfg', '', d)} \
-"
-
-# ---------------------------------------------------------------------
-# 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 = "(ccmp2)"
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
index ca8d9510b..d01646a3a 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb
@@ -3,10 +3,32 @@
 require recipes-kernel/linux/linux-dey.inc
 
 SRCBRANCH = "v6.6.36/nxp/master"
+SRCBRANCH:stm32mp2common = "v6.6.48/stm/master"
 SRCREV = "${AUTOREV}"
+SRCREV:stm32mp2common = "${AUTOREV}"
 
 # Blacklist btnxpuart module. It will be managed by the bluetooth-init script
 KERNEL_MODULE_PROBECONF += "btnxpuart"
 module_conf_btnxpuart = "blacklist btnxpuart"
 
-COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x|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 = "(ccimx6ul|ccimx8x|ccimx9|ccmp2)"