2020-07-17 11:05:20

by Gene Chen

Subject: [PATCH v2 7/9] mfd: mt6360: Remove handle_post_irq callback function

From: Gene Chen <[email protected]>

Remove handle_post_irq which is used to retrigger irq.
Set irq level low trigger in dtsi to keep irq always be handled.

Signed-off-by: Gene Chen <[email protected]>
---
drivers/mfd/mt6360-core.c | 16 +++-------------
include/linux/mfd/mt6360.h | 2 +-
2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c
index 5dfc13e..5a68228 100644
--- a/drivers/mfd/mt6360-core.c
+++ b/drivers/mfd/mt6360-core.c
@@ -208,15 +208,8 @@ static const struct regmap_irq mt6360_irqs[] = {
REGMAP_IRQ_REG_LINE(MT6360_LDO7_PGB_EVT, 8),
};

-static int mt6360_pmu_handle_post_irq(void *irq_drv_data)
-{
- struct mt6360_data *data = irq_drv_data;
-
- return regmap_update_bits(data->regmap,
- MT6360_PMU_IRQ_SET, MT6360_IRQ_RETRIG, MT6360_IRQ_RETRIG);
-}
-
-static struct regmap_irq_chip mt6360_irq_chip = {
+static const struct regmap_irq_chip mt6360_irq_chip = {
+ .name = "mt6360_irqs",
.irqs = mt6360_irqs,
.num_irqs = ARRAY_SIZE(mt6360_irqs),
.num_regs = MT6360_PMU_IRQ_REGNUM,
@@ -225,7 +218,6 @@ static struct regmap_irq_chip mt6360_irq_chip = {
.ack_base = MT6360_PMU_CHG_IRQ1,
.init_ack_masked = true,
.use_ack = true,
- .handle_post_irq = mt6360_pmu_handle_post_irq,
};

static const struct regmap_config mt6360_pmu_regmap_config = {
@@ -339,10 +331,8 @@ static int mt6360_probe(struct i2c_client *client)
return -ENODEV;
}

- mt6360_irq_chip.irq_drv_data = data;
ret = devm_regmap_add_irq_chip(&client->dev, data->regmap, client->irq,
- IRQF_TRIGGER_FALLING, 0,
- &mt6360_irq_chip, &data->irq_data);
+ 0, 0, &mt6360_irq_chip, &data->irq_data);
if (ret) {
dev_err(&client->dev, "Failed to add Regmap IRQ Chip\n");
return ret;
diff --git a/include/linux/mfd/mt6360.h b/include/linux/mfd/mt6360.h
index fbe106c..da0fb5c 100644
--- a/include/linux/mfd/mt6360.h
+++ b/include/linux/mfd/mt6360.h
@@ -230,7 +230,7 @@ struct mt6360_data {
#define MT6360_PMU_MAXREG MT6360_PMU_LDO_MASK2

/* MT6360_PMU_IRQ_SET */
-#define MT6360_PMU_IRQ_REGNUM (MT6360_PMU_LDO_IRQ2 - MT6360_PMU_CHG_IRQ1 + 1)
+#define MT6360_PMU_IRQ_REGNUM 16
#define MT6360_IRQ_RETRIG BIT(2)

#define CHIP_VEN_MASK 0xF0
--
2.7.4

2020-07-27 12:27:54

by Lee Jones

Subject: Re: [PATCH v2 7/9] mfd: mt6360: Remove handle_post_irq callback function

On Fri, 17 Jul 2020, Gene Chen wrote:

> From: Gene Chen <[email protected]>
>
> Remove handle_post_irq which is used to retrigger irq.

s/irq/IRQ/

> Set irq level low trigger in dtsi to keep irq always be handled.

s/irq/IRQ/g

s/dtsi/Device Tree/

> Signed-off-by: Gene Chen <[email protected]>
> ---
> drivers/mfd/mt6360-core.c | 16 +++-------------
> include/linux/mfd/mt6360.h | 2 +-
> 2 files changed, 4 insertions(+), 14 deletions(-)

Once the above is fixed, please apply my:

For my own reference (apply this as-is to your sign-off block):

Acked-for-MFD-by: Lee Jones <[email protected]>

--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog