linux-fslc-imx: Upgrade to 6.1-1.0.x-imx

Upgrade the kernel to 6.1-1.0.x-imx based on NXP lf-6.1.y and
mainline stable linux-6.1.y.

Stable version: 6.1.24

Actualize defconfig.

Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>

3 files changed, 18 insertions, 16 deletions

diff --git a/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig b/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig
index 1ef259ee..2afe735a 100644
--- a/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx/mx8-nxp-bsp/defconfig
@@ -545,12 +545,12 @@ CONFIG_MEDIA_PLATFORM_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_MXC_CAPTURE=y
+CONFIG_VIDEO_MXC_CAPTURE=m
 CONFIG_VIDEO_MX8_CAPTURE=y
-CONFIG_VIDEO_MXC_CSI_CAMERA=y
-CONFIG_MXC_MIPI_CSI=y
+CONFIG_VIDEO_MXC_CSI_CAMERA=m
+CONFIG_MXC_MIPI_CSI=m
 CONFIG_DWC_MIPI_CSI2_HOST=y
-CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y
+CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_IMX8_JPEG=m
 CONFIG_VIDEO_AMPHION_VPU=y
@@ -856,6 +856,7 @@ CONFIG_STAGING_MEDIA=y
 CONFIG_VIDEO_HANTRO=m
 CONFIG_VIDEO_IMX_CAPTURE=y
 CONFIG_IMX8_MEDIA_DEVICE=m
+CONFIG_IMX8_MIPI_CSI2_YAV=m
 CONFIG_MHDP_HDMIRX=y
 CONFIG_MHDP_HDMIRX_CEC=y
 CONFIG_FSL_DPAA2=y
diff --git a/recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig b/recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig
index 1ef259ee..2afe735a 100644
--- a/recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx/mx9-nxp-bsp/defconfig
@@ -545,12 +545,12 @@ CONFIG_MEDIA_PLATFORM_SUPPORT=y
 CONFIG_MEDIA_USB_SUPPORT=y
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_VIDEO_MXC_CAPTURE=y
+CONFIG_VIDEO_MXC_CAPTURE=m
 CONFIG_VIDEO_MX8_CAPTURE=y
-CONFIG_VIDEO_MXC_CSI_CAMERA=y
-CONFIG_MXC_MIPI_CSI=y
+CONFIG_VIDEO_MXC_CSI_CAMERA=m
+CONFIG_MXC_MIPI_CSI=m
 CONFIG_DWC_MIPI_CSI2_HOST=y
-CONFIG_MXC_CAMERA_OV5640_MIPI_V2=y
+CONFIG_MXC_CAMERA_OV5640_MIPI_V2=m
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_IMX8_JPEG=m
 CONFIG_VIDEO_AMPHION_VPU=y
@@ -856,6 +856,7 @@ CONFIG_STAGING_MEDIA=y
 CONFIG_VIDEO_HANTRO=m
 CONFIG_VIDEO_IMX_CAPTURE=y
 CONFIG_IMX8_MEDIA_DEVICE=m
+CONFIG_IMX8_MIPI_CSI2_YAV=m
 CONFIG_MHDP_HDMIRX=y
 CONFIG_MHDP_HDMIRX_CEC=y
 CONFIG_FSL_DPAA2=y
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.15.bb b/recipes-kernel/linux/linux-fslc-imx_6.1.bb
index bddac40c..8e8b5424 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_6.1.bb
@@ -12,8 +12,8 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 ###############################################################################
 # This recipe (and corresponding kernel repository and branch) receives updates
 # from 3 different sources:
-# 1. Stable [linux-5.15.y] branch updates of korg;
-# 2. NXP-specific updates via branch [5.10-2.1.x-imx] shared via CodeAurora forum;
+# 1. Stable [linux-6.1.y] branch updates of korg;
+# 2. NXP-specific updates via branch [lf-6.1.y] shared via GitHub NXP repo;
 # 3. Critical patches, which are not (yet) integrated into either of 2 above
 #    sources, but are required to be applied to the kernel tree.
 #
@@ -28,12 +28,12 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 1. Stable (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: v5.15.87
+#    tag: v6.1.24
 #
 # ------------------------------------------------------------------------------
 # 2. NXP-specific (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: lf-5.15.71-2.2.0
+#    tag: lf-6.1.1-1.0.0
 #
 # ------------------------------------------------------------------------------
 # 3. Critical patches (SHA(s))
@@ -50,18 +50,18 @@ include linux-fslc.inc
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
-KBRANCH = "5.15-2.2.x-imx"
-SRCREV = "0eb4504bd3b8fd125e83ec62da9ba039519f96c8"
+KBRANCH = "6.1-1.0.x-imx"
+SRCREV = "897d73a656fe33d0c4549c5de1d07797f99d6871"
 
 # 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 = "5.15.87"
+LINUX_VERSION = "6.1.24"
 
 # Local version indicates the branch name in the NXP kernel tree where patches are collected from.
-LOCALVERSION = "-5.15.87-2.2.0"
+LOCALVERSION = "-6.1.24-1.0.0"
 
 DEFAULT_PREFERENCE = "1"