From d02e981862319281ea26f86f01f4b8072acb2c82 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 10 Mar 2023 10:46:12 +0100 Subject: linux-toradex-mainline/-rt: bump to 6.3-rc1 Bump the git hashes and on rt the branch to 6.3-rc. Drop the 6.2 specific patch version for the RT kernel. . Signed-off-by: Max Krummenacher --- ...hermal-imx-Update-critical-temp-threshold.patch | 39 ---------------------- .../linux/linux-toradex-mainline-rt_git.bb | 6 ++-- recipes-kernel/linux/linux-toradex-mainline_git.bb | 4 +-- 3 files changed, 5 insertions(+), 44 deletions(-) delete mode 100644 recipes-kernel/linux/linux-toradex-mainline-rt-git/0001-thermal-imx-Update-critical-temp-threshold.patch (limited to 'recipes-kernel') diff --git a/recipes-kernel/linux/linux-toradex-mainline-rt-git/0001-thermal-imx-Update-critical-temp-threshold.patch b/recipes-kernel/linux/linux-toradex-mainline-rt-git/0001-thermal-imx-Update-critical-temp-threshold.patch deleted file mode 100644 index 3fbd5e3..0000000 --- a/recipes-kernel/linux/linux-toradex-mainline-rt-git/0001-thermal-imx-Update-critical-temp-threshold.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 509dccde2a1cc4ac7d5099ca7aea9ec05c6f7e4f Mon Sep 17 00:00:00 2001 -From: Francesco Dolcini -Date: Wed, 20 Apr 2022 11:13:00 +0200 -Subject: [PATCH] thermal: imx: Update critical temp threshold - -Increase the critical temperature threshold to the datasheet defined -value according to the temperature grade of the SoC, increasing the -actual critical temperature value of 5 degrees. - -Without this change the emergency shutdown will trigger earlier then -required affecting applications that are expected to be working on this -close to the limit, but yet valid, temperature range. - -Upstream-Status: Denied [https://lore.kernel.org/all/20220420091300.179753-1-francesco.dolcini@toradex.com/] -Signed-off-by: Francesco Dolcini ---- - drivers/thermal/imx_thermal.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c -index 16663373b682..75a631a23e61 100644 ---- a/drivers/thermal/imx_thermal.c -+++ b/drivers/thermal/imx_thermal.c -@@ -504,10 +504,10 @@ static void imx_init_temp_grade(struct platform_device *pdev, u32 ocotp_mem0) - } - - /* -- * Set the critical trip point at 5 °C under max -+ * Set the critical trip point at max - * Set the passive trip point at 10 °C under max (changeable via sysfs) - */ -- data->temp_critical = data->temp_max - (1000 * 5); -+ data->temp_critical = data->temp_max; - data->temp_passive = data->temp_max - (1000 * 10); - } - --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-toradex-mainline-rt_git.bb b/recipes-kernel/linux/linux-toradex-mainline-rt_git.bb index 2cbf080..707101d 100644 --- a/recipes-kernel/linux/linux-toradex-mainline-rt_git.bb +++ b/recipes-kernel/linux/linux-toradex-mainline-rt_git.bb @@ -1,4 +1,4 @@ -LINUX_VERSION ?= "6.2-rc" +LINUX_VERSION ?= "6.3-rc" require recipes-kernel/linux/linux-toradex-mainline_git.bb FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-git:" @@ -7,8 +7,8 @@ SUMMARY = "Toradex mainline real-time Linux kernel" # the RT patch on top of a vanilla kernel. LINUX_REPO = "git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel.git" -KBRANCH = "linux-6.2.y-rt" -SRCREV_machine = "bee0efc1fe1add1df7d677cee5a9c4c325196403" +KBRANCH = "linux-6.3.y-rt" +SRCREV_machine = "c0ca8b79d21d0c9a1ac7ed0ebebb5588804ba825" SRCREV_machine:use-head-next = "${AUTOREV}" SRC_URI:append = " \ diff --git a/recipes-kernel/linux/linux-toradex-mainline_git.bb b/recipes-kernel/linux/linux-toradex-mainline_git.bb index cbb751f..db3e223 100644 --- a/recipes-kernel/linux/linux-toradex-mainline_git.bb +++ b/recipes-kernel/linux/linux-toradex-mainline_git.bb @@ -31,10 +31,10 @@ SRC_URI:append = " \ file://0002-drivers-chipidea-disable-runtime-pm-for-imx6ul.patch \ " -LINUX_VERSION ?= "6.2-rc" +LINUX_VERSION ?= "6.3-rc" KBRANCH = "master" KERNEL_VERSION_SANITY_SKIP = "1" -SRCREV_machine = "1b929c02afd37871d5afb9d498426f83432e71c2" +SRCREV_machine = "fe15c26ee26efa11741a7b632e9f23b01aca4cc6" SRCREV_machine:use-head-next = "${AUTOREV}" S = "${WORKDIR}/git" -- cgit v1.2.3