mfd: mt6360: Remove handle_post_irq callback function

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 <gene_chen@richtek.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/mt6360-core.c b/drivers/mfd/mt6360-core.c
index a1d74bb..50a1700 100644 (file)
--- a/drivers/mfd/mt6360-core.c
+++ b/drivers/mfd/mt6360-core.c
@@ -209,15 +209,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_ddata *ddata = irq_drv_data;
-
-       return regmap_update_bits(ddata->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,
@@ -226,7 +219,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,9 @@ static int mt6360_probe(struct i2c_client *client)
                return -ENODEV;
        }
 
-       mt6360_irq_chip.irq_drv_data = ddata;
        ret = devm_regmap_add_irq_chip(&client->dev, ddata->regmap, client->irq,
-                                      IRQF_TRIGGER_FALLING, 0,
-                                      &mt6360_irq_chip, &ddata->irq_data);
+                                      0, 0, &mt6360_irq_chip,
+                                      &ddata->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 81bca7c..ef8257d 100644 (file)
--- a/include/linux/mfd/mt6360.h
+++ b/include/linux/mfd/mt6360.h
@@ -230,7 +230,7 @@ struct mt6360_ddata {
 #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