df167450a5
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.139 Removed upstreamed: backport-5.15/830-v6.6-2-leds-turris-omnia-Drop-unnecessary-mutex-locking.patch[1] backport-5.15/830-v6.7-1-leds-turris-omnia-Do-not-use-SMBUS-calls.patch[2] x86/patches-5.15/120-hwrng-geode-fix-accessing-registers.patch[3] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.139&id=aec3706971b332af8321b2beccba981b8061489a 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.139&id=893eedf596dd81c7a7f0cd80b345956ae000eab9 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.139&id=a5c83c8043d70b9a28d1bd78a2dbbab340f43889 Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
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
|
|
@@ -1931,6 +1931,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);
|
|
}
|
|
|
|
@@ -2705,6 +2707,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);
|
|
}
|
|
|
|
@@ -3080,6 +3084,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;
|