From: Johan Hovold <johan+linaro@kernel.org>
To: Lee Jones <lee@kernel.org>, Mark Brown <broonie@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Bjorn Andersson <andersson@kernel.org>
Cc: Konrad Dybcio <konrad.dybcio@linaro.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Das Srinagesh <quic_gurus@quicinc.com>,
Satya Priya <quic_c_skakit@quicinc.com>,
Stephen Boyd <swboyd@chromium.org>,
linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org,
Johan Hovold <johan+linaro@kernel.org>
Subject: [PATCH 02/13] mfd: pm8008: fix regmap irq chip initialisation
Date: Mon, 6 May 2024 17:08:19 +0200 [thread overview]
Message-ID: <20240506150830.23709-3-johan+linaro@kernel.org> (raw)
In-Reply-To: <20240506150830.23709-1-johan+linaro@kernel.org>
The regmap irq array is potentially shared between multiple PMICs and
should only contain static data.
Use a custom macro to initialise also the type fields and drop the
unnecessary updates on each probe.
Fixes: 6b149f3310a4 ("mfd: pm8008: Add driver for QCOM PM8008 PMIC")
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
drivers/mfd/qcom-pm8008.c | 66 +++++++++++++++------------------------
1 file changed, 25 insertions(+), 41 deletions(-)
diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
index 3ac3742f438b..d53c987b0d49 100644
--- a/drivers/mfd/qcom-pm8008.c
+++ b/drivers/mfd/qcom-pm8008.c
@@ -56,15 +56,27 @@ static unsigned int pm8008_config_regs[] = {
INT_POL_LOW_OFFSET,
};
-static struct regmap_irq pm8008_irqs[] = {
- REGMAP_IRQ_REG(PM8008_IRQ_MISC_UVLO, PM8008_MISC, BIT(0)),
- REGMAP_IRQ_REG(PM8008_IRQ_MISC_OVLO, PM8008_MISC, BIT(1)),
- REGMAP_IRQ_REG(PM8008_IRQ_MISC_OTST2, PM8008_MISC, BIT(2)),
- REGMAP_IRQ_REG(PM8008_IRQ_MISC_OTST3, PM8008_MISC, BIT(3)),
- REGMAP_IRQ_REG(PM8008_IRQ_MISC_LDO_OCP, PM8008_MISC, BIT(4)),
- REGMAP_IRQ_REG(PM8008_IRQ_TEMP_ALARM, PM8008_TEMP_ALARM, BIT(0)),
- REGMAP_IRQ_REG(PM8008_IRQ_GPIO1, PM8008_GPIO1, BIT(0)),
- REGMAP_IRQ_REG(PM8008_IRQ_GPIO2, PM8008_GPIO2, BIT(0)),
+#define _IRQ(_irq, _off, _mask, _types) \
+ [_irq] = { \
+ .reg_offset = (_off), \
+ .mask = (_mask), \
+ .type = { \
+ .type_reg_offset = (_off), \
+ .types_supported = (_types), \
+ }, \
+ }
+
+#define _IRQ_TYPE_ALL (IRQ_TYPE_EDGE_BOTH | IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)
+
+static const struct regmap_irq pm8008_irqs[] = {
+ _IRQ(PM8008_IRQ_MISC_UVLO, PM8008_MISC, BIT(0), IRQ_TYPE_EDGE_RISING),
+ _IRQ(PM8008_IRQ_MISC_OVLO, PM8008_MISC, BIT(1), IRQ_TYPE_EDGE_RISING),
+ _IRQ(PM8008_IRQ_MISC_OTST2, PM8008_MISC, BIT(2), IRQ_TYPE_EDGE_RISING),
+ _IRQ(PM8008_IRQ_MISC_OTST3, PM8008_MISC, BIT(3), IRQ_TYPE_EDGE_RISING),
+ _IRQ(PM8008_IRQ_MISC_LDO_OCP, PM8008_MISC, BIT(4), IRQ_TYPE_EDGE_RISING),
+ _IRQ(PM8008_IRQ_TEMP_ALARM, PM8008_TEMP_ALARM,BIT(0), _IRQ_TYPE_ALL),
+ _IRQ(PM8008_IRQ_GPIO1, PM8008_GPIO1, BIT(0), _IRQ_TYPE_ALL),
+ _IRQ(PM8008_IRQ_GPIO2, PM8008_GPIO2, BIT(0), _IRQ_TYPE_ALL),
};
static const unsigned int pm8008_periph_base[] = {
@@ -143,38 +155,9 @@ static struct regmap_config qcom_mfd_regmap_cfg = {
.max_register = 0xFFFF,
};
-static int pm8008_probe_irq_peripherals(struct device *dev,
- struct regmap *regmap,
- int client_irq)
-{
- int rc, i;
- struct regmap_irq_type *type;
- struct regmap_irq_chip_data *irq_data;
-
- for (i = 0; i < ARRAY_SIZE(pm8008_irqs); i++) {
- type = &pm8008_irqs[i].type;
-
- type->type_reg_offset = pm8008_irqs[i].reg_offset;
-
- if (type->type_reg_offset == PM8008_MISC)
- type->types_supported = IRQ_TYPE_EDGE_RISING;
- else
- type->types_supported = (IRQ_TYPE_EDGE_BOTH |
- IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW);
- }
-
- rc = devm_regmap_add_irq_chip(dev, regmap, client_irq,
- IRQF_SHARED, 0, &pm8008_irq_chip, &irq_data);
- if (rc) {
- dev_err(dev, "Failed to add IRQ chip: %d\n", rc);
- return rc;
- }
-
- return 0;
-}
-
static int pm8008_probe(struct i2c_client *client)
{
+ struct regmap_irq_chip_data *irq_data;
int rc;
struct device *dev;
struct regmap *regmap;
@@ -187,9 +170,10 @@ static int pm8008_probe(struct i2c_client *client)
i2c_set_clientdata(client, regmap);
if (of_property_read_bool(dev->of_node, "interrupt-controller")) {
- rc = pm8008_probe_irq_peripherals(dev, regmap, client->irq);
+ rc = devm_regmap_add_irq_chip(dev, regmap, client->irq,
+ IRQF_SHARED, 0, &pm8008_irq_chip, &irq_data);
if (rc)
- dev_err(dev, "Failed to probe irq periphs: %d\n", rc);
+ dev_err(dev, "failed to add IRQ chip: %d\n", rc);
}
return devm_of_platform_populate(dev);
--
2.43.2
next prev parent reply other threads:[~2024-05-06 15:10 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 15:08 [PATCH 00/13] arm64: dts: qcom: sc8280xp-x13s: enable pm8008 camera pmic Johan Hovold
2024-05-06 15:08 ` [PATCH 01/13] dt-bindings: mfd: pm8008: add reset gpio Johan Hovold
2024-05-07 6:38 ` Krzysztof Kozlowski
2024-05-08 21:39 ` Stephen Boyd
2024-05-06 15:08 ` Johan Hovold [this message]
2024-05-06 18:56 ` [PATCH 02/13] mfd: pm8008: fix regmap irq chip initialisation Andy Shevchenko
2024-05-07 15:01 ` Johan Hovold
2024-05-07 17:16 ` Andy Shevchenko
2024-05-09 8:49 ` Johan Hovold
2024-05-09 13:26 ` Andy Shevchenko
2024-05-06 15:08 ` [PATCH 03/13] mfd: pm8008: deassert reset on probe Johan Hovold
2024-05-06 18:57 ` Andy Shevchenko
2024-05-07 15:15 ` Johan Hovold
2024-05-08 16:12 ` Bryan O'Donoghue
2024-05-09 9:31 ` Johan Hovold
2024-05-06 15:08 ` [PATCH 04/13] mfd: pm8008: mark regmap structures as const Johan Hovold
2024-05-08 17:37 ` Bryan O'Donoghue
2024-05-08 22:03 ` Stephen Boyd
2024-05-06 15:08 ` [PATCH 05/13] mfd: pm8008: use lower case hex notation Johan Hovold
2024-05-08 17:38 ` Bryan O'Donoghue
2024-05-08 22:03 ` Stephen Boyd
2024-05-06 15:08 ` [PATCH 06/13] mfd: pm8008: rename irq chip Johan Hovold
2024-05-08 17:38 ` Bryan O'Donoghue
2024-05-08 22:04 ` Stephen Boyd
2024-05-06 15:08 ` [PATCH 07/13] mfd: pm8008: drop unused driver data Johan Hovold
2024-05-08 17:40 ` Bryan O'Donoghue
2024-05-08 22:05 ` Stephen Boyd
2024-05-06 15:08 ` [PATCH 08/13] dt-bindings: pinctrl: qcom,pmic-gpio: drop pm8008 Johan Hovold
2024-05-07 6:41 ` Krzysztof Kozlowski
2024-05-08 22:06 ` Stephen Boyd
2024-05-06 15:08 ` [PATCH 09/13] pinctrl: qcom: spmi-gpio: drop broken pm8008 support Johan Hovold
2024-05-08 17:43 ` Bryan O'Donoghue
2024-05-08 22:06 ` Stephen Boyd
2024-05-06 15:08 ` [PATCH 10/13] dt-bindings: mfd: pm8008: rework binding Johan Hovold
2024-05-07 6:43 ` Krzysztof Kozlowski
2024-05-07 15:23 ` Johan Hovold
2024-05-08 22:09 ` Stephen Boyd
2024-05-09 6:57 ` Krzysztof Kozlowski
2024-05-06 15:08 ` [PATCH 11/13] mfd: pm8008: rework driver Johan Hovold
2024-05-06 19:18 ` Andy Shevchenko
2024-05-09 9:42 ` Johan Hovold
2024-05-10 13:15 ` Andy Shevchenko
2024-05-08 17:56 ` Bryan O'Donoghue
2024-05-06 15:08 ` [PATCH 12/13] regulator: add pm8008 pmic regulator driver Johan Hovold
2024-05-06 19:09 ` Andy Shevchenko
2024-05-07 15:44 ` Johan Hovold
2024-05-07 17:22 ` Andy Shevchenko
2024-05-07 18:14 ` Krzysztof Kozlowski
2024-05-09 8:57 ` Johan Hovold
2024-05-09 10:48 ` Krzysztof Kozlowski
2024-05-09 12:26 ` Johan Hovold
2024-05-17 9:15 ` Krzysztof Kozlowski
2024-05-08 11:41 ` Mark Brown
2024-05-09 8:53 ` Johan Hovold
2024-05-09 13:24 ` Andy Shevchenko
2024-05-14 13:43 ` Satya Priya Kakitapalli
2024-05-14 22:14 ` Konrad Dybcio
2024-05-14 14:04 ` Satya Priya Kakitapalli
2024-05-14 14:18 ` Andy Shevchenko
2024-05-14 15:04 ` Satya Priya Kakitapalli (Temp)
2024-05-14 16:04 ` Andy Shevchenko
2024-05-07 11:48 ` Konrad Dybcio
2024-05-07 15:52 ` Johan Hovold
2024-05-08 17:55 ` Bryan O'Donoghue
2024-05-08 22:37 ` Stephen Boyd
2024-05-09 9:10 ` Johan Hovold
2024-05-09 12:07 ` Andy Shevchenko
2024-05-09 12:20 ` Johan Hovold
2024-05-06 15:08 ` [PATCH 13/13] arm64: dts: qcom: sc8280xp-x13s: enable pm8008 camera pmic Johan Hovold
2024-05-08 17:53 ` Bryan O'Donoghue
2024-05-06 20:40 ` [PATCH 00/13] " Rob Herring (Arm)
2024-05-09 8:42 ` Johan Hovold
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=20240506150830.23709-3-johan+linaro@kernel.org \
--to=johan+linaro@kernel.org \
--cc=andersson@kernel.org \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=krzk+dt@kernel.org \
--cc=lee@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=quic_c_skakit@quicinc.com \
--cc=quic_gurus@quicinc.com \
--cc=robh@kernel.org \
--cc=swboyd@chromium.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 read-only IMAP folder(s) and NNTP newsgroup(s).