mirror of
https://github.com/hzyitc/openwrt-redmi-ax3000.git
synced 2025-12-17 08:52:53 +00:00
7efec0acca
Manually rebased:
bcm4908/patches-5.15/071-v6.1-0001-net-broadcom-bcm4908_enet-handle-EPROBE_DEFER-when-g.patch
bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch[*]
bcm27xx/patches-5.15/950-0600-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
bcm27xx/patches-5.15/950-0606-usb-xhci-add-VLI_TRB_CACHE_BUG-quirk.patch
bcm27xx/patches-5.15/950-0717-usb-xhci-add-a-quirk-for-Superspeed-bulk-OUT-transfe.patch
Removed upstreamed:
backport-5.15/735-v6.5-net-bgmac-postpone-turning-IRQs-off-to-avoid-SoC-han.patch[1]
backport-5.15/817-v6.5-01-leds-trigger-netdev-Recheck-NETDEV_LED_MODE_LINKUP-o.patch[2]
pending-5.15/143-jffs2-reduce-stack-usage-in-jffs2_build_xattr_subsys.patch[3]
pending-5.15/160-workqueue-fix-enum-type-for-gcc-13.patch[4]
bcm53xx/patches-5.15/036-v6.5-0003-ARM-dts-BCM5301X-Drop-clock-names-from-the-SPI-node.patch[5]
bcm53xx/patches-5.15/036-v6.5-0015-ARM-dts-BCM5301X-fix-duplex-full-full-duplex.patch[6]
ipq807x/patches-5.15/0048-v6.1-clk-qcom-reset-Allow-specifying-custom-reset-delay.patch[7]
ipq807x/patches-5.15/0049-v6.2-clk-qcom-reset-support-resetting-multiple-bits.patch[8]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=02474292a44205c1eb5a03634ead155a3c9134f4
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=86b93cbfe104e99fd3d25a49748b99fb88101573
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=79b9ab357b6f5675007f4c02ff8765cbd8dc06a2
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=d528faa9e828b9fc46dfb684a2a9fd8c2e860ed8
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=5899bc4058e89d5110a23797ff94439c53b77c25
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=95afd2c7c7d26087730dc938709e025a303e5499
7. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=40844343a8853a08b049d50c967e2a1e28f0ece6
8. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=6ad5ded420f5d96f7c65b68135f5787a1c7e58d7
Build system: x86/64
Build-tested: ramips/tplink_archer-a6-v3
Run-tested: ramips/tplink_archer-a6-v3
Co-authored-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: John Audia <therealgraysky@proton.me>
[rebased ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch ]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 8590531048)
[Refreshed on top of openwrt-23.05]
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
From 697c3892d825fb78f42ec8e53bed065dd728db3e Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 30 Jan 2023 02:04:57 +0000
|
|
Subject: [PATCH] regmap: apply reg_base and reg_downshift for single register
|
|
ops
|
|
|
|
reg_base and reg_downshift currently don't have any effect if used with
|
|
a regmap_bus or regmap_config which only offers single register
|
|
operations (ie. reg_read, reg_write and optionally reg_update_bits).
|
|
|
|
Fix that and take them into account also for regmap_bus with only
|
|
reg_read and read_write operations by applying reg_base and
|
|
reg_downshift in _regmap_bus_reg_write, _regmap_bus_reg_read.
|
|
|
|
Also apply reg_base and reg_downshift in _regmap_update_bits, but only
|
|
in case the operation is carried out with a reg_update_bits call
|
|
defined in either regmap_bus or regmap_config.
|
|
|
|
Fixes: 0074f3f2b1e43d ("regmap: allow a defined reg_base to be added to every address")
|
|
Fixes: 86fc59ef818beb ("regmap: add configurable downshift for addresses")
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
Tested-by: Colin Foster <colin.foster@in-advantage.com>
|
|
Link: https://lore.kernel.org/r/Y9clyVS3tQEHlUhA@makrotopia.org
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/base/regmap/regmap.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
--- a/drivers/base/regmap/regmap.c
|
|
+++ b/drivers/base/regmap/regmap.c
|
|
@@ -1929,6 +1929,8 @@ static int _regmap_bus_reg_write(void *c
|
|
{
|
|
struct regmap *map = context;
|
|
|
|
+ reg += map->reg_base;
|
|
+ reg >>= map->format.reg_downshift;
|
|
return map->bus->reg_write(map->bus_context, reg, val);
|
|
}
|
|
|
|
@@ -2703,6 +2705,8 @@ static int _regmap_bus_reg_read(void *co
|
|
{
|
|
struct regmap *map = context;
|
|
|
|
+ reg += map->reg_base;
|
|
+ reg >>= map->format.reg_downshift;
|
|
return map->bus->reg_read(map->bus_context, reg, val);
|
|
}
|
|
|
|
@@ -3078,6 +3082,8 @@ static int _regmap_update_bits(struct re
|
|
*change = false;
|
|
|
|
if (regmap_volatile(map, reg) && map->reg_update_bits) {
|
|
+ reg += map->reg_base;
|
|
+ reg >>= map->format.reg_downshift;
|
|
ret = map->reg_update_bits(map->bus_context, reg, mask, val);
|
|
if (ret == 0 && change)
|
|
*change = true;
|