Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / max77686-irq.c

diff --git a/drivers/mfd/max77686-irq.c b/drivers/mfd/max77686-irq.c
index fc101220f990709b3fcb9e23d19c61f3b179cf59..cdc3280e2ec735ea991d3cfdf8e404d779cd181e 100644 (file)
--- a/drivers/mfd/max77686-irq.c
+++ b/drivers/mfd/max77686-irq.c
@@ -180,7 +180,7 @@ static irqreturn_t max77686_irq_thread(int irq, void *data)
                pr_info("%s: irq_src=0x%x\n", __func__, irq_src);
 
        if (irq_src == MAX77686_IRQSRC_PMIC) {
-               ret = regmap_bulk_read(max77686->rtc_regmap,
+               ret = regmap_bulk_read(max77686->regmap,
                                         MAX77686_REG_INT1, irq_reg, 2);
                if (ret < 0) {
                        dev_err(max77686->dev, "Failed to read interrupt source: %d\n",
@@ -208,6 +208,9 @@ static irqreturn_t max77686_irq_thread(int irq, void *data)
 
        }
 
+       for (i = 0; i < MAX77686_IRQ_GROUP_NR; i++)
+               irq_reg[i] &= ~max77686->irq_masks_cur[i];
+
        for (i = 0; i < MAX77686_IRQ_NR; i++) {
                if (irq_reg[max77686_irqs[i].group] & max77686_irqs[i].mask) {
                        cur_irq = irq_find_mapping(max77686->irq_domain, i);
@@ -249,21 +252,28 @@ int max77686_irq_init(struct max77686_dev *max77686)
 
        mutex_init(&max77686->irqlock);
 
-       max77686->irq = gpio_to_irq(max77686->irq_gpio);
-
-       if (debug_mask & MAX77686_DEBUG_IRQ_INT) {
-               ret = gpio_request(max77686->irq_gpio, "pmic_irq");
-               if (ret < 0) {
-                       dev_err(max77686->dev,
-                               "Failed to request gpio %d with ret: %d\n",
-                               max77686->irq_gpio, ret);
-                       return IRQ_NONE;
+       if (max77686->irq_gpio && !max77686->irq) {
+               max77686->irq = gpio_to_irq(max77686->irq_gpio);
+
+               if (debug_mask & MAX77686_DEBUG_IRQ_INT) {
+                       ret = gpio_request(max77686->irq_gpio, "pmic_irq");
+                       if (ret < 0) {
+                               dev_err(max77686->dev,
+                                       "Failed to request gpio %d with ret:"
+                                       "%d\n", max77686->irq_gpio, ret);
+                               return IRQ_NONE;
+                       }
+
+                       gpio_direction_input(max77686->irq_gpio);
+                       val = gpio_get_value(max77686->irq_gpio);
+                       gpio_free(max77686->irq_gpio);
+                       pr_info("%s: gpio_irq=%x\n", __func__, val);
                }
+       }
 
-               gpio_direction_input(max77686->irq_gpio);
-               val = gpio_get_value(max77686->irq_gpio);
-               gpio_free(max77686->irq_gpio);
-               pr_info("%s: gpio_irq=%x\n", __func__, val);
+       if (!max77686->irq) {
+               dev_err(max77686->dev, "irq is not specified\n");
+               return -ENODEV;
        }
 
        /* Mask individual interrupt sources */