Merge pull request #2337 from nxp-upstream/kernel_and_modules_6.12.20

Upgrade Linux kernel and headers and Modules to 6.12.20

5 files changed, 14 insertions, 13 deletions

diff --git a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.2.bb
index f55ca7084..63086d59a 100644
--- a/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.0.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-imx-gpu-viv_6.4.11.p3.2.bb
@@ -11,8 +11,8 @@ 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.12.y"
-LOCALVERSION = "-6.12.3-1.0.0"
-SRCREV = "d8c9f00d41b313a1ac122530524a62604c6871c9"
+LOCALVERSION = "-6.12.20-2.0.0"
+SRCREV = "d53b3fa8a69bef5ead825e81aa62dbdd08e1409c"
 
 S = "${UNPACKDIR}/${BP}"
 
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.2.bb
index 62dd737cb..058d9e0d8 100644
--- 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.2.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2023 NXP
+# Copyright (C) 2020-2025 NXP
 
 DESCRIPTION = "Kernel loadable module for ISP"
 LICENSE = "GPL-2.0-only"
@@ -6,8 +6,9 @@ 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"
+SRCBRANCH = "lf-6.12.y_2.0.0"
+SRCREV = "dc686fbb8b5b2f4cbc58d83756f65ad970b03ac2"
+
 
 S = "${UNPACKDIR}/${BP}/vvcam/v4l2"
 
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 70386dc0d..2341ab0c9 100644
--- a/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-nxp-wlan_git.bb
@@ -8,13 +8,13 @@ RREPLACES:${PN} = "kernel-module-nxp89xx"
 RPROVIDES:${PN} = "kernel-module-nxp89xx"
 RCONFLICTS:${PN} = "kernel-module-nxp89xx"
 
-SRCBRANCH = "lf-6.12.3_1.0.0"
+SRCBRANCH = "lf-6.12.20_2.0.0"
 MRVL_SRC ?= "git://github.com/nxp-imx/mwifiex.git;protocol=https"
 SRC_URI = " \
     ${MRVL_SRC};branch=${SRCBRANCH} \
     file://mlinux-moal_main-lower-PRINTM_MMSG-log-level-to-KERN_INFO.patch \
 "
-SRCREV = "0396cfb38ad73a3d587cd0f8c139b47801e70891"
+SRCREV = "7a8beaa1605cb0870dc7ba3312c76df91cb0d6cf"
 
 inherit module
 
diff --git a/recipes-kernel/linux/linux-imx-headers_6.12.bb b/recipes-kernel/linux/linux-imx-headers_6.12.bb
index 2f5ba04ee..ed2478965 100644
--- a/recipes-kernel/linux/linux-imx-headers_6.12.bb
+++ b/recipes-kernel/linux/linux-imx-headers_6.12.bb
@@ -1,4 +1,4 @@
-# Copyright 2017-2024 NXP
+# Copyright 2017-2025 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 SUMMARY = "Installs i.MX-specific kernel headers"
@@ -13,7 +13,7 @@ SRC_URI = " \
 "
 SRCBRANCH = "lf-6.12.y"
 LOCALVERSION = "-lts-${SRCBRANCH}"
-SRCREV = "37d02f4dcbbe6677dc9f5fc17f386c05d6a7bd7a"
+SRCREV = "dfaf2136deb2af2e60b994421281ba42f1c087e0"
 
 do_configure[noexec] = "1"
 
diff --git a/recipes-kernel/linux/linux-imx_6.12.bb b/recipes-kernel/linux/linux-imx_6.12.bb
index 05d9c4ea6..267a33542 100644
--- a/recipes-kernel/linux/linux-imx_6.12.bb
+++ b/recipes-kernel/linux/linux-imx_6.12.bb
@@ -1,5 +1,5 @@
 # Copyright 2013-2016 (C) Freescale Semiconductor
-# Copyright 2017-2024 (C) NXP
+# Copyright 2017-2025 (C) NXP
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 #
@@ -13,15 +13,15 @@ i.MX Family Reference Boards. It includes support for many IPs such as GPU, VPU
 require recipes-kernel/linux/linux-imx.inc
 
 SRCBRANCH = "lf-6.12.y"
-LOCALVERSION = "-6.12.3-1.1.0"
-SRCREV = "37d02f4dcbbe6677dc9f5fc17f386c05d6a7bd7a"
+LOCALVERSION = "-6.12.20-2.0.0"
+SRCREV = "dfaf2136deb2af2e60b994421281ba42f1c087e0"
 
 # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
 # required by kernel-yocto.bbclass.
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "6.12.3"
+LINUX_VERSION = "6.12.20"
 
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"