Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b40459b authored by Yadwinder Singh Brar's avatar Yadwinder Singh Brar Committed by Samuel Ortiz
Browse files

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: default avatarYadwinder Singh Brar <yadi.brar@samsung.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 9bdf9b4e

drivers/mfd/max77686-irq.c

+20 −13
Original line number Diff line number Diff line
@@ -252,14 +252,15 @@ int max77686_irq_init(struct max77686_dev *max77686) 


	mutex_init(&max77686->irqlock);



	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);

					"Failed to request gpio %d with ret:"

					"%d\n",	max77686->irq_gpio, ret);

				return IRQ_NONE;

			}
@@ -268,6 +269,12 @@ int max77686_irq_init(struct max77686_dev *max77686) 
			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 */

	for (i = 0; i < MAX77686_IRQ_GROUP_NR; i++) {

drivers/mfd/max77686.c

+1 −0
Original line number Diff line number Diff line
@@ -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) {