aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2022-01-07 08:56:10 -0300
committerGitHub <noreply@github.com>2022-01-07 08:56:10 -0300
commite35bb7331e82102ef2bbfce46b394d23be135dbf (patch)
tree353b666a13230dd2a0d3ce915c20605b311b2b45
parent846d585f8ce077fe69010775720d2777fccb788c (diff)
parentd3d8d784533fd011e11c4c2b939cd6eb49e30096 (diff)
downloadmeta-freescale-e35bb7331e82102ef2bbfce46b394d23be135dbf.tar.gz
meta-freescale-e35bb7331e82102ef2bbfce46b394d23be135dbf.tar.bz2
meta-freescale-e35bb7331e82102ef2bbfce46b394d23be135dbf.zip
Merge pull request #936 from zandrey/kernel-update-master
Consolidated Kernel update (v5.10.90 + 5.15.13)
-rw-r--r--recipes-kernel/linux/linux-fslc-imx_5.10.bb10
-rw-r--r--recipes-kernel/linux/linux-fslc-lts_5.10.bb4
-rw-r--r--recipes-kernel/linux/linux-fslc_5.15.bb4
3 files changed, 11 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 c8a513f4..b3ed4c6a 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.79
+# tag: v5.10.90
#
# ------------------------------------------------------------------------------
# 2. NXP-specific (tag or SHA(s))
@@ -38,6 +38,10 @@ Latest stable Kernel patchlevel is applied and maintained by Community."
# ------------------------------------------------------------------------------
# 3. Critical patches (SHA(s))
# ------------------------------------------------------------------------------
+# 8ef27ae9f200 ("gpio: fix enabling GPIO_VF610")
+# 12099c38577a ("ASoC: fsl_sai: Correct the clock source for mclk0")
+# db172377e6e2 ("Revert "MLK-12786-2: ASoC: fsl_sai: correct the clock source for mclk0"")
+# 372825d96a29 ("ARM: dts: imx7s: fix ARM timer definition")
# 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")
@@ -69,14 +73,14 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
KBRANCH = "5.10-2.1.x-imx"
-SRCREV = "cdf10f101ab7e0112a285ab86e1a62d80e7d2104"
+SRCREV = "e730e691a1edb8c38004d81b070529224e8df714"
# 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.79"
+LINUX_VERSION = "5.10.90"
# 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 b56e003f..e116a961 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.79"
+LINUX_VERSION = "5.10.90"
KBRANCH = "5.10.x+fslc"
-SRCREV = "0ac3cc275e5453959661bfbbc78b22c2dc6d1987"
+SRCREV = "da41da7f8aeec4cf0e6616615290b4a8c7a69a64"
COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"
diff --git a/recipes-kernel/linux/linux-fslc_5.15.bb b/recipes-kernel/linux/linux-fslc_5.15.bb
index 45c9d3f3..2bb946ef 100644
--- a/recipes-kernel/linux/linux-fslc_5.15.bb
+++ b/recipes-kernel/linux/linux-fslc_5.15.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.15.12"
+LINUX_VERSION = "5.15.13"
KBRANCH = "5.15.x+fslc"
-SRCREV = "503f83efaba7cf3821bb48ddad156c770330f75f"
+SRCREV = "decdf16c686eb233ffa665ed540e0fa82d1dc745"
COMPATIBLE_MACHINE = "(mxs|mx5|mx6|vf|use-mainline-bsp)"