mfd: Allow to specify max77686 interrupt through DT or platform file also

Presently driver expects irq_gpio pin in platform data and maps it to irq
itself. But we can also directly specify the interrupt in DT or platform file.

Signed-off-by: Yadwinder Singh Brar <yadi.brar@samsung.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/drivers/mfd/max77686-irq.c b/drivers/mfd/max77686-irq.c
index 0758fac..cdc3280 100644 (file)
--- a/drivers/mfd/max77686-irq.c
+++ b/drivers/mfd/max77686-irq.c
@@ -252,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 */

diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index 9e7e1d3..c66639d 100644 (file)
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -77,6 +77,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
 
        max77686->wakeup = pdata->wakeup;
        max77686->irq_gpio = pdata->irq_gpio;
+       max77686->irq = i2c->irq;
 
        if (regmap_read(max77686->regmap,
                         MAX77686_REG_DEVICE_ID, &data) < 0) {