10 files changed, 69 insertions, 43 deletions

diff --git a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
index 553e2013c..054cb1fb9 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ar_git.bb
@@ -7,8 +7,6 @@ inherit module
 SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/auto-resp;branch=nxp/sdk-v2.0.x;protocol=https"
 SRCREV =  "9a74743167dcfcfbca5056eedbff9a52337c9712"
 
-S = "${WORKDIR}/git"
-
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} SYSROOT=${STAGING_DIR_TARGET}"
 export KERNEL_PATH
 
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb
index 13793132a..053239365 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.2+fslc.bb
@@ -12,8 +12,6 @@ PV .= "+git${SRCPV}"
 SRCREV = "4d035200e7b15d2713d49979a1d05f201b92cf4c"
 SRC_URI = "git://github.com/Freescale/kernel-module-imx-gpu-viv.git;protocol=https;branch=master"
 
-S = "${WORKDIR}/git"
-
 inherit module
 
 KERNEL_MODULE_AUTOLOAD = "galcore"
diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.4.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb
index e48d72585..f55ca7084 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p2.4.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb
@@ -7,14 +7,14 @@ allowing flexibility to use a newer graphics release with an older kernel."
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=git/src \
+SRC_URI = "${KERNEL_SRC};subpath=drivers/mxc/gpu-viv;destsuffix=${S}/src \
            file://Add-makefile.patch"
 KERNEL_SRC ?= "git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH = "lf-6.6.y"
-LOCALVERSION = "-6.6.3-1.0.0"
-SRCREV = "3571388e9660f96b65b5fdcc093cc973ee502949"
+SRCBRANCH = "lf-6.12.y"
+LOCALVERSION = "-6.12.3-1.0.0"
+SRCREV = "d8c9f00d41b313a1ac122530524a62604c6871c9"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/${BP}"
 
 inherit module
 
diff --git a/recipes-kernel/kernel-modules/kernel-module-ipc.inc b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
index d2316fe00..50d8cca62 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ipc.inc
+++ b/recipes-kernel/kernel-modules/kernel-module-ipc.inc
@@ -8,8 +8,6 @@ inherit module qoriq_build_64bit_kernel
 SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ipc;protocol=https;nobranch=1"
 SRCREV = "74d662707558290f070f9589177db730444bc435"
 
-S = "${WORKDIR}/git"
-
 do_configure[depends] += "virtual/kernel:do_shared_workdir"
 do_compile:prepend () {
     cd ${S}/kernel
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.1.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.1.bb
deleted file mode 100644
index d2c63aa05..000000000
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.1.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2020-2023 NXP
-
-DESCRIPTION = "Kernel loadable module for ISP"
-LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
-
-SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
-ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
-SRCBRANCH = "lf-6.6.3_1.0.0"
-SRCREV = "2102360b58d9d1b36bc0c654c8301e4014b33951"
-
-S = "${WORKDIR}/git/vvcam/v4l2"
-
-inherit module
-
-DEBUG_PREFIX_MAP:prepend = " \
-    -fmacro-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
-    -fdebug-prefix-map=${WORKDIR}/git/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
-
-COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb
new file mode 100644
index 000000000..62dd737cb
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.25.1.bb
@@ -0,0 +1,22 @@
+# Copyright (C) 2020-2023 NXP
+
+DESCRIPTION = "Kernel loadable module for ISP"
+LICENSE = "GPL-2.0-only"
+LIC_FILES_CHKSUM = "file://${S}/../LICENSE;md5=64381a6ea83b48c39fe524c85f65fb44"
+
+SRC_URI = "${ISP_KERNEL_SRC};branch=${SRCBRANCH}"
+ISP_KERNEL_SRC ?= "git://github.com/nxp-imx/isp-vvcam.git;protocol=https"
+SRCBRANCH = "lf-6.12.y_1.0.0"
+SRCREV = "78d717bb22819df9d988ef1b4e3cca1acf61095d"
+
+S = "${UNPACKDIR}/${BP}/vvcam/v4l2"
+
+inherit module
+
+MODULES_MODULE_SYMVERS_LOCATION = "dwe"
+
+DEBUG_PREFIX_MAP:prepend = " \
+    -fmacro-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \
+    -fdebug-prefix-map=${UNPACKDIR}/${BP}/vvcam=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} "
+
+COMPATIBLE_MACHINE = "(mx8mp-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb
index ba1561618..9c5ce8f17 100644
--- a/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-ls-debug_git.bb
@@ -10,8 +10,6 @@ inherit module autotools-brokensep
 SRC_URI = "git://github.com/nxp-qoriq-yocto-sdk/ls-dbg;branch=nxp/master;protocol=https"
 SRCREV = "40501f6659e880d38508cdd34a4df2d348d1c68e"
 
-S = "${WORKDIR}/git"
-
 EXTRA_OECONF += "--with-linux=${STAGING_KERNEL_DIR}"
 EXTRA_OEMAKE += 'SYSROOT="${D}"'
 
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch
new file mode 100644
index 000000000..72e75fd57
--- /dev/null
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan/mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch
@@ -0,0 +1,33 @@
+From f6079560bd0010a7f34bd18fec8fab4df65b22ea Mon Sep 17 00:00:00 2001
+From: Vitor Soares <vitor.soares@toradex.com>
+Date: Wed, 30 Apr 2025 15:12:06 +0100
+Subject: [PATCH] mlinux: moal_main: lower PRINTM_MMSG() log level to KERN_INFO
+
+Currently, the PRINTM_MMSG macro uses KERN_ALERT for printing messages.
+KERN_ALERT is intended for critical conditions requiring immediate
+attention (e.g., hardware failure), and using it for normal debug output
+is misleading and can clutter system logs.
+
+This patch lowers the log level to KERN_INFO, which is more appropriate
+for informational messages that are not indicative of system-critical
+failures.
+
+Upstream-Status: Inappropriate [upstream not accepting patches]
+Signed-off-by: Vitor Soares <vitor.soares@toradex.com>
+---
+ mlinux/moal_main.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mlinux/moal_main.h b/mlinux/moal_main.h
+index 4328652..27121e0 100644
+--- a/mlinux/moal_main.h
++++ b/mlinux/moal_main.h
+@@ -3529,7 +3529,7 @@ extern t_u32 drvdbg;
+        do {                                                                   \
+                woal_print(MMSG, msg);                                         \
+                if (drvdbg & MMSG)                                             \
+-                       printk(KERN_ALERT msg);                                \
++                       printk(KERN_INFO msg);                                \
+        } while (0)
+ 
+ static inline void woal_print(t_u32 level, char *fmt, ...)
diff --git a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
index 48e9cc3bc..70386dc0d 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -1,6 +1,6 @@
-SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/612"
+SUMMARY = "NXP Wi-Fi driver for module 88w8801/8987/8997/9098 IW416/610/612"
 LICENSE = "GPL-2.0-only"
-LIC_FILES_CHKSUM = "file://../../LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ab04ac0f249af12befccb94447c08b77"
 
 # For backwards compatibility
 PROVIDES += "kernel-module-nxp89xx"
@@ -8,15 +8,14 @@ RREPLACES:${PN} = "kernel-module-nxp89xx"
 RPROVIDES:${PN} = "kernel-module-nxp89xx"
 RCONFLICTS:${PN} = "kernel-module-nxp89xx"
 
-SRCBRANCH = "lf-6.6.3_1.0.0"
+SRCBRANCH = "lf-6.12.3_1.0.0"
 MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
-SRC_URI = "${MRVL_SRC};branch=${SRCBRANCH}"
-SRCREV = "a84df583155bad2a396a937056805550bdf655ab"
-
-S = "${WORKDIR}/git/mxm_wifiex/wlan_src"
+SRC_URI = " \
+    ${MRVL_SRC};branch=${SRCBRANCH} \
+    file://mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch \
+"
+SRCREV = "0396cfb38ad73a3d587cd0f8c139b47801e70891"
 
 inherit module
 
 EXTRA_OEMAKE = "KERNELDIR=${STAGING_KERNEL_BUILDDIR} -C ${STAGING_KERNEL_BUILDDIR} M=${S}"
-
-COMPATIBLE_MACHINE = "(imx-nxp-bsp)"
diff --git a/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb b/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb
index efccc286d..e7ae8556e 100644
--- a/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-uio-seville_0.1.bb
@@ -7,6 +7,6 @@ SRCREV = "0f31fbcbe9ab1ab9c424da34f70c82314b16f8de"
 
 inherit module
 
-S = "${WORKDIR}/git/uio-driver"
+S = "${UNPACKDIR}/${BP}/uio-driver"
 
 COMPATIBLE_MACHINE = "(t1040|t1042)"