From: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
To: linus.walleij@linaro.org, brgl@bgdev.pl, robh+dt@kernel.org,
krzysztof.kozlowski+dt@linaro.org, wens@csie.org,
jic23@kernel.org, lee.jones@linaro.org, sre@kernel.org,
broonie@kernel.org, gregkh@linuxfoundation.org,
lgirdwood@gmail.com
Cc: lars@metafoo.de, rafael@kernel.org, quic_gurus@quicinc.com,
sebastian.reichel@collabora.com, andy.shevchenko@gmail.com,
michael@walle.cc, linux-gpio@vger.kernel.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-iio@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH v3 01/16] regmap-irq: Use sub_irq_reg() to calculate unmask register address
Date: Sat, 18 Jun 2022 22:39:54 +0100 [thread overview]
Message-ID: <20220618214009.2178567-2-aidanmacdonald.0x0@gmail.com> (raw)
In-Reply-To: <20220618214009.2178567-1-aidanmacdonald.0x0@gmail.com>
Call sub_irq_reg() instead of calculating the offset of the register
to avoid relying on the fact that sub_irq_reg() is a linear function
of "base_reg" and "i".
Unmask registers were the only type that didn't use sub_irq_reg() for
address calculation; thus, sub_irq_reg() is now the only method used
to obtain register addresses.
This prepares for allowing drivers to override the default sub_irq_reg
implementation if the default behavior is unsuitable.
Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
---
drivers/base/regmap/regmap-irq.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 400c7412a7dc..4a2e1f6aa94d 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -97,7 +97,6 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
struct regmap *map = d->map;
int i, j, ret;
u32 reg;
- u32 unmask_offset;
u32 val;
if (d->chip->runtime_pm) {
@@ -141,11 +140,11 @@ static void regmap_irq_sync_unlock(struct irq_data *data)
dev_err(d->map->dev,
"Failed to sync unmasks in %x\n",
reg);
- unmask_offset = d->chip->unmask_base -
- d->chip->mask_base;
+
/* clear mask with unmask_base register */
+ reg = sub_irq_reg(d, d->chip->unmask_base, i);
ret = regmap_irq_update_bits(d,
- reg + unmask_offset,
+ reg,
d->mask_buf_def[i],
d->mask_buf[i]);
} else {
@@ -632,7 +631,6 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
int ret = -ENOMEM;
int num_type_reg;
u32 reg;
- u32 unmask_offset;
if (chip->num_regs <= 0)
return -EINVAL;
@@ -773,10 +771,9 @@ int regmap_add_irq_chip_fwnode(struct fwnode_handle *fwnode,
ret = regmap_irq_update_bits(d, reg,
d->mask_buf[i], ~d->mask_buf[i]);
else if (d->chip->unmask_base) {
- unmask_offset = d->chip->unmask_base -
- d->chip->mask_base;
+ reg = sub_irq_reg(d, d->chip->unmask_base, i);
ret = regmap_irq_update_bits(d,
- reg + unmask_offset,
+ reg,
d->mask_buf[i],
d->mask_buf[i]);
} else
--
2.35.1
next prev parent reply other threads:[~2022-06-18 21:40 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-18 21:39 [PATCH v3 00/16] Add support for AXP192 PMIC Aidan MacDonald
2022-06-18 21:39 ` Aidan MacDonald [this message]
2022-06-18 21:39 ` [PATCH v3 02/16] regmap-irq: Add get_irq_reg to support unusual register layouts Aidan MacDonald
2022-06-18 21:39 ` [PATCH v3 03/16] dt-bindings: mfd: add bindings for AXP192 MFD device Aidan MacDonald
2022-06-19 3:21 ` Chen-Yu Tsai
2022-06-18 21:39 ` [PATCH v3 04/16] dt-bindings: iio: adc: axp209: Add AXP192 compatible Aidan MacDonald
2022-06-19 3:26 ` Chen-Yu Tsai
2022-06-18 21:39 ` [PATCH v3 05/16] dt-bindings: power: supply: axp20x: " Aidan MacDonald
2022-06-19 3:34 ` Chen-Yu Tsai
2022-06-18 21:39 ` [PATCH v3 06/16] dt-bindings: gpio: Add AXP192 GPIO bindings Aidan MacDonald
2022-06-19 11:12 ` Krzysztof Kozlowski
2022-06-19 17:20 ` Rob Herring
2022-06-18 21:40 ` [PATCH v3 07/16] dt-bindings: power: axp20x-battery: Add AXP192 compatible Aidan MacDonald
2022-06-18 21:40 ` [PATCH v3 08/16] mfd: axp20x: Add support for AXP192 Aidan MacDonald
2022-06-19 10:44 ` Andy Shevchenko
2022-06-18 21:40 ` [PATCH v3 09/16] regulator: " Aidan MacDonald
2022-06-19 10:46 ` Andy Shevchenko
2022-06-18 21:40 ` [PATCH v3 10/16] iio: adc: axp20x_adc: Minor code cleanups Aidan MacDonald
2022-06-19 3:56 ` Chen-Yu Tsai
2022-06-19 11:01 ` Jonathan Cameron
2022-06-19 10:51 ` Andy Shevchenko
2022-06-18 21:40 ` [PATCH v3 11/16] iio: adc: axp20x_adc: Add support for AXP192 Aidan MacDonald
2022-06-19 10:55 ` Andy Shevchenko
2022-06-19 11:13 ` Jonathan Cameron
2022-06-19 15:11 ` Aidan MacDonald
2022-06-18 21:40 ` [PATCH v3 12/16] power: supply: axp20x_usb_power: " Aidan MacDonald
2022-06-19 3:34 ` Chen-Yu Tsai
2022-06-19 11:02 ` Andy Shevchenko
2022-06-18 21:40 ` [PATCH v3 13/16] pinctrl: Add AXP192 pin control driver Aidan MacDonald
2022-06-18 21:59 ` Randy Dunlap
2022-06-19 11:20 ` Andy Shevchenko
2022-06-19 11:25 ` Andy Shevchenko
2022-06-27 8:10 ` Michael Walle
2022-06-27 13:12 ` Aidan MacDonald
2022-06-30 7:26 ` Michael Walle
2022-07-01 15:51 ` Aidan MacDonald
2022-06-18 21:40 ` [PATCH v3 14/16] power: axp20x_battery: Add constant charge current table Aidan MacDonald
2022-06-19 11:29 ` Andy Shevchenko
2022-06-18 21:40 ` [PATCH v3 15/16] power: axp20x_battery: Support battery status without fuel gauge Aidan MacDonald
2022-06-18 21:40 ` [PATCH v3 16/16] power: axp20x_battery: Add support for AXP192 Aidan MacDonald
[not found] ` <CAHp75VfrzQFq4u0vMtPM7LRYNcQQC-padQ1yyFijbpWx8_LwBQ@mail.gmail.com>
2022-06-19 11:17 ` [PATCH v3 00/16] Add support for AXP192 PMIC Jonathan Cameron
2022-06-19 11:12 ` Andy Shevchenko
2022-06-19 14:54 ` Aidan MacDonald
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220618214009.2178567-2-aidanmacdonald.0x0@gmail.com \
--to=aidanmacdonald.0x0@gmail.com \
--cc=andy.shevchenko@gmail.com \
--cc=brgl@bgdev.pl \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=jic23@kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lars@metafoo.de \
--cc=lee.jones@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=michael@walle.cc \
--cc=quic_gurus@quicinc.com \
--cc=rafael@kernel.org \
--cc=robh+dt@kernel.org \
--cc=sebastian.reichel@collabora.com \
--cc=sre@kernel.org \
--cc=wens@csie.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).