linux-toradex: update to toradex_5.15-2.2.x-imx

Update the downstream kernel (NXP fork) to lf-5.15-2.2.0 plus fslc
stable patches merges.
Then rebase our 5.15-2.1.0 on top of it [1].

For the RT kernel, set the matching RT patch.

[1] https://github.com/Freescale/linux-fslc/commit/7c13adcd3af7dcd541144655102e1cdb941ad538

Related-to: ELB-5185
Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
(cherry picked from commit 65db2ad74d40b30e4ea1421ce699cad62d08b0a8)

12 files changed, 7 insertions, 7 deletions

diff --git a/recipes-kernel/linux/linux-imx-headers_5%.bbappend b/recipes-kernel/linux/linux-imx-headers_5%.bbappend
index e1d8228..36be8d5 100644
--- a/recipes-kernel/linux/linux-imx-headers_5%.bbappend
+++ b/recipes-kernel/linux/linux-imx-headers_5%.bbappend
@@ -1,5 +1,5 @@
 LIC_FILES_CHKSUM:tdx = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
-SRCBRANCH:tdx = "toradex_5.15-2.1.x-imx"
+SRCBRANCH:tdx = "toradex_5.15-2.2.x-imx"
 SRC_URI:tdx = "git://git.toradex.com/linux-toradex.git;protocol=https;branch=${SRCBRANCH}"
 # Keep that one stable, i.e. use the exact git hash from the NXP BSP.
-SRCREV:tdx = "36363d8623ba60858e2632b7d2b70dae932c9a8b"
+SRCREV:tdx = "7c13adcd3af7dcd541144655102e1cdb941ad538"
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0001-Revert-Revert-ARM-9113-1-uaccess-remove-set_fs-imple.patch b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0001-Revert-Revert-ARM-9113-1-uaccess-remove-set_fs-imple.patch
index b2413e8..b2413e8 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0001-Revert-Revert-ARM-9113-1-uaccess-remove-set_fs-imple.patch
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0001-Revert-Revert-ARM-9113-1-uaccess-remove-set_fs-imple.patch
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch
index 4dc1dae..4dc1dae 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0001-imx_sc_thermal-prevent-BUG-with-rt-patch.patch
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0002-arch-arm-Kconfig-prepare-for-rt-patch.patch b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0002-arch-arm-Kconfig-prepare-for-rt-patch.patch
index 7dfb476..7dfb476 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0002-arch-arm-Kconfig-prepare-for-rt-patch.patch
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0002-arch-arm-Kconfig-prepare-for-rt-patch.patch
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch
index 9296878..9296878 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0002-ddr-perf-prevent-BUG-with-rt-patch.patch
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch
index 5ade25c..5ade25c 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0005-Revert-Revert-Revert-ARM-9113-1-uaccess-remove-set_f.patch b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0005-Revert-Revert-Revert-ARM-9113-1-uaccess-remove-set_f.patch
index f98060a..f98060a 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/0005-Revert-Revert-Revert-ARM-9113-1-uaccess-remove-set_f.patch
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/0005-Revert-Revert-Revert-ARM-9113-1-uaccess-remove-set_f.patch
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt-less-latency.cfg b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/preempt-rt-less-latency.cfg
index a9c88bd..a9c88bd 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt-less-latency.cfg
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/preempt-rt-less-latency.cfg
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt-less-latency.scc b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/preempt-rt-less-latency.scc
index edd1519..edd1519 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt-less-latency.scc
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/preempt-rt-less-latency.scc
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt.cfg b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/preempt-rt.cfg
index 17b06b1..17b06b1 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt.cfg
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/preempt-rt.cfg
diff --git a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt.scc b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/preempt-rt.scc
index 82d27dc..82d27dc 100644
--- a/recipes-kernel/linux/linux-toradex-5.15-2.1.x/preempt-rt.scc
+++ b/recipes-kernel/linux/linux-toradex-5.15-2.2.x/preempt-rt.scc
diff --git a/recipes-kernel/linux/linux-toradex_5.15-2.1.x.bb b/recipes-kernel/linux/linux-toradex_5.15-2.2.x.bb
index 4209371..eb47818 100644
--- a/recipes-kernel/linux/linux-toradex_5.15-2.1.x.bb
+++ b/recipes-kernel/linux/linux-toradex_5.15-2.2.x.bb
@@ -14,12 +14,12 @@ SRC_URI = " \
 KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}"
 
 inherit toradex-kernel-deploy-config toradex-kernel-localversion
-LINUX_VERSION = "5.15.77"
+LINUX_VERSION = "5.15.125"
 # skip, as with use-head-next LINUX_VERSION might be set wrongly
 KERNEL_VERSION_SANITY_SKIP = "1"
 
-SRCBRANCH = "toradex_5.15-2.1.x-imx"
-SRCREV_machine = "ddc6ca4d76ea764aaec9837fb9c82297473e6edc"
+SRCBRANCH = "toradex_5.15-2.2.x-imx"
+SRCREV_machine = "626df3983254bccebc2584b90e615ad89f79cf46"
 SRCREV_machine:use-head-next = "${AUTOREV}"
 
 DEPENDS += "bc-native"
@@ -40,11 +40,11 @@ MIRRORS:append:preempt-rt = "${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.15/o
 SRC_URI:append:preempt-rt = " \
     file://0001-Revert-Revert-ARM-9113-1-uaccess-remove-set_fs-imple.patch \
     file://0002-arch-arm-Kconfig-prepare-for-rt-patch.patch \
-    ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.15/older/patch-5.15.76-rt53.patch.xz;name=rt-patch \
+    ${KERNELORG_MIRROR}/linux/kernel/projects/rt/5.15/older/patch-5.15.125-rt66.patch.xz;name=rt-patch \
     file://0004-Revert-arch-arm-Kconfig-prepare-for-rt-patch.patch \
     file://0005-Revert-Revert-Revert-ARM-9113-1-uaccess-remove-set_f.patch \
     file://preempt-rt.scc \
     file://preempt-rt-less-latency.scc \
 "
 
-SRC_URI[rt-patch.sha256sum] = "737fc31835e774fe970e7eb9c799df55393bd21e6d5a0136cd5e63fe154805c2"
+SRC_URI[rt-patch.sha256sum] = "4bb33ab169af60e7f7f6b835e91aa0c17ce4563b00a3c1b35800258f9b678d46"