Merge pull request #2455 from nxp-upstream/Update-kernel-DTs-base-on-6.12.49-2.2.0

Update kernel dts base on 6.12.49 2.2.0

8 files changed, 9 insertions, 7 deletions

diff --git a/conf/machine/imx8mm-lpddr4-evk.conf b/conf/machine/imx8mm-lpddr4-evk.conf
index 1387e594b..e21d8bf89 100644
--- a/conf/machine/imx8mm-lpddr4-evk.conf
+++ b/conf/machine/imx8mm-lpddr4-evk.conf
@@ -23,7 +23,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-wm8524.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-wm8524-lpv.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \
 "
 
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
index cc461a1aa..17adba763 100644
--- a/conf/machine/imx8mp-lpddr4-evk.conf
+++ b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -40,7 +40,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/imx8mp-evk-rm67199.dtb \
     freescale/imx8mp-evk-root.dtb \
     freescale/imx8mp-evk-rpmsg.dtb \
-    freescale/imx8mp-evk-rpmsg-lpv.dtb \
     freescale/imx8mp-evk-sof-pdm.dtb \
     freescale/imx8mp-evk-sof-wm8960.dtb \
     freescale/imx8mp-evk-spdif-lb.dtb \
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index 56ede4326..fa4974761 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -39,7 +39,7 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-enet2-tja1100.dtb \
     freescale/imx8qm-mek-hdmi.dtb \
     freescale/imx8qm-mek-hdmi-rx.dtb \
-    freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \
+    freescale/imx8qm-mek-hdmi-rx.dtbo \
     freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
     freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \
     freescale/imx8qm-mek-pcie-ep.dtb \
@@ -59,6 +59,7 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-revd.dtb \
     freescale/imx8qm-mek-revd-enet2-tja1100.dtb \
     freescale/imx8qm-mek-revd-hdmi.dtb \
+    freescale/imx8qm-mek-revd-hdmi-rx.dtb \
     freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel.dtb \
     freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel-rpmsg.dtb \
     freescale/imx8qm-mek-revd-max9286-csi0.dtb \
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
index 6763c985e..8da1177bb 100644
--- a/conf/machine/imx8qxp-mek.conf
+++ b/conf/machine/imx8qxp-mek.conf
@@ -26,6 +26,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8960.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof-wm8962.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-max9286.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-max9286-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual.dtb \
diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf
index 553c25430..ea7f84d94 100644
--- a/conf/machine/imx93-11x11-lpddr4x-evk.conf
+++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf
@@ -24,6 +24,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-reve.dtb \
  "
 
 UBOOT_CONFIG_BASENAME = "imx93_11x11_evk"
diff --git a/conf/machine/imx93-14x14-lpddr4x-evk.conf b/conf/machine/imx93-14x14-lpddr4x-evk.conf
index dff843a79..3cb50f282 100644
--- a/conf/machine/imx93-14x14-lpddr4x-evk.conf
+++ b/conf/machine/imx93-14x14-lpddr4x-evk.conf
@@ -18,6 +18,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sja1105.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-tja1103.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-8mic-reve.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx93_14x14_evk"
diff --git a/recipes-kernel/linux/linux-imx-headers_6.12.bb b/recipes-kernel/linux/linux-imx-headers_6.12.bb
index 7135565c9..c063a7ae1 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-2025 NXP
+# Copyright 2017-2026 NXP
 # Released under the MIT license (see COPYING.MIT for the terms)
 
 SUMMARY = "Installs i.MX-specific kernel headers"
@@ -11,7 +11,7 @@ SRC_URI = " \
     git://github.com/nxp-imx/linux-imx.git;protocol=https;branch=${SRCBRANCH} \
 "
 SRCBRANCH = "lf-6.12.y"
-LOCALVERSION = "-lts-${SRCBRANCH}"
+LOCALVERSION = "-6.12.49-2.2.0"
 SRCREV = "df24f9428e38740256a410b983003a478e72a7c0"
 
 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 6eaed356a..c34f3f86b 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-2025 (C) NXP
+# Copyright 2017-2026 (C) NXP
 # Copyright 2018 (C) O.S. Systems Software LTDA.
 # Released under the MIT license (see COPYING.MIT for the terms)
 #
@@ -13,7 +13,7 @@ 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.20-2.0.0"
+LOCALVERSION = "-6.12.49-2.2.0"
 SRCREV = "df24f9428e38740256a410b983003a478e72a7c0"
 
 # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition