9 files changed, 23 insertions, 24 deletions

diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf
index f8bdc4d7..001ce97a 100644
--- a/conf/machine/imx93-11x11-lpddr4x-evk.conf
+++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf
@@ -13,11 +13,11 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-boe-wxga-lvds-panel.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-flexio-i2c.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-i2c-spi-slave.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-i3c.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-iw612-otbr.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ld.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lpuart.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-mt9m114.dtb \
diff --git a/recipes-bsp/imx-atf/imx-atf_2.10.bb b/recipes-bsp/imx-atf/imx-atf_2.10.bb
index caa52161..04826b4c 100644
--- a/recipes-bsp/imx-atf/imx-atf_2.10.bb
+++ b/recipes-bsp/imx-atf/imx-atf_2.10.bb
@@ -9,7 +9,7 @@ PV .= "+git${SRCPV}"
 
 SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH}"
 SRCBRANCH = "lf_v2.10"
-SRCREV = "49143a1701d9ccd3239e3f95f3042897ca889ea8"
+SRCREV = "28affcae957cb8194917b5246276630f9e6343e1"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
index 658b28de..23af6828 100644
--- a/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
+++ b/recipes-graphics/mesa/mesa-etnaviv-env_0.1.bb
@@ -9,6 +9,8 @@ SRC_URI = "\
     file://mesa-etnaviv.sh \
 "
 
+S = "${UNPACKDIR}"
+
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
 
diff --git a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.2.bb b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.2.bb
index 55a4beda..5bd58cb1 100644
--- a/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.2.bb
+++ b/recipes-kernel/kernel-modules/kernel-module-isp-vvcam_4.2.2.24.2.bb
@@ -13,6 +13,8 @@ S = "${WORKDIR}/git/vvcam/v4l2"
 
 inherit module
 
+MODULES_MODULE_SYMVERS_LOCATION = "dwe"
+
 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} "
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.6.bb b/recipes-kernel/linux/linux-fslc-imx_6.6.bb
index d75e24f7..a955ae1c 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.6.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.6.bb
@@ -39,17 +39,12 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # 3. Critical patches (SHA(s))
 # ------------------------------------------------------------------------------
 
-# $ git log --oneline  --no-merges v6.6.23.. ^mainline/linux-6.6.y ^NXP/lf-6.6.y
-# - 4d8a7fb526c1 imx8mp: Remove obsolete device tree file
-# - e420d14b057f MLK-25922-4 arm64: dts: imx93: add lpspi support
-# - 965390eee531 Revert "dmaengine: fsl-edma: add address for channel mux register in fsl_edma_chan"
-# - a1553c4e0862 Revert "dmaengine: fsl-edma: add i.MX8ULP edma support"
-# - 652e34468562 Revert "dmaengine: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string"
-# - f4114b5ea07c Revert "dmaengine: fsl-edma: change the memory access from local into remote mode in i.MX 8QM"
-# - 97e602775143 Revert "arm64: dts: imx8-ss-conn: fix usdhc wrong lpcg clock order"
-# - dd280fd310dd arm64: imx_v8_defconfig: Enable CONFIG_GPIO_VF610
-# - 7a31ed76b4ee drm/imx: lcdifv3: Fix videomode settings
-# - fb5da09f0eae i2c: imx: Remove unnecessary clock reconfiguration
+# $ git log --oneline  --no-merges v6.6.34.. ^mainline/linux-6.6.y ^NXP/lf-6.6.y
+# - 3fb57e773e55 tty: vt: conmakehash: Don't mention the full path of the input in output
+# - d1198b88bc1b Revert "dmaengine: fsl-edma: add address for channel mux register in fsl_edma_chan"
+# - 717fee4a9cf7 Revert "dmaengine: fsl-edma: add i.MX8ULP edma support"
+# - 74ef72069927 Revert "dmaengine: fsl-edma: clean up unused "fsl,imx8qm-adma" compatible string"
+# - b54c6ea17058 Revert "dmaengine: fsl-edma: change the memory access from local into remote mode in i.MX 8QM"
 #
 # NOTE to upgraders:
 # This recipe should NOT collect individual patches, they should be applied to
@@ -59,16 +54,16 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 
 require linux-imx.inc
 
-KBRANCH = "6.6-2.0.x-imx"
+KBRANCH = "6.6-2.1.x-imx"
 SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
-SRCREV = "d023c381fa6161a7af966abaad8e7d9a997f07e7"
+SRCREV = "096cd0432b03805f49c86684dafb9ced4511a714"
 
 # 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.6.51"
+LINUX_VERSION = "6.6.54"
 
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"
diff --git a/recipes-kernel/linux/linux-fslc_6.11.bb b/recipes-kernel/linux/linux-fslc_6.11.bb
index cf4c117b..096b6073 100644
--- a/recipes-kernel/linux/linux-fslc_6.11.bb
+++ b/recipes-kernel/linux/linux-fslc_6.11.bb
@@ -23,10 +23,10 @@ DEPENDS += " \
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "6.11.0"
+LINUX_VERSION = "6.11.3"
 
 KBRANCH = "6.11.x+fslc"
-SRCREV = "98f7e32f20d28ec452afb208f9cffc08448a2652"
+SRCREV = "790cfd90a14be7128ae807702026273905a2f631"
 
 KBUILD_DEFCONFIG:mx5-generic-bsp = "imx_v6_v7_defconfig"
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v6_v7_defconfig"
diff --git a/recipes-security/optee-imx/optee-client_4.2.0.imx.bb b/recipes-security/optee-imx/optee-client_4.2.0.imx.bb
index 64b49b75..59f8c84d 100644
--- a/recipes-security/optee-imx/optee-client_4.2.0.imx.bb
+++ b/recipes-security/optee-imx/optee-client_4.2.0.imx.bb
@@ -1,6 +1,6 @@
 require optee-client-fslc-imx.inc
 
-SRCBRANCH = "lf-6.6.23_2.0.0"
+SRCBRANCH = "lf-6.6.36_2.1.0"
 SRCREV = "3eac340a781c00ccd61b151b0e9c22a8c6e9f9f0" 
 
 DEPENDS += "util-linux"
diff --git a/recipes-security/optee-imx/optee-os_4.2.0.imx.bb b/recipes-security/optee-imx/optee-os_4.2.0.imx.bb
index 96948bc7..ada545a6 100644
--- a/recipes-security/optee-imx/optee-os_4.2.0.imx.bb
+++ b/recipes-security/optee-imx/optee-os_4.2.0.imx.bb
@@ -8,5 +8,5 @@ SRC_URI += " \
     file://0003-arm32-libutils-libutee-ta-add-.note.GNU-stack-sectio.patch \
     file://0004-core-link-add-no-warn-rwx-segments.patch \
 "
-SRCBRANCH = "lf-6.6.23_2.0.0"
-SRCREV = "c6be5b572452a2808d1a34588fd10e71715e23cf"
+SRCBRANCH = "lf-6.6.36_2.1.0"
+SRCREV = "612bc5a642a4608d282abeee2349d86de996d7ee"
diff --git a/recipes-security/optee-imx/optee-test_4.2.0.imx.bb b/recipes-security/optee-imx/optee-test_4.2.0.imx.bb
index aa8444fb..e2cf40e9 100644
--- a/recipes-security/optee-imx/optee-test_4.2.0.imx.bb
+++ b/recipes-security/optee-imx/optee-test_4.2.0.imx.bb
@@ -4,7 +4,7 @@ require optee-test-fslc.inc
 
 SRC_URI = "git://github.com/nxp-imx/imx-optee-test.git;protocol=https;branch=${SRCBRANCH}"
 
-SRCBRANCH = "lf-6.6.23_2.0.0"
-SRCREV = "07682f1b1b41ec0bfa507286979b36ab8d344a96"
+SRCBRANCH = "lf-6.6.36_2.1.0"
+SRCREV = "5b52b48a73b4cc3f228ec66ae6cf9920897bb2e6"
 
 COMPATIBLE_MACHINE = "(imx-nxp-bsp)"