Merge pull request #2920 from mdrodrigo/linux-imx-inmate-dtb

Linux imx inmate dtb

4 files changed, 24 insertions, 16 deletions

diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
index 8a80cfd61..f16f144ec 100644
--- a/conf/machine/imx8mp-lpddr4-evk.conf
+++ b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -24,7 +24,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/imx8mp-evk-ecspi-slave.dtb \
     freescale/imx8mp-evk-flexcan2.dtb \
     freescale/imx8mp-evk-hifiberry-dacplus.dtb \
-    freescale/imx8mp-evk-inmate.dtb \
+    freescale/imx8mp-jailhouse-inmate.dtb \
     freescale/imx8mp-evk-iqaudio-dacplus.dtb \
     freescale/imx8mp-evk-iqaudio-dacpro.dtb \
     freescale/imx8mp-evk-it6263-lvds-dual-channel.dtb \
diff --git a/conf/machine/imx93-11x11-lpddr4x-evk.conf b/conf/machine/imx93-11x11-lpddr4x-evk.conf
index ea7f84d94..b4a3ee2da 100644
--- a/conf/machine/imx93-11x11-lpddr4x-evk.conf
+++ b/conf/machine/imx93-11x11-lpddr4x-evk.conf
@@ -15,7 +15,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     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/imx93-jailhouse-inmate.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-iw612-otbr.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ld.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lpuart.dtb \
diff --git a/conf/machine/imx95-19x19-verdin.conf b/conf/machine/imx95-19x19-verdin.conf
index 3264324bb..d08acb11e 100644
--- a/conf/machine/imx95-19x19-verdin.conf
+++ b/conf/machine/imx95-19x19-verdin.conf
@@ -22,7 +22,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-adv7535-ap1302.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ap1302.dtbo \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
+    freescale/imx95-jailhouse-inmate.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912.dtbo \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lt8912-ap1302.dtb \
diff --git a/recipes-kernel/linux/linux-fslc-imx_6.18.bb b/recipes-kernel/linux/linux-fslc-imx_6.18.bb
index 0aef04565..11ae0b025 100644
--- a/recipes-kernel/linux/linux-fslc-imx_6.18.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.18.bb
@@ -30,12 +30,12 @@ SECTION = "kernel"
 # ------------------------------------------------------------------------------
 # 1. Stable (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: v6.18.24
+#    tag: v6.18.56
 #
 # ------------------------------------------------------------------------------
 # 2. NXP-specific (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: lf-6.18-1.0.x-imx
+#    tag: lf-6.18.37-2.1.0
 #
 # ------------------------------------------------------------------------------
 # 3. Critical patches (SHA(s))
@@ -44,14 +44,22 @@ SECTION = "kernel"
 # conflicts, prioritizing NXP BSP source code as the latest vendor updates.
 # Additional commits may exist to better acommodate yocto builds.
 #
-# $ git log --oneline  --no-merges v6.18.24.. ^mainline/linux-6.18.y ^NXP/lf-6.18.y
-# - 6e811374f6340 drm/imx: lcdifv3: Fix videomode settings
-# - 40b594773feaf drm: of: Fix build without CONFIG_OF
-# - 40d5cc16c304a arm64: dts: imx8mm-evk-qca-wifi: enable support for bluetooth
-# - eff109d884f3b gpu: drm: cadence: select hdmi helper
-# - ddfe8741dab43 of: enable using OF_DYNAMIC without OF_UNITTEST
-# - 1b982f1a29bbc arm64: dts: imx8mq: drop cpu-idle-states
-# - de4b96e987407 hwrng: optee: support generic crypto
+# $ git log --oneline  --no-merges v6.18.56.. ^mainline/linux-6.18.y ^NXP/lf-6.18.y
+# - ecf00fd8280f3 Remove imx7d_src_init function
+# - e351e675ed4fd arm64: dts: imx8mp: align dts for Olimex with NXP's rename of gpu labels
+# - a42563621d1d1 media: imx8-isi: add RAW Bayer and grayscale pixel formats
+# - 4ae13bfc6ca2c media: imx8-isi: fix source format negotiation
+# - ff80ed1598c4a media: imx8mp-csi: clear GASKET data type before updating format
+# - e41fea806a2e9 arm64: dts: imx8mp: CANbus transciever control for Olimex
+# - 5c928f76b2998 arm64: dts: imx8mp: Fix Olimex EVK/SOM CSI pins
+# - 28ecd525460cd imx8mp-olimex.dts: Olimex iMX8MP-SOM-EVB-IND
+# - 799b8cdc006e4 drm/imx: lcdifv3: Fix videomode settings
+# - e8d7910da8fac drm: of: Fix build without CONFIG_OF
+# - 900dbbfc0d8d8 arm64: dts: imx8mm-evk-qca-wifi: enable support for bluetooth
+# - b94dd9478717e gpu: drm: cadence: select hdmi helper
+# - 7f6f66990e131 of: enable using OF_DYNAMIC without OF_UNITTEST
+# - 0e87674352943 arm64: dts: imx8mq: drop cpu-idle-states
+# - 0190cfd1945a8 hwrng: optee: support generic crypto
 
 #
 # NOTE to upgraders:
@@ -62,16 +70,16 @@ SECTION = "kernel"
 
 require linux-imx.inc
 
-KBRANCH = "6.18-1.0.x-imx"
+KBRANCH = "6.18-2.1.x-imx"
 SRC_URI = "git://github.com/Freescale/linux-fslc.git;branch=${KBRANCH};protocol=https"
-SRCREV = "1d08c2fc5b376a84a3e7092651289fb8e8ffc1af"
+SRCREV = "4ce72be4ed55a5d6e1beba28d07078fa13742389"
 
 # 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.18.24"
+LINUX_VERSION = "6.18.56"
 
 KBUILD_DEFCONFIG:mx6-generic-bsp = "imx_v7_defconfig"
 KBUILD_DEFCONFIG:mx7-generic-bsp = "imx_v7_defconfig"