Merge pull request #890 from zandrey/kernel-update-master

Consolidated Kernel update (v5.10.74 + 5.14.13)

3 files changed, 20 insertions, 7 deletions

diff --git a/recipes-kernel/linux/linux-fslc-imx_5.10.bb b/recipes-kernel/linux/linux-fslc-imx_5.10.bb
index 66fcbd6b..799cf4e5 100644
--- a/recipes-kernel/linux/linux-fslc-imx_5.10.bb
+++ b/recipes-kernel/linux/linux-fslc-imx_5.10.bb
@@ -28,7 +28,7 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 1. Stable (tag or SHA(s))
 # ------------------------------------------------------------------------------
-#    tag: v5.10.69
+#    tag: v5.10.74
 #
 # ------------------------------------------------------------------------------
 # 2. NXP-specific (tag or SHA(s))
@@ -38,6 +38,19 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
 # ------------------------------------------------------------------------------
 # 3. Critical patches (SHA(s))
 # ------------------------------------------------------------------------------
+#    8b20421b2b61 ("staging: fsl_ppfe: reduce MAC address filtering loglevel to debug")
+#    16ea8f2ab906 ("staging: fsl_ppfe: assign correct OF nodes to individual ports")
+#    9d0f521803cd ("staging: fsl_ppfe: handle all RGMII modes in pfe_eth_adjust_link")
+#    9d957f4a4a32 ("PCI: dwc: PCI_IMX6 must depend on PCIE_DW")
+#    983b1aa2a2ea ("usb: chipidea: fix missing chipidea.h include")
+#    bacde482ab6f ("ARM: imx: select MAILBOX with IMX_MBOX")
+#    5fd63d48755a ("gpu: drm: allow enabling DRM_IMX on Layerscape SoCs")
+#    b06df4cec270 ("ARM: dts: imx7s: revert LCDIF AXI clock to IMX7D_LCDIF_PIXEL_ROOT_CLK")
+#    bdf733608e50 ("ARM: imx: add missing debug_ll_io_init to i.MX6UL map_io")
+#    302f8a6d262a ("i2c: imx: remove unneeded libata include")
+#    107dc9bc6283 ("i2c: imx: fix lockdep issue")
+#    681f2d40b114 ("i2c: imx: avoid taking clk_prepare mutex in PM callbacks (again)")
+#    351c82388784 ("arch/arm64/boot/dts/freescale: fix file permissions on dts files")
 #    fb3e7593ee84 ("irq-imx-irqsteer: fix compile error if CONFIG_PM_SLEEP is not set")
 #    96613ac4e960 ("arm: imx: include i.MX6SX DDR freq implementation for i.MX6UL")
 #    36fea22d04f4 ("arm: imx: do not include smp_wfe_imx6.S for i.MX6SX")
@@ -56,14 +69,14 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 KBRANCH = "5.10-2.1.x-imx"
-SRCREV = "54bd61ba352bffaf33ee2c956f140a565c9e2201"
+SRCREV = "b0d74a58e223ab3e125a170c48bc1904d5a656ed"
 
 # 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.10.69"
+LINUX_VERSION = "5.10.74"
 
 # Local version indicates the branch name in the NXP kernel tree where patches are collected from.
 LOCALVERSION = "-5.10.52-2.1.0"
diff --git a/recipes-kernel/linux/linux-fslc-lts_5.10.bb b/recipes-kernel/linux/linux-fslc-lts_5.10.bb
index fee8859f..15b48551 100644
--- a/recipes-kernel/linux/linux-fslc-lts_5.10.bb
+++ b/recipes-kernel/linux/linux-fslc-lts_5.10.bb
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "5.10.67"
+LINUX_VERSION = "5.10.74"
 
 KBRANCH = "5.10.x+fslc"
-SRCREV = "5d6224bd7e38de87fa7dcef0046e6f7377d68660"
+SRCREV = "4cdb72cdd5cd1d00b4045f55331a94b3f0f73ca1"
 
 COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"
diff --git a/recipes-kernel/linux/linux-fslc_5.14.bb b/recipes-kernel/linux/linux-fslc_5.14.bb
index f67c1b7b..82241cf1 100644
--- a/recipes-kernel/linux/linux-fslc_5.14.bb
+++ b/recipes-kernel/linux/linux-fslc_5.14.bb
@@ -19,9 +19,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 #
 # LINUX_VERSION define should match to the kernel version referenced by SRC_URI and
 # should be updated once patchlevel is merged.
-LINUX_VERSION = "5.14.6"
+LINUX_VERSION = "5.14.13"
 
 KBRANCH = "5.14.x+fslc"
-SRCREV = "79bcc3a5a2e73ad1024c63fd0e7c368652e48145"
+SRCREV = "d0f83feee96a6dcc4ff3f431969fe7181bbb5080"
 
 COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"