aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/max77686.c
diff options
context:
space:
mode:
authorYadwinder Singh Brar <yadi.brar01@gmail.com>2012-07-09 13:21:45 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-07-09 15:13:42 +0200
commit2b40459b7ee502c970d9f1dcf94dfa4d58ec1d85 (patch)
treec17a8614a3fd213063221c13510ae885e89291cb /drivers/mfd/max77686.c
parentmfd: Apply irq_mask_cur before handling max77686 interrupts (diff)
downloadlinux-dev-2b40459b7ee502c970d9f1dcf94dfa4d58ec1d85.tar.xz
linux-dev-2b40459b7ee502c970d9f1dcf94dfa4d58ec1d85.zip
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>
Diffstat (limited to 'drivers/mfd/max77686.c')
-rw-r--r--drivers/mfd/max77686.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index 9e7e1d30f25f..c66639d681e9 100644
--- 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) {