linux-fslc-imx: upgrade to rel_imx_5.4.70_2.3.0 from NXP

Kernel repository has a new branch introduced, which is based on NXP
release 5.4.70-2.3.0 and has latest stable patchlevel applied to it.

Current version of up-merged kernel is 5.4.92.

Update kernel recipe to include new kernel version and align kernel
config files based on following NXP configurations:
- imx_v8_defconfig used for i.MX8 family
- i.MX6/7 families kernel config file did not require any additional sync,
  it matches to the imx_v7_defconfig

Tracking information in recipe is updated to include new branch, tag and
cherry-picks from NXP branch, together with patches applied from various
sources.

Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>

2 files changed, 50 insertions, 60 deletions

diff --git a/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig b/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig
index 4e7d4a9f..dbe4597f 100644
--- a/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig
+++ b/recipes-kernel/linux/linux-fslc-imx/mx8/defconfig
@@ -188,6 +188,7 @@ CONFIG_PCIE_LAYERSCAPE_GEN4=y
 CONFIG_PCI_ENDPOINT=y
 CONFIG_PCI_ENDPOINT_CONFIGFS=y
 CONFIG_PCI_EPF_TEST=y
+CONFIG_IMX_MIC_EPF=m
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_FW_LOADER_USER_HELPER=y
@@ -227,6 +228,13 @@ CONFIG_SRAM=y
 CONFIG_PCI_ENDPOINT_TEST=y
 CONFIG_EEPROM_AT24=y
 CONFIG_EEPROM_AT25=m
+CONFIG_SCIF_BUS=m
+CONFIG_VOP_BUS=m
+CONFIG_IMX_MIC_HOST=m
+CONFIG_IMX_MIC_CARD=m
+CONFIG_SCIF=m
+CONFIG_MIC_COSM=m
+CONFIG_VOP=m
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_SAS_ATA=y
@@ -267,7 +275,6 @@ CONFIG_FSL_SDK_DPAA_ETH=y
 CONFIG_FSL_DPAA2_ETH=y
 CONFIG_FSL_ENETC=y
 CONFIG_FSL_ENETC_VF=y
-CONFIG_FSL_ENETC_MDIO=y
 CONFIG_HIX5HD2_GMAC=y
 CONFIG_HNS_DSAF=y
 CONFIG_HNS_ENET=y
@@ -328,6 +335,7 @@ CONFIG_KEYBOARD_IMX_SC_PWRKEY=y
 CONFIG_KEYBOARD_CROS_EC=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C=m
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MPL3115=y
@@ -501,8 +509,9 @@ CONFIG_DRM_RCAR_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=y
 CONFIG_DRM_PANEL_RAYDIUM_RM67191=y
 CONFIG_DRM_PANEL_SEIKO_43WVF1G=y
-CONFIG_DRM_NXP_SEIKO_43WVFIG=y
+CONFIG_DRM_PANEL_WKS_101WX001=y
 CONFIG_DRM_FSL_IMX_LVDS_BRIDGE=y
+CONFIG_DRM_NXP_SEIKO_43WVFIG=y
 CONFIG_DRM_SII902X=m
 CONFIG_DRM_I2C_ADV7511=y
 CONFIG_DRM_NWL_MIPI_DSI=y
@@ -521,8 +530,8 @@ CONFIG_DRM_IMX8QXP_LDB=y
 CONFIG_DRM_IMX8MP_LDB=y
 CONFIG_DRM_IMX_HDMI=y
 CONFIG_DRM_IMX_SEC_DSIM=y
-CONFIG_DRM_IMX_CDNS_MHDP=y
 CONFIG_DRM_IMX_DCSS=y
+CONFIG_DRM_IMX_CDNS_MHDP=y
 CONFIG_DRM_ETNAVIV=m
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_HISI_KIRIN=m
@@ -543,7 +552,6 @@ CONFIG_SND=y
 CONFIG_SND_DYNAMIC_MINORS=y
 CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_SOC=y
-CONFIG_SND_SOC_FSL_DAI=m
 CONFIG_SND_SOC_FSL_EASRC=y
 CONFIG_SND_IMX_SOC=y
 CONFIG_SND_SOC_IMX_AK4458=y
@@ -561,6 +569,7 @@ CONFIG_SND_SOC_IMX_PDM_MIC=y
 CONFIG_SND_SOC_IMX_DSP=y
 CONFIG_SND_SOC_IMX_CDNHDMI=y
 CONFIG_SND_SOC_IMX_XCVR=y
+CONFIG_SND_SOC_IMX_PCM512X=y
 CONFIG_SND_SOC_SOF_TOPLEVEL=y
 CONFIG_SND_SOC_SOF_OF=m
 CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y
@@ -711,6 +720,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=y
 CONFIG_STAGING=y
 CONFIG_STAGING_MEDIA=y
 CONFIG_VIDEO_IMX_CAPTURE=y
+CONFIG_IMX8_MEDIA_DEVICE=m
 CONFIG_ION=y
 CONFIG_ION_SYSTEM_HEAP=y
 CONFIG_ION_CMA_HEAP=y
@@ -818,12 +828,14 @@ CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
 CONFIG_CRYPTO_ECHAINIV=y
 CONFIG_CRYPTO_TLS=m
-CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_CFB=m
 CONFIG_CRYPTO_CTS=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=m
 CONFIG_CRYPTO_RMD128=m
@@ -831,33 +843,28 @@ CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_STREEBOG=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
 CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_ANSI_CPRNG=y
+CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
 CONFIG_CRYPTO_DEV_FSL_CAAM=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y
 CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=m
-CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y
 CONFIG_CRYPTO_DEV_FSL_DPAA2_CAAM=y
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-CONFIG_CRYPTO_SM3=m
-CONFIG_CRYPTO_STREEBOG=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_DES=y
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_TEA=m
 CONFIG_INDIRECT_PIO=y
 CONFIG_CMA_SIZE_MBYTES=320
 CONFIG_PRINTK_TIME=y
@@ -872,12 +879,3 @@ CONFIG_MEMTEST=y
 CONFIG_CORESIGHT=y
 CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
 CONFIG_CORESIGHT_SOURCE_ETM4X=y
-CONFIG_IMX8_MEDIA_DEVICE=m
-CONFIG_IMX8_ISI_HW=y
-CONFIG_IMX8_ISI_CORE=y
-CONFIG_IMX8_ISI_CAPTURE=y
-CONFIG_IMX8_ISI_M2M=y
-CONFIG_IMX8_MIPI_CSI2=y
-CONFIG_IMX8_MIPI_CSI2_SAM=y
-CONFIG_IMX8_PARALLEL_CSI=y
-CONFIG_GMSL_MAX9286=y
diff --git a/recipes-kernel/linux/linux-fslc-imx_5.4.bb b/recipes-kernel/linux/linux-fslc-imx_5.4.bb
index 535b41b9..193c5d1b 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.4.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.4.bb
@@ -33,39 +33,31 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 2. NXP-specific (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: rel_imx_5.4.47_2.2.0
-#
-#    5ec03d06f54e MLK-24836 ARM: imx: Refresh wdog should consider the CMD mode on i.MX7ULP
-#    bba6ff64f0df MLK-24824-3 ARM: imx: Refresh wdog1 to make sure it is NOT timeout before disabled
-#    bad81140da7c MLK-24828 ARM: imx: Add revision support for i.MX7ULP rev 2.2
-#    99fb4d4619ff MLK-24824-2 watchdog: imx7ulp: Move suspend/resume to noirq phase
-#    8c8859e1c5b5 MLK-24824-1 watchdog: imx7ulp: Strictly follow the sequence for wdog operations
+#    tag: rel_imx_5.4.70_2.3.0
 #
 # ------------------------------------------------------------------------------
 # 3. Critical patches (SHA(s))
 # ------------------------------------------------------------------------------
-#    7642303e41c1 irq-imx-irqsteer: fix compile error if CONFIG_PM_SLEEP is not set
-#    b3d088d2f8fa fbdev: fix fbinfo flag dropped upstream
-#    c874333fa0be arm64: dts: imx8mp: Add fallback compatible to ocotp node
-#    55abb34c9faf arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs
-#    df1f59fb613e arm64: dts: imx8mn: Use "fsl,imx8mm-ocotp" as ocotp's fallback compatible
-#    7ad2a7f3fd6f arm64: dts: imx8mm: Remove incorrect fallback compatible for ocotp
-#    129a6fad43b8 arm: imx: include i.MX6SX DDR freq implementation for i.MX6UL
-#    e85ce3157725 arm: imx: do not include smp_wfe_imx6.S for i.MX6SX
-#    4f49200132e6 arm: imx: enable HAVE_IMX_BUSFREQ for i.MX6
-#    5d229c51b5a5 arm: imx: do not build busfreq without HAVE_IMX_BUSFREQ
-#    285869ec9087 ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation
-#    f03791085754 ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes
-#    67e44952c670 ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path'
-#    d4b105f930e2 ARM: dts: Add support for two more Kontron evalkit boards 'N6311 S' and 'N6411 S'
-#    e778467f65d0 ARM: dts: imx6ul-kontron-n6310-s: Move common nodes to a separate file
-#    8b39f5e53831 ARM: dts: Add support for two more Kontron SoMs N6311 and N6411
-#    3bee262233eb ARM: dts: imx6ul-kontron-n6310: Move common SoM nodes to a separate file
-#    40a6a98b3f38 ARM: imx: Fix boot crash if ocotp is not found
-#    8aad5031be00 ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs
-#    564409aa3b33 soc: imx-scu: Using existing serial_number instead of UID
-#    0ee8e005bbfc soc: imx8: Using existing serial_number instead of UID
-#    134cbb845fc7 ARM: imx: Add serial number support for i.MX6/7 SoCs
+#    b598b85172f7 irq-imx-irqsteer: fix compile error if CONFIG_PM_SLEEP is not set
+#    845099bfd0b8 fbdev: fix fbinfo flag dropped upstream
+#    847bfb09bb3b arm64: dts: imx8m: change ocotp node name on i.MX8M SoCs
+#    d7ca6973c6d4 arm64: dts: imx8mm: Remove incorrect fallback compatible for ocotp
+#    539d19f12066 arm: imx: include i.MX6SX DDR freq implementation for i.MX6UL
+#    169b71ce3f8a arm: imx: do not include smp_wfe_imx6.S for i.MX6SX
+#    60be4c625594 arm: imx: enable HAVE_IMX_BUSFREQ for i.MX6
+#    f393781fa575 arm: imx: do not build busfreq without HAVE_IMX_BUSFREQ
+#    e0e74faf6af4 ARM: dts: imx6ul-kontron-n6x1x-s: Remove an obsolete comment and fix indentation
+#    ad24781aecc3 ARM: dts: imx6ul-kontron-n6x1x-s: Add vbus-supply and overcurrent polarity to usb nodes
+#    d56aa09ed0e0 ARM: dts: imx6ul-kontron-n6x1x: Add 'chosen' node with 'stdout-path'
+#    923bc9e57b24 ARM: dts: Add support for two more Kontron evalkit boards 'N6311 S' and 'N6411 S'
+#    f952a6404d10 ARM: dts: imx6ul-kontron-n6310-s: Move common nodes to a separate file
+#    1fdb6565a632 ARM: dts: Add support for two more Kontron SoMs N6311 and N6411
+#    4fb833f01c30 ARM: dts: imx6ul-kontron-n6310: Move common SoM nodes to a separate file
+#    54c975dabcde ARM: imx: Fix boot crash if ocotp is not found
+#    1041cd02b33c ARM: imx: Correct ocotp id for serial number support of i.MX6ULL/ULZ SoCs
+#    974b100d789c soc: imx-scu: Using existing serial_number instead of UID
+#    6fbfed9afe99 soc: imx8: Using existing serial_number instead of UID
+#    64d8ea803af5 ARM: imx: Add serial number support for i.MX6/7 SoCs
 #
 # NOTE to upgraders:
 # This recipe should NOT collect individual patches, they should be applied to
@@ -78,8 +70,8 @@ include linux-fslc.inc
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
 
-SRCBRANCH = "5.4-2.2.x-imx"
-SRCREV = "9335a2fd4a7f8f789838c5198ca6da5944c44fa5"
+SRCBRANCH = "5.4-2.3.x-imx"
+SRCREV = "2d26ac7ea809b04c354b4ea966f44e4f6a480f00"
 
 # PV is defined in the base in linux-imx.inc file and uses the LINUX_VERSION definition
 # required by kernel-yocto.bbclass.
@@ -89,7 +81,7 @@ SRCREV = "9335a2fd4a7f8f789838c5198ca6da5944c44fa5"
 LINUX_VERSION = "5.4.92"
 
 # Local version indicates the branch name in the NXP kernel tree where patches are collected from.
-LOCALVERSION = "-imx-5.4.47-2.2.0"
+LOCALVERSION = "-imx-5.4.70-2.3.0"
 
 DEFAULT_PREFERENCE = "1"