1 files changed, 225 insertions, 9 deletions

diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
index ce054654f5bb..d79277204835 100644
--- a/drivers/mfd/tps65910.c
+++ b/drivers/mfd/tps65910.c
@@ -19,6 +19,9 @@
 #include <linux/err.h>
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/irqdomain.h>
 #include <linux/mfd/core.h>
 #include <linux/regmap.h>
 #include <linux/mfd/tps65910.h>
@@ -50,6 +53,219 @@ static struct mfd_cell tps65910s[] = {
 };
 
 
+static const struct regmap_irq tps65911_irqs[] = {
+        /* INT_STS */
+        [TPS65911_IRQ_PWRHOLD_F] = {
+                .mask = INT_MSK_PWRHOLD_F_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65911_IRQ_VBAT_VMHI] = {
+                .mask = INT_MSK_VMBHI_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65911_IRQ_PWRON] = {
+                .mask = INT_MSK_PWRON_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65911_IRQ_PWRON_LP] = {
+                .mask = INT_MSK_PWRON_LP_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65911_IRQ_PWRHOLD_R] = {
+                .mask = INT_MSK_PWRHOLD_R_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65911_IRQ_HOTDIE] = {
+                .mask = INT_MSK_HOTDIE_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65911_IRQ_RTC_ALARM] = {
+                .mask = INT_MSK_RTC_ALARM_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65911_IRQ_RTC_PERIOD] = {
+                .mask = INT_MSK_RTC_PERIOD_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+
+        /* INT_STS2 */
+        [TPS65911_IRQ_GPIO0_R] = {
+                .mask = INT_MSK2_GPIO0_R_IT_MSK_MASK,
+                .reg_offset = 1,
+        },
+        [TPS65911_IRQ_GPIO0_F] = {
+                .mask = INT_MSK2_GPIO0_F_IT_MSK_MASK,
+                .reg_offset = 1,
+        },
+        [TPS65911_IRQ_GPIO1_R] = {
+                .mask = INT_MSK2_GPIO1_R_IT_MSK_MASK,
+                .reg_offset = 1,
+        },
+        [TPS65911_IRQ_GPIO1_F] = {
+                .mask = INT_MSK2_GPIO1_F_IT_MSK_MASK,
+                .reg_offset = 1,
+        },
+        [TPS65911_IRQ_GPIO2_R] = {
+                .mask = INT_MSK2_GPIO2_R_IT_MSK_MASK,
+                .reg_offset = 1,
+        },
+        [TPS65911_IRQ_GPIO2_F] = {
+                .mask = INT_MSK2_GPIO2_F_IT_MSK_MASK,
+                .reg_offset = 1,
+        },
+        [TPS65911_IRQ_GPIO3_R] = {
+                .mask = INT_MSK2_GPIO3_R_IT_MSK_MASK,
+                .reg_offset = 1,
+        },
+        [TPS65911_IRQ_GPIO3_F] = {
+                .mask = INT_MSK2_GPIO3_F_IT_MSK_MASK,
+                .reg_offset = 1,
+        },
+
+        /* INT_STS2 */
+        [TPS65911_IRQ_GPIO4_R] = {
+                .mask = INT_MSK3_GPIO4_R_IT_MSK_MASK,
+                .reg_offset = 2,
+        },
+        [TPS65911_IRQ_GPIO4_F] = {
+                .mask = INT_MSK3_GPIO4_F_IT_MSK_MASK,
+                .reg_offset = 2,
+        },
+        [TPS65911_IRQ_GPIO5_R] = {
+                .mask = INT_MSK3_GPIO5_R_IT_MSK_MASK,
+                .reg_offset = 2,
+        },
+        [TPS65911_IRQ_GPIO5_F] = {
+                .mask = INT_MSK3_GPIO5_F_IT_MSK_MASK,
+                .reg_offset = 2,
+        },
+        [TPS65911_IRQ_WTCHDG] = {
+                .mask = INT_MSK3_WTCHDG_IT_MSK_MASK,
+                .reg_offset = 2,
+        },
+        [TPS65911_IRQ_VMBCH2_H] = {
+                .mask = INT_MSK3_VMBCH2_H_IT_MSK_MASK,
+                .reg_offset = 2,
+        },
+        [TPS65911_IRQ_VMBCH2_L] = {
+                .mask = INT_MSK3_VMBCH2_L_IT_MSK_MASK,
+                .reg_offset = 2,
+        },
+        [TPS65911_IRQ_PWRDN] = {
+                .mask = INT_MSK3_PWRDN_IT_MSK_MASK,
+                .reg_offset = 2,
+        },
+};
+
+static const struct regmap_irq tps65910_irqs[] = {
+        /* INT_STS */
+        [TPS65910_IRQ_VBAT_VMBDCH] = {
+                .mask = TPS65910_INT_MSK_VMBDCH_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65910_IRQ_VBAT_VMHI] = {
+                .mask = TPS65910_INT_MSK_VMBHI_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65910_IRQ_PWRON] = {
+                .mask = TPS65910_INT_MSK_PWRON_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65910_IRQ_PWRON_LP] = {
+                .mask = TPS65910_INT_MSK_PWRON_LP_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65910_IRQ_PWRHOLD] = {
+                .mask = TPS65910_INT_MSK_PWRHOLD_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65910_IRQ_HOTDIE] = {
+                .mask = TPS65910_INT_MSK_HOTDIE_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65910_IRQ_RTC_ALARM] = {
+                .mask = TPS65910_INT_MSK_RTC_ALARM_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+        [TPS65910_IRQ_RTC_PERIOD] = {
+                .mask = TPS65910_INT_MSK_RTC_PERIOD_IT_MSK_MASK,
+                .reg_offset = 0,
+        },
+
+        /* INT_STS2 */
+        [TPS65910_IRQ_GPIO_R] = {
+                .mask = TPS65910_INT_MSK2_GPIO0_F_IT_MSK_MASK,
+                .reg_offset = 1,
+        },
+        [TPS65910_IRQ_GPIO_F] = {
+                .mask = TPS65910_INT_MSK2_GPIO0_R_IT_MSK_MASK,
+                .reg_offset = 1,
+        },
+};
+
+static struct regmap_irq_chip tps65911_irq_chip = {
+        .name = "tps65910",
+        .irqs = tps65911_irqs,
+        .num_irqs = ARRAY_SIZE(tps65911_irqs),
+        .num_regs = 3,
+        .irq_reg_stride = 2,
+        .status_base = TPS65910_INT_STS,
+        .mask_base = TPS65910_INT_MSK,
+        .ack_base = TPS65910_INT_STS,
+};
+
+static struct regmap_irq_chip tps65910_irq_chip = {
+        .name = "tps65910",
+        .irqs = tps65910_irqs,
+        .num_irqs = ARRAY_SIZE(tps65910_irqs),
+        .num_regs = 2,
+        .irq_reg_stride = 2,
+        .status_base = TPS65910_INT_STS,
+        .mask_base = TPS65910_INT_MSK,
+        .ack_base = TPS65910_INT_STS,
+};
+
+static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
+                    struct tps65910_platform_data *pdata)
+{
+        int ret = 0;
+        static struct regmap_irq_chip *tps6591x_irqs_chip;
+
+        if (!irq) {
+                dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
+                return -EINVAL;
+        }
+
+        if (!pdata) {
+                dev_warn(tps65910->dev, "No interrupt support, no pdata\n");
+                return -EINVAL;
+        }
+
+        switch (tps65910_chip_id(tps65910)) {
+        case TPS65910:
+                tps6591x_irqs_chip = &tps65910_irq_chip;
+                break;
+        case TPS65911:
+                tps6591x_irqs_chip = &tps65911_irq_chip;
+                break;
+        }
+
+        tps65910->chip_irq = irq;
+        ret = regmap_add_irq_chip(tps65910->regmap, tps65910->chip_irq,
+                IRQF_ONESHOT, pdata->irq_base,
+                tps6591x_irqs_chip, &tps65910->irq_data);
+        if (ret < 0)
+                dev_warn(tps65910->dev, "Failed to add irq_chip %d\n", ret);
+        return ret;
+}
+
+static int tps65910_irq_exit(struct tps65910 *tps65910)
+{
+        if (tps65910->chip_irq > 0)
+                regmap_del_irq_chip(tps65910->chip_irq, tps65910->irq_data);
+        return 0;
+}
+
 static bool is_volatile_reg(struct device *dev, unsigned int reg)
 {
         struct tps65910 *tps65910 = dev_get_drvdata(dev);
@@ -270,7 +486,6 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
         tps65910->dev = &i2c->dev;
         tps65910->i2c_client = i2c;
         tps65910->id = chip_id;
-        mutex_init(&tps65910->io_mutex);
 
         tps65910->regmap = devm_regmap_init_i2c(i2c, &tps65910_regmap_config);
         if (IS_ERR(tps65910->regmap)) {
@@ -279,14 +494,6 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
                 return ret;
         }
 
-        ret = mfd_add_devices(tps65910->dev, -1,
-                              tps65910s, ARRAY_SIZE(tps65910s),
-                              NULL, 0, NULL);
-        if (ret < 0) {
-                dev_err(&i2c->dev, "mfd_add_devices failed: %d\n", ret);
-                return ret;
-        }
-
         init_data->irq = pmic_plat_data->irq;
         init_data->irq_base = pmic_plat_data->irq_base;
 
@@ -299,6 +506,15 @@ static int tps65910_i2c_probe(struct i2c_client *i2c,
                 pm_power_off = tps65910_power_off;
         }
 
+        ret = mfd_add_devices(tps65910->dev, -1,
+                              tps65910s, ARRAY_SIZE(tps65910s),
+                              NULL, 0,
+                              regmap_irq_get_domain(tps65910->irq_data));
+        if (ret < 0) {
+                dev_err(&i2c->dev, "mfd_add_devices failed: %d\n", ret);
+                return ret;
+        }
+
         return ret;
 }