From 0b69b79c099f42e926dd3b20a37dcdca0aa3f653 Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Fri, 30 Dec 2022 09:45:23 -0700
Subject: linux-imx: Upgrade 5.15.52 -> 5.15.71

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit e40a20c1cb045db4b0c83bc7a7cee9654cc80807)
---
 recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig | 7 +++++++
 recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig | 8 +++-----
 recipes-kernel/linux/linux-imx_5.15.bb               | 6 +++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig b/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig
index 582625f2..be46db23 100644
--- a/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig
+++ b/recipes-kernel/linux/linux-imx/imx-nxp-bsp/defconfig
@@ -586,3 +586,10 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 # enable KTLS
 CONFIG_TLS=y
 CONFIG_TLS_DEVICE=y
+
+#enable trust based hardware key
+CONFIG_TRUSTED_KEYS=m
+CONFIG_TRUSTED_KEYS_TPM=n
+CONFIG_TRUSTED_KEYS_TEE=n
+CONFIG_TRUSTED_KEYS_CAAM=n
+CONFIG_TRUSTED_KEYS_DCP=y
diff --git a/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig b/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig
index 1ef259ee..97dc633d 100644
--- a/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig
+++ b/recipes-kernel/linux/linux-imx/mx8-nxp-bsp/defconfig
@@ -558,6 +558,7 @@ CONFIG_SDR_PLATFORM_DRIVERS=y
 CONFIG_VIDEO_IMX219=m
 CONFIG_VIDEO_OV5640=y
 CONFIG_VIDEO_OV5645=m
+CONFIG_VIDEO_MT9M114=y
 CONFIG_VIDEO_AP1302=y
 CONFIG_IMX_DPU_CORE=y
 CONFIG_IMX_LCDIF_CORE=y
@@ -572,6 +573,7 @@ CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_PANEL_MANTIX_MLAF057WE51=m
+CONFIG_DRM_PANEL_ONTAT_KD50G21_40NT_A1=y
 CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
 CONFIG_DRM_PANEL_RAYDIUM_RM68200=y
 CONFIG_DRM_PANEL_ROCKTECK_HIMAX8394F=y
@@ -611,6 +613,7 @@ CONFIG_DRM_IMX8QM_LDB=y
 CONFIG_DRM_IMX8QXP_LDB=y
 CONFIG_DRM_IMX8MP_LDB=y
 CONFIG_DRM_IMX93_LDB=y
+CONFIG_DRM_IMX93_PARALLEL_DISPLAY_FORMAT=y
 CONFIG_DRM_IMX_DW_MIPI_DSI=y
 CONFIG_DRM_IMX_HDMI=y
 CONFIG_DRM_IMX_SEC_DSIM=y
@@ -903,8 +906,6 @@ CONFIG_FSL_MC_DPIO=y
 CONFIG_FSL_RCPM=y
 CONFIG_FSL_QIXIS=y
 CONFIG_SOC_TI=y
-CONFIG_ARM_IMX_BUS_DEVFREQ=m
-CONFIG_ARM_IMX8M_DDRC_DEVFREQ=m
 CONFIG_EXTCON_PTN5150=m
 CONFIG_EXTCON_USB_GPIO=y
 CONFIG_EXTCON_USBC_CROS_EC=y
@@ -963,9 +964,6 @@ CONFIG_TEE=y
 CONFIG_OPTEE=y
 CONFIG_MUX_MMIO=y
 CONFIG_SLIM_QCOM_CTRL=m
-CONFIG_INTERCONNECT=y
-CONFIG_INTERCONNECT_IMX=m
-CONFIG_INTERCONNECT_IMX8MQ=m
 CONFIG_MXC_SIM=y
 CONFIG_MXC_EMVSIM=y
 CONFIG_EXT2_FS=y
diff --git a/recipes-kernel/linux/linux-imx_5.15.bb b/recipes-kernel/linux/linux-imx_5.15.bb
index 17c83032..b3c7a7fc 100644
--- a/recipes-kernel/linux/linux-imx_5.15.bb
+++ b/recipes-kernel/linux/linux-imx_5.15.bb
@@ -24,15 +24,15 @@ DEPENDS += "lzop-native bc-native"
 # | arch/arm/configs/imx_v7_defconfig   | linux-imx/imx-nxp-bsp/defconfig |
 # | arch/arm64/configs/imx_v8_defconfig | linux-imx/mx8-nxp-bsp/defconfig |
 SRCBRANCH = "lf-5.15.y"
-LOCALVERSION = "-5.15.52-2.1.0"
-SRCREV = "36363d8623ba60858e2632b7d2b70dae932c9a8b"
+LOCALVERSION = "-5.15.71-2.2.0"
+SRCREV = "3313732e9984cb8a6b10a9085c7e18d58e770d56"
 
 # 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.52"
+LINUX_VERSION = "5.15.71"
 
 DEFAULT_PREFERENCE = "1"
 
-- 
cgit v1.2.3-54-g00ecf