From: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
To: Johan Hovold <johan+linaro@kernel.org>,
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
Subject: Re: [PATCH 11/13] mfd: pm8008: rework driver
Date: Wed, 8 May 2024 18:56:28 +0100 [thread overview]
Message-ID: <f838a43a-e7a1-427d-ade7-f0793474a634@linaro.org> (raw)
In-Reply-To: <20240506150830.23709-12-johan+linaro@kernel.org>
On 06/05/2024 16:08, Johan Hovold wrote:
> Rework the pm8008 driver to match the new binding which no longer
> describes internal details like interrupts and register offsets
> (including which of the two consecutive I2C addresses the registers
> belong two).
>
> Instead make the interrupt controller implementation internal and pass
> interrupts to the subdrivers using MFD cell resources.
>
> Note that subdrivers may either get their resources, like register block
> offsets, from the parent MFD or this can be included in the subdrivers
> directly.
>
> In the current implementation, the temperature alarm driver is generic
> enough to just get its base address and alarm interrupt from the parent
> driver, which already uses this information to implement the interrupt
> controller.
>
> The regulator driver, however, needs additional information like parent
> supplies and regulator characteristics so in that case it is easier to
> just augment its table with the regulator register base addresses.
>
> Similarly, the current GPIO driver already holds the number of pins and
> that lookup table can therefore also be extended with register offsets.
>
> Note that subdrivers can now access the two regmaps by name, even if the
> primary regmap is registered last so that it's returned by default when
> no name is provided in lookups.
>
> Finally, note that the current QPNP GPIO and temperature alarm
> subdrivers need some minor rework before they can be used with non-SPMI
> devices like the PM8008. The MFD cell names therefore use a "qpnp"
> rather than "spmi" prefix to prevent binding until the drivers have been
> updated.
>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> ---
> drivers/mfd/Kconfig | 1 +
> drivers/mfd/qcom-pm8008.c | 95 +++++++++++++++++++++++----
> include/dt-bindings/mfd/qcom-pm8008.h | 19 ------
> 3 files changed, 85 insertions(+), 30 deletions(-)
> delete mode 100644 include/dt-bindings/mfd/qcom-pm8008.h
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index 4b023ee229cf..bfcb68c62b07 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -2208,6 +2208,7 @@ config MFD_ACER_A500_EC
> config MFD_QCOM_PM8008
> tristate "QCOM PM8008 Power Management IC"
> depends on I2C && OF
> + select MFD_CORE
> select REGMAP_I2C
> select REGMAP_IRQ
> help
> diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
> index c7a4f8a60cd4..706a725428dd 100644
> --- a/drivers/mfd/qcom-pm8008.c
> +++ b/drivers/mfd/qcom-pm8008.c
> @@ -7,8 +7,10 @@
> #include <linux/gpio/consumer.h>
> #include <linux/i2c.h>
> #include <linux/interrupt.h>
> +#include <linux/ioport.h>
> #include <linux/irq.h>
> #include <linux/irqdomain.h>
> +#include <linux/mfd/core.h>
> #include <linux/module.h>
> #include <linux/of.h>
> #include <linux/of_platform.h>
> @@ -16,8 +18,6 @@
> #include <linux/regmap.h>
> #include <linux/slab.h>
>
> -#include <dt-bindings/mfd/qcom-pm8008.h>
> -
> #define I2C_INTR_STATUS_BASE 0x0550
> #define INT_RT_STS_OFFSET 0x10
> #define INT_SET_TYPE_OFFSET 0x11
> @@ -45,6 +45,16 @@ enum {
> #define PM8008_GPIO1_ADDR PM8008_PERIPH_2_BASE
> #define PM8008_GPIO2_ADDR PM8008_PERIPH_3_BASE
>
> +/* PM8008 IRQ numbers */
> +#define PM8008_IRQ_MISC_UVLO 0
> +#define PM8008_IRQ_MISC_OVLO 1
> +#define PM8008_IRQ_MISC_OTST2 2
> +#define PM8008_IRQ_MISC_OTST3 3
> +#define PM8008_IRQ_MISC_LDO_OCP 4
> +#define PM8008_IRQ_TEMP_ALARM 5
> +#define PM8008_IRQ_GPIO1 6
> +#define PM8008_IRQ_GPIO2 7
> +
> enum {
> SET_TYPE_INDEX,
> POLARITY_HI_INDEX,
> @@ -150,21 +160,65 @@ static const struct regmap_irq_chip pm8008_irq_chip = {
> .get_irq_reg = pm8008_get_irq_reg,
> };
>
> -static struct regmap_config qcom_mfd_regmap_cfg = {
> +static const struct regmap_config qcom_mfd_regmap_cfg = {
> + .name = "primary",
> + .reg_bits = 16,
> + .val_bits = 8,
> + .max_register = 0xffff,
> +};
> +
> +static const struct regmap_config pm8008_regmap_cfg_2 = {
> + .name = "secondary",
> .reg_bits = 16,
> .val_bits = 8,
> .max_register = 0xffff,
> };
>
> +static const struct resource pm8008_temp_res[] = {
> + DEFINE_RES_MEM(PM8008_TEMP_ALARM_ADDR, 0x100),
> + DEFINE_RES_IRQ(PM8008_IRQ_TEMP_ALARM),
> +};
> +
> +static const struct mfd_cell pm8008_cells[] = {
> + MFD_CELL_NAME("qcom-pm8008-regulator"),
> + MFD_CELL_RES("qpnp-temp-alarm", pm8008_temp_res),
> + MFD_CELL_NAME("qpnp-gpio"),
> +};
> +
> +static void devm_irq_domain_fwnode_release(void *res)
> +{
> + struct fwnode_handle *fwnode = res;
> +
> + irq_domain_free_fwnode(fwnode);
> +}
> +
> static int pm8008_probe(struct i2c_client *client)
> {
> struct regmap_irq_chip_data *irq_data;
> + struct device *dev = &client->dev;
> + struct regmap *regmap, *regmap2;
> + struct fwnode_handle *fwnode;
> + struct i2c_client *dummy;
> struct gpio_desc *reset;
> + char *name;
> int rc;
> - struct device *dev;
> - struct regmap *regmap;
>
> - dev = &client->dev;
> + dummy = devm_i2c_new_dummy_device(dev, client->adapter, client->addr + 1);
> + if (IS_ERR(dummy)) {
> + rc = PTR_ERR(dummy);
> + dev_err(&client->dev, "failed to claim second address: %d\n", rc);
> + return rc;
> + }
> +
> + regmap2 = devm_regmap_init_i2c(dummy, &qcom_mfd_regmap_cfg);
> + if (IS_ERR(regmap2))
> + return PTR_ERR(regmap2);
> +
> + rc = regmap_attach_dev(dev, regmap2, &pm8008_regmap_cfg_2);
> + if (rc)
> + return rc;
> +
> + /* Default regmap must be attached last. */
> regmap = devm_regmap_init_i2c(client, &qcom_mfd_regmap_cfg);
> if (IS_ERR(regmap))
> return PTR_ERR(regmap);
> @@ -173,14 +227,33 @@ static int pm8008_probe(struct i2c_client *client)
> if (IS_ERR(reset))
> return PTR_ERR(reset);
>
> - if (of_property_read_bool(dev->of_node, "interrupt-controller")) {
> - rc = devm_regmap_add_irq_chip(dev, regmap, client->irq,
> + name = devm_kasprintf(dev, GFP_KERNEL, "%pOF-internal", dev->of_node);
> + if (!name)
> + return -ENOMEM;
> +
> + name = strreplace(name, '/', ':');
> +
> + fwnode = irq_domain_alloc_named_fwnode(name);
> + if (!fwnode)
> + return -ENOMEM;
> +
> + rc = devm_add_action_or_reset(dev, devm_irq_domain_fwnode_release, fwnode);
> + if (rc)
> + return rc;
> +
> + rc = devm_regmap_add_irq_chip_fwnode(dev, fwnode, regmap, client->irq,
> IRQF_SHARED, 0, &pm8008_irq_chip, &irq_data);
> - if (rc)
> - dev_err(dev, "failed to add IRQ chip: %d\n", rc);
> + if (rc) {
> + dev_err(dev, "failed to add IRQ chip: %d\n", rc);
> + return rc;
> }
>
> - return devm_of_platform_populate(dev);
> + /* Needed by GPIO driver. */
> + dev_set_drvdata(dev, regmap_irq_get_domain(irq_data));
> +
> + return devm_mfd_add_devices(dev, PLATFORM_DEVID_AUTO, pm8008_cells,
> + ARRAY_SIZE(pm8008_cells), NULL, 0,
> + regmap_irq_get_domain(irq_data));
> }
>
> static const struct of_device_id pm8008_match[] = {
> diff --git a/include/dt-bindings/mfd/qcom-pm8008.h b/include/dt-bindings/mfd/qcom-pm8008.h
> deleted file mode 100644
> index eca9448df228..000000000000
> --- a/include/dt-bindings/mfd/qcom-pm8008.h
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> -/*
> - * Copyright (c) 2021 The Linux Foundation. All rights reserved.
> - */
> -
> -#ifndef __DT_BINDINGS_MFD_QCOM_PM8008_H
> -#define __DT_BINDINGS_MFD_QCOM_PM8008_H
> -
> -/* PM8008 IRQ numbers */
> -#define PM8008_IRQ_MISC_UVLO 0
> -#define PM8008_IRQ_MISC_OVLO 1
> -#define PM8008_IRQ_MISC_OTST2 2
> -#define PM8008_IRQ_MISC_OTST3 3
> -#define PM8008_IRQ_MISC_LDO_OCP 4
> -#define PM8008_IRQ_TEMP_ALARM 5
> -#define PM8008_IRQ_GPIO1 6
> -#define PM8008_IRQ_GPIO2 7
> -
> -#endif
Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
next prev parent reply other threads:[~2024-05-08 17:56 UTC|newest]
Thread overview: 83+ 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-27 13:32 ` Linus Walleij
2024-05-06 15:08 ` [PATCH 02/13] mfd: pm8008: fix regmap irq chip initialisation Johan Hovold
2024-05-06 18:56 ` 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-29 16:17 ` Johan Hovold
2024-05-29 18:52 ` Bryan O'Donoghue
2024-05-27 13:39 ` Linus Walleij
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-27 13:35 ` Linus Walleij
2024-05-29 16:12 ` Johan Hovold
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-22 6:49 ` Johan Hovold
2024-05-22 7:13 ` Andy Shevchenko
2024-05-22 8:00 ` Johan Hovold
2024-05-08 17:56 ` Bryan O'Donoghue [this message]
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-29 16:04 ` Johan Hovold
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-29 15:55 ` 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=f838a43a-e7a1-427d-ade7-f0793474a634@linaro.org \
--to=bryan.odonoghue@linaro.org \
--cc=andersson@kernel.org \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=johan+linaro@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).