| author | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-05-03 16:49:40 UTC |
| committer | Urja (ARMLFS builder)
<urja+armlfs@urja.dev> 2025-05-03 16:49:40 UTC |
| parent | 7700cdd98d51d611d5fc07813711d2212e24e004 |
| .SRCINFO | +6 | -6 |
| PKGBUILD | +5 | -5 |
| armlfs.patch | +45 | -44 |
diff --git a/.SRCINFO b/.SRCINFO index 53234c5..a875540 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ pkgbase = linux-armlfs - pkgver = 6.13.5 + pkgver = 6.14.5 pkgrel = 1 url = http://www.kernel.org/ arch = armv7h @@ -14,17 +14,17 @@ pkgbase = linux-armlfs makedepends = vboot-utils makedepends = uboot-tools options = !strip - source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.13.tar.xz - source = https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.13.5.xz + source = https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.14.tar.xz + source = https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.14.5.xz source = armlfs.patch source = kernel.its source = kernel.keyblock source = kernel_data_key.vbprivk source = 60-linux.hook source = config - sha256sums = e79dcc6eb86695c6babfb07c2861912b635d5075c6cd1cd0567d1ea155f80d6e - sha256sums = 98d619a056e0f007a3404f02430fdb5feeb6801170c40602a27e575dd207bd79 - sha256sums = 2b421c08747de97005a4566e05dda8c636f082ef4d161817c34a3eef6cc2607e + sha256sums = a294b683e7b161bb0517bb32ec7ed1d2ea7603dfbabad135170ed12d00c47670 + sha256sums = 62e09888fb69a76707c3bf43bb44259d1c0016e665299e74a2dc60dc1f42dbb5 + sha256sums = 3bd0cbf970db061aafad25e60c2d9eecd83061ceab2f3e97970d5ad443344ea0 sha256sums = 994aee74b13313bdc7c47df4d621c890f5ee52bc18f6c7b658de215c17423b2a sha256sums = 4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb sha256sums = bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b diff --git a/PKGBUILD b/PKGBUILD index 425e07e..b493995 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -11,10 +11,10 @@ buildarch=4 _xname= pkgbase=linux-armlfs${_xname} -_srcname=linux-6.13 +_srcname=linux-6.14 _kernelname=${pkgbase#linux} _desc="Veyron Speedy" -pkgver=6.13.5 +pkgver=6.14.5 pkgrel=1 arch=('armv7h') url="http://www.kernel.org/" @@ -167,9 +167,9 @@ for _p in ${pkgname[@]}; do }" done -sha256sums=('e79dcc6eb86695c6babfb07c2861912b635d5075c6cd1cd0567d1ea155f80d6e' - '98d619a056e0f007a3404f02430fdb5feeb6801170c40602a27e575dd207bd79' - '2b421c08747de97005a4566e05dda8c636f082ef4d161817c34a3eef6cc2607e' +sha256sums=('a294b683e7b161bb0517bb32ec7ed1d2ea7603dfbabad135170ed12d00c47670' + '62e09888fb69a76707c3bf43bb44259d1c0016e665299e74a2dc60dc1f42dbb5' + '3bd0cbf970db061aafad25e60c2d9eecd83061ceab2f3e97970d5ad443344ea0' '994aee74b13313bdc7c47df4d621c890f5ee52bc18f6c7b658de215c17423b2a' '4e708c9ec43ac4a5d718474c9431ba6b6da3e64a9dda6afd2853a9e9e3079ffb' 'bc9e707a86e55a93f423e7bcdae4a25fd470b868e53829b91bbe2ccfbc6da27b' diff --git a/armlfs.patch b/armlfs.patch index a1f7a6f..80082c0 100644 --- a/armlfs.patch +++ b/armlfs.patch @@ -1,4 +1,4 @@ -From b8204766fb3ca96ec0ad438c288d7c046f917b4c Mon Sep 17 00:00:00 2001 +From f66a8e640b1ce18cf61722ad9dbfd4e4ace4cbcd Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Mon, 27 Aug 2018 10:30:55 +0000 Subject: [PATCH 01/33] drivers: clk-rk3288: support for dedicating NPLL to a @@ -153,7 +153,7 @@ index 90d329216064..671c786ddbaa 100644 pr_err("%s: rockchip clk init failed\n", __func__); iounmap(rk3288_cru_base); diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h -index f1957e1c1178..7c37a6ee5d40 100644 +index 9b37d44b9e5d..91ee6dbec7ee 100644 --- a/drivers/clk/rockchip/clk.h +++ b/drivers/clk/rockchip/clk.h @@ -563,6 +563,9 @@ struct clk *rockchip_clk_register_muxgrf(const char *name, @@ -170,7 +170,7 @@ index f1957e1c1178..7c37a6ee5d40 100644 2.44.0 -From 259670afef427b46ed16337bda9470b5b29de0e0 Mon Sep 17 00:00:00 2001 +From 5aca51d6f2c9318c612e2dd13310fe370f2c8ff5 Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Wed, 22 Aug 2018 18:36:40 +0000 Subject: [PATCH 02/33] drm: dw_hdmi-rockchip: better clock selection logic and @@ -203,7 +203,7 @@ Signed-off-by: Maya Matuszczyk <maccraft123mc@gmail.com> 1 file changed, 109 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c -index 42bda4ffbbbd..a5aa95e20b07 100644 +index f737e7d46e66..0bd62f21d6e5 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -81,8 +81,13 @@ struct rockchip_hdmi { @@ -466,7 +466,7 @@ index 42bda4ffbbbd..a5aa95e20b07 100644 2.44.0 -From 8afcdfba9969b89fdce5f2b0b65670d8351a30bc Mon Sep 17 00:00:00 2001 +From b0ba2ada71b203c77997ceba6f3472a887a73eb4 Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Mon, 27 Aug 2018 19:00:50 +0000 Subject: [PATCH 03/33] dts: rk3288: support for dedicating npll to a vop @@ -505,7 +505,7 @@ index 3f1d640afafa..2992c323d555 100644 2.44.0 -From 11472d0ae23e5adcf069ab99ce8f8c82ca121c2e Mon Sep 17 00:00:00 2001 +From 308075ea9deb56abdb513449ebc638c97631187e Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Mon, 27 Aug 2018 19:03:49 +0000 Subject: [PATCH 04/33] dts: rk3288-veyron-chromebook: dedicate npll to @@ -598,7 +598,7 @@ index 3677571b4d82..b61a4b0d7015 100644 2.44.0 -From ddd01d01abbaec808e35ae341c5135473a8dcb37 Mon Sep 17 00:00:00 2001 +From 62ebd56eb197df944e7002ee64b03798e19a649f Mon Sep 17 00:00:00 2001 From: SolidHal <hal@halemmerich.com> Date: Sun, 21 Oct 2018 16:40:15 -0500 Subject: [PATCH 05/33] Added a second reset when having an issue reading the @@ -651,7 +651,7 @@ index 4830628510e6..7658effcb6ef 100644 2.44.0 -From f378bb658c585ef3187aba4468e755c4c3e570ee Mon Sep 17 00:00:00 2001 +From 5bfb4b6c14ee868089a5f4e0e756b95c3a2f493e Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr> Date: Tue, 9 Oct 2018 22:01:07 +0200 Subject: [PATCH 06/33] block: partitions: efi: Ignore bizarre Chromebook GPT @@ -691,7 +691,7 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr> 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/block/partitions/efi.c b/block/partitions/efi.c -index 5e9be13a56a8..8cdfcc48558c 100644 +index 7acba66eed48..087032a4705e 100644 --- a/block/partitions/efi.c +++ b/block/partitions/efi.c @@ -328,23 +328,34 @@ static gpt_header *alloc_read_gpt_header(struct parsed_partitions *state, @@ -804,7 +804,7 @@ index 84b9f36b9e47..09726227e891 100644 2.44.0 -From 311c0127e1855328008995bf331d83d4e16f8659 Mon Sep 17 00:00:00 2001 +From e814c31fcd49fd2a3b8de259574e5138576d8126 Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr> Date: Tue, 30 Oct 2018 22:44:54 +0100 Subject: [PATCH 07/33] mmc: Added a flag to disable cache flush during reset @@ -827,10 +827,10 @@ Signed-off-by: Miouyouyou (Myy) <myy@miouyouyou.fr> 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c -index 48bda70145ee..a2b84e1aa03b 100644 +index bdb22998357e..f7d2db641408 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c -@@ -406,6 +406,8 @@ int mmc_of_parse(struct mmc_host *host) +@@ -405,6 +405,8 @@ int mmc_of_parse(struct mmc_host *host) if (device_property_read_bool(dev, "no-mmc-hs400")) host->caps2 &= ~(MMC_CAP2_HS400_1_8V | MMC_CAP2_HS400_1_2V | MMC_CAP2_HS400_ES); @@ -877,7 +877,7 @@ index 6a23be214543..d4701521f6b2 100644 if ((host->caps & MMC_CAP_HW_RESET) && host->ops->card_hw_reset && mmc_can_reset(card)) { diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h -index f166d6611ddb..d3fbd8369564 100644 +index 68f09a955a90..eb7dbf0f9b10 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -459,6 +459,7 @@ struct mmc_host { @@ -892,7 +892,7 @@ index f166d6611ddb..d3fbd8369564 100644 2.44.0 -From e62cca220966e307c51890a6f3831e3aa63534ab Mon Sep 17 00:00:00 2001 +From a548efa39ddc3a0895e61c67b7f2c36adb229afc Mon Sep 17 00:00:00 2001 From: "Miouyouyou (Myy)" <myy@miouyouyou.fr> Date: Thu, 1 Nov 2018 21:31:26 +0100 Subject: [PATCH 08/33] arm: dts: veyron: Added a flag to disable cache flush @@ -925,7 +925,7 @@ index 260d6c92cfd1..08ce8bfb70b2 100644 2.44.0 -From b7c7d3413d77a7ccea7c8faf301cf68bf570c67b Mon Sep 17 00:00:00 2001 +From 159c679e48fc51c3adf8e88746eb2d180e49b465 Mon Sep 17 00:00:00 2001 From: Hal Emmerich <hal@halemmerich.com> Date: Wed, 21 Aug 2019 16:52:41 -0500 Subject: [PATCH 09/33] Fix ath9k dwc2 init frame overruns @@ -968,7 +968,7 @@ index 238c6fd50e75..ea4ce893d5b9 100644 2.44.0 -From 38aa946b72d8a9f64bc38d3097d13b4e24f0d284 Mon Sep 17 00:00:00 2001 +From f7c1151a0ef8840e5ad3afe765c0898ecb3be771 Mon Sep 17 00:00:00 2001 From: barzur <boris@konbu.org> Date: Fri, 12 Jul 2019 11:33:32 +0900 Subject: [PATCH 10/33] usb/dwc2/hcd: channel halt may not be an error @@ -1039,7 +1039,7 @@ index 5c7538d498dd..96dc5d8115d2 100644 2.44.0 -From 4d6d13eb632d475bce05010d82f97bd498707c27 Mon Sep 17 00:00:00 2001 +From f806d660d90366a8b840667fd274ac4f94c8da7e Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Tue, 8 Oct 2019 11:03:37 +0000 Subject: [PATCH 11/33] drm/panel: edp: Extend Innolux N116BGE mode info for @@ -1051,7 +1051,7 @@ Signed-off-by: Urja Rannikko <urjaman@gmail.com> 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c -index 94a46241dece..37da2a6a5c0e 100644 +index f8511fe5fb0d..19bb450ac04c 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -1295,16 +1295,25 @@ static const struct panel_desc innolux_n116bca_ea1 = { @@ -1086,7 +1086,7 @@ index 94a46241dece..37da2a6a5c0e 100644 2.44.0 -From 06fde884d92f9985973dbcfa2d9d7b1a14692d27 Mon Sep 17 00:00:00 2001 +From 60a702a738e9888dc2000b3414066ee384c1e6a7 Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Tue, 8 Oct 2019 11:12:33 +0000 Subject: [PATCH 12/33] ARM: dts: rockchip: Adjust rk3288-veyron n116bge mode @@ -1125,7 +1125,7 @@ index fb031964fa2b..128176b7c372 100644 2.44.0 -From 628ce51e23d07239c50390b5bac6480573bdc06e Mon Sep 17 00:00:00 2001 +From 3969e5ec97767aabf875bd6541999f9e6fdd0250 Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Mon, 25 Dec 2023 18:06:10 +0200 Subject: [PATCH 13/33] dts: veyron: bluetooth: disable dma on uart0 @@ -1153,7 +1153,7 @@ index 2992c323d555..949bc1829c8f 100644 2.44.0 -From 146132d64c9c9107f1bce94a3ce8444186c2c57f Mon Sep 17 00:00:00 2001 +From 1985a91df656ced8df69e9471762ac99105ec456 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:00 +0000 Subject: [PATCH 14/33] media: v4l2-common: Add helpers to calculate @@ -1283,7 +1283,7 @@ index 0a2f4f0d0a07..8ad04d48a023 100644 2.44.0 -From 16961536993f9f1e3aebed11475968c8a82ab3aa Mon Sep 17 00:00:00 2001 +From 224cd860abd0b49575d778ae594133842bb6e323 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:01 +0000 Subject: [PATCH 15/33] media: v4l2: Add NV15 and NV20 pixel formats @@ -1519,7 +1519,7 @@ index e7c4dce39007..700e7033b88e 100644 2.44.0 -From dc39c0e2aaec55b30a00d0d7d7f864eb543d268a Mon Sep 17 00:00:00 2001 +From 351b1bcd78af5ec98904a31dd83f6cd73832dde3 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:02 +0000 Subject: [PATCH 16/33] media: rkvdec: h264: Use bytesperline and buffer height @@ -1578,7 +1578,7 @@ index 4fc167b42cf0..7a1e76d423df 100644 2.44.0 -From d7d176a7eba1b7525837d42490de8c355679fc0c Mon Sep 17 00:00:00 2001 +From 9e1796c4db6e34173b714153644fd641a4c722aa Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 16:55:03 +0000 Subject: [PATCH 17/33] media: rkvdec: h264: Don't hardcode SPS/PPS parameters @@ -1633,7 +1633,7 @@ index 7a1e76d423df..8bce8902b8dd 100644 2.44.0 -From f7c52061825275e52b4adfe6c04d55216c8ed907 Mon Sep 17 00:00:00 2001 +From 8de51ddaab1bed2e60e1a91dc62cd289253946cb Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:04 +0000 Subject: [PATCH 18/33] media: rkvdec: h264: Remove SPS validation at streaming @@ -1698,7 +1698,7 @@ index 8bce8902b8dd..815d5359ddd5 100644 2.44.0 -From a1365e17b61e9c42bce3270bb95c0f3b4e311c29 Mon Sep 17 00:00:00 2001 +From 9f4e21c121be909fa35b254eb4627fe639119e7f Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:05 +0000 Subject: [PATCH 19/33] media: rkvdec: Extract rkvdec_fill_decoded_pixfmt into @@ -1768,7 +1768,7 @@ index f9bef5173bf2..e354360f4acc 100644 2.44.0 -From 3fc8e79a65ac50c3ac4ee35f50cd11eb176fc54c Mon Sep 17 00:00:00 2001 +From dc2e02698001eb866e1db8a64e96d35abc44036e Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:06 +0000 Subject: [PATCH 20/33] media: rkvdec: Move rkvdec_reset_decoded_fmt helper @@ -1856,7 +1856,7 @@ index e354360f4acc..1f8f98cf91dc 100644 2.44.0 -From 5b8838126aadf780c1cf32c522dc63bd40f6a4e6 Mon Sep 17 00:00:00 2001 +From 397ed7f42a724805d9260a8ab375d5c277a5bc04 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:07 +0000 Subject: [PATCH 21/33] media: rkvdec: Extract decoded format enumeration into @@ -1970,7 +1970,7 @@ index 1f8f98cf91dc..52e64b399dcc 100644 2.44.0 -From 45f644520829c095215b799dd14afbb2f3982e6f Mon Sep 17 00:00:00 2001 +From 37063fc6a37565d2cdf11fc74793889ed2c2aea4 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:08 +0000 Subject: [PATCH 22/33] media: rkvdec: Add image format concept @@ -2133,7 +2133,7 @@ index 633335ebb9c4..6f8cf50c5d99 100644 2.44.0 -From 9713e34470d46646a2f834be7ef3806d8bf44e47 Mon Sep 17 00:00:00 2001 +From d8ce1a3fe24326f2e17149bd3e50a03084fef559 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:09 +0000 Subject: [PATCH 23/33] media: rkvdec: Add get_image_fmt ops @@ -2234,7 +2234,7 @@ index 6f8cf50c5d99..e466a2753ccf 100644 2.44.0 -From de76ea7ab33e3ec5565c48323f6286df881eade9 Mon Sep 17 00:00:00 2001 +From bb24e46dfbe416a818f1efefc418aef09b19da35 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 16:55:10 +0000 Subject: [PATCH 24/33] media: rkvdec: h264: Support High 10 and 4:2:2 profiles @@ -2426,7 +2426,7 @@ index e466a2753ccf..9a9f4fced7a1 100644 2.44.0 -From 798eb0d9103d5f21af59b25439934e8e920b91e3 Mon Sep 17 00:00:00 2001 +From a7a2b9292b9ac5152e8080c506b8f55c2dcd029f Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 23:36:08 +0000 Subject: [PATCH 25/33] media: rkvdec: Add HEVC backend @@ -5272,7 +5272,7 @@ index 9a9f4fced7a1..2f3bda1df5f0 100644 2.44.0 -From 3966519f7bfc5304106fdaea94ff23a3a741141b Mon Sep 17 00:00:00 2001 +From e7001187afd38164855ca8e0e1688983d1eddc9c Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 23:36:09 +0000 Subject: [PATCH 26/33] media: rkvdec: Add variants support @@ -5414,7 +5414,7 @@ index 2f3bda1df5f0..14ce26a6c618 100644 2.44.0 -From a60e0e22d72dc1f706875ea55e86841a2e56b3fd Mon Sep 17 00:00:00 2001 +From 75c0548625f21b08a323124623cd4f9efd205631 Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 23:36:10 +0000 Subject: [PATCH 27/33] media: rkvdec: Implement capability filtering @@ -5567,7 +5567,7 @@ index 6dda80c6bb51..3b7484589c7a 100644 2.44.0 -From d58ff8aeff66b7a2405d94db041d775fd73fca7e Mon Sep 17 00:00:00 2001 +From 14d777c44f5a8ef22c3941f6d2e9c0708779bf11 Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 23:36:11 +0000 Subject: [PATCH 28/33] media: rkvdec: Add RK3288 variant @@ -5611,7 +5611,7 @@ index 3b7484589c7a..7a667e6ecf33 100644 2.44.0 -From 87b7c039d1cc4bc0d40c8277eba4a64c9dd14a68 Mon Sep 17 00:00:00 2001 +From ab7d5e3b57548f21dca66ad84ccab39aa56c1c50 Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 23:36:12 +0000 Subject: [PATCH 29/33] media: rkvdec: Disable QoS for HEVC and VP9 on RK3328 @@ -5756,7 +5756,7 @@ index 14ce26a6c618..1d5d405da56c 100644 2.44.0 -From 5645a3f0ba82e996832f337c8025f67d3f7e0189 Mon Sep 17 00:00:00 2001 +From 9c0440f7e258fb8d2e9ad118a439f46e2679f5ea Mon Sep 17 00:00:00 2001 From: Jonas Karlman <jonas@kwiboo.se> Date: Sun, 5 Nov 2023 23:36:13 +0000 Subject: [PATCH 30/33] media: dt-bindings: rockchip,vdec: Add RK3288 @@ -5789,7 +5789,7 @@ index 08b02ec16755..0f00e9c86737 100644 2.44.0 -From 56c3beb08ba1f1447ebb54e9f85e0ab3530bd3b6 Mon Sep 17 00:00:00 2001 +From 8845bec72fc5621c480d3b089d06453ae078f5cb Mon Sep 17 00:00:00 2001 From: Alex Bee <knaerzche@gmail.com> Date: Sun, 5 Nov 2023 23:36:14 +0000 Subject: [PATCH 31/33] ARM: dts: rockchip: Add vdec node for RK3288 @@ -5842,7 +5842,7 @@ index 949bc1829c8f..dbf2d3b8f13e 100644 2.44.0 -From ddafff7673f2d235bfd2f33224f9b0c1bb1769cf Mon Sep 17 00:00:00 2001 +From 4779dbc590ade66334a4692bc2c2939ca218e0c8 Mon Sep 17 00:00:00 2001 From: Urja Rannikko <urjaman@gmail.com> Date: Tue, 28 Sep 2021 20:23:13 +0300 Subject: [PATCH 32/33] Revert "clk: divider: Implement and wire up @@ -5908,7 +5908,7 @@ index c1f426b8a504..3941b4d984f7 100644 2.44.0 -From e3cf6d059ae5b84d30db0673c63921c53aa33e53 Mon Sep 17 00:00:00 2001 +From c5092c99948d8efef1c37a52c474a617e080da92 Mon Sep 17 00:00:00 2001 From: Sebastian Reichel <sebastian.reichel@collabora.com> Date: Tue, 30 Jul 2024 20:05:05 +0200 Subject: [PATCH 33/33] mfd: rk8xx: Fix shutdown handler @@ -6003,14 +6003,14 @@ Cc: stable@vger.kernel.org Reported-by: Urja <urja@urja.dev> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com> --- - drivers/mfd/rk8xx-core.c | 15 +++++++++++++-- + drivers/mfd/rk8xx-core.c | 16 ++++++++++++++-- drivers/mfd/rk8xx-i2c.c | 2 +- drivers/mfd/rk8xx-spi.c | 2 +- include/linux/mfd/rk808.h | 2 +- - 4 files changed, 16 insertions(+), 5 deletions(-) + 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/drivers/mfd/rk8xx-core.c b/drivers/mfd/rk8xx-core.c -index 71c2b80a4678..0f43c3183ae5 100644 +index 71c2b80a4678..1583beef714a 100644 --- a/drivers/mfd/rk8xx-core.c +++ b/drivers/mfd/rk8xx-core.c @@ -692,10 +692,11 @@ void rk8xx_shutdown(struct device *dev) @@ -6026,7 +6026,7 @@ index 71c2b80a4678..0f43c3183ae5 100644 const struct mfd_cell *cells; int dual_support = 0; int nr_pre_init_regs; -@@ -785,10 +786,20 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap +@@ -785,10 +786,21 @@ int rk8xx_probe(struct device *dev, int variant, unsigned int irq, struct regmap if (ret) return dev_err_probe(dev, ret, "failed to add MFD devices\n"); @@ -6039,6 +6039,7 @@ index 71c2b80a4678..0f43c3183ae5 100644 + */ + if (is_spi) + pwr_off_mode = SYS_OFF_MODE_POWER_OFF_PREPARE; ++ + if (device_property_read_bool(dev, "system-power-controller") || device_property_read_bool(dev, "rockchip,system-power-controller")) {