diff options
| author | MyungJoo Ham <myungjoo.ham@samsung.com> | 2011-08-18 11:37:35 +0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-09-06 18:37:59 +0400 |
| commit | 7eb3154e6caf7945ce60c196637b7ac06213befd (patch) | |
| tree | 495a3be2aec959b2cd9d982bb59791fc3cc025e8 /drivers/mfd/max8997.c | |
| parent | fa948761e685fb03823b3029e5b6bdb52229d6ce (diff) | |
| download | linux-7eb3154e6caf7945ce60c196637b7ac06213befd.tar.xz | |
mfd: Set MAX8997 irq pointer
Required platform information is not handed to max8997-irq.c properly.
This patch enables to hand over such information to max8997-irq.c so
that max8997-irq functions properly.
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/max8997.c')
| -rw-r--r-- | drivers/mfd/max8997.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c index 5d1fca0277ef..f83103b8970d 100644 --- a/drivers/mfd/max8997.c +++ b/drivers/mfd/max8997.c @@ -135,10 +135,13 @@ static int max8997_i2c_probe(struct i2c_client *i2c, max8997->dev = &i2c->dev; max8997->i2c = i2c; max8997->type = id->driver_data; + max8997->irq = i2c->irq; if (!pdata) goto err; + max8997->irq_base = pdata->irq_base; + max8997->ono = pdata->ono; max8997->wakeup = pdata->wakeup; mutex_init(&max8997->iolock); @@ -152,6 +155,8 @@ static int max8997_i2c_probe(struct i2c_client *i2c, pm_runtime_set_active(max8997->dev); + max8997_irq_init(max8997); + mfd_add_devices(max8997->dev, -1, max8997_devs, ARRAY_SIZE(max8997_devs), NULL, 0); |