diff options
| author | John Audia <therealgraysky@proton.me> | 2023-09-19 14:00:07 -0400 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-09-23 13:10:28 +0200 |
| commit | e3559fb4453c99c25f6234beda69e1e8a95e663f (patch) | |
| tree | 56f2c980e619cdf1a0cae982dda1196048770f9c /target/linux/ipq806x | |
| parent | 2bda536a3d35d3ab6ed3a39edc0a69c0c95a1a62 (diff) | |
| download | openwrt-e3559fb4453c99c25f6234beda69e1e8a95e663f.tar.gz openwrt-e3559fb4453c99c25f6234beda69e1e8a95e663f.tar.bz2 openwrt-e3559fb4453c99c25f6234beda69e1e8a95e663f.zip | |
kernel: bump 6.1 to 6.1.54
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.54
Removed upstreamed:
generic/backport-6.1/020-v6.3-02-UPSTREAM-mm-multi-gen-LRU-rename-lrugen-lists-to-lru.patch[1]
ipq806x/patches-6.1/140-v6.5-hwspinlock-qcom-add-missing-regmap-config-for-SFPB-M.patch[2]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.54&id=a73d04c460521e45f257d28d73df096e41ece324
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.1.54&id=e93bc372dbc0bde133c854c03502a95617041972
Build system: x86/64
Build-tested: x86/64/AMD Cezanne
Run-tested: x86/64/AMD Cezanne
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/ipq806x')
| -rw-r--r-- | target/linux/ipq806x/patches-6.1/140-v6.5-hwspinlock-qcom-add-missing-regmap-config-for-SFPB-M.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/target/linux/ipq806x/patches-6.1/140-v6.5-hwspinlock-qcom-add-missing-regmap-config-for-SFPB-M.patch b/target/linux/ipq806x/patches-6.1/140-v6.5-hwspinlock-qcom-add-missing-regmap-config-for-SFPB-M.patch deleted file mode 100644 index faa9044d33..0000000000 --- a/target/linux/ipq806x/patches-6.1/140-v6.5-hwspinlock-qcom-add-missing-regmap-config-for-SFPB-M.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 23316be8a9d450f33a21f1efe7d89570becbec58 Mon Sep 17 00:00:00 2001 -From: Christian Marangi <ansuelsmth@gmail.com> -Date: Sun, 16 Jul 2023 04:28:04 +0200 -Subject: [PATCH] hwspinlock: qcom: add missing regmap config for SFPB MMIO - implementation - -Commit 5d4753f741d8 ("hwspinlock: qcom: add support for MMIO on older -SoCs") introduced and made regmap_config mandatory in the of_data struct -but didn't add the regmap_config for sfpb based devices. - -SFPB based devices can both use the legacy syscon way to probe or the -new MMIO way and currently device that use the MMIO way are broken as -they lack the definition of the now required regmap_config and always -return -EINVAL (and indirectly makes fail probing everything that -depends on it, smem, nandc with smem-parser...) - -Fix this by correctly adding the missing regmap_config and restore -function of hwspinlock on SFPB based devices with MMIO implementation. - -Cc: stable@vger.kernel.org -Fixes: 5d4753f741d8 ("hwspinlock: qcom: add support for MMIO on older SoCs") -Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> -Link: https://lore.kernel.org/r/20230716022804.21239-1-ansuelsmth@gmail.com -Signed-off-by: Bjorn Andersson <andersson@kernel.org> ---- - drivers/hwspinlock/qcom_hwspinlock.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - ---- a/drivers/hwspinlock/qcom_hwspinlock.c -+++ b/drivers/hwspinlock/qcom_hwspinlock.c -@@ -69,9 +69,18 @@ static const struct hwspinlock_ops qcom_ - .unlock = qcom_hwspinlock_unlock, - }; - -+static const struct regmap_config sfpb_mutex_config = { -+ .reg_bits = 32, -+ .reg_stride = 4, -+ .val_bits = 32, -+ .max_register = 0x100, -+ .fast_io = true, -+}; -+ - static const struct qcom_hwspinlock_of_data of_sfpb_mutex = { - .offset = 0x4, - .stride = 0x4, -+ .regmap_config = &sfpb_mutex_config, - }; - - static const struct regmap_config tcsr_msm8226_mutex_config = { |