diff options
| author | MyungJoo Ham <myungjoo.ham@samsung.com> | 2011-08-18 03:37:35 -0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-09-06 10:37:59 -0400 |
| commit | 7eb3154e6caf7945ce60c196637b7ac06213befd (patch) | |
| tree | 495a3be2aec959b2cd9d982bb59791fc3cc025e8 | |
| parent | fa948761e685fb03823b3029e5b6bdb52229d6ce (diff) | |
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>
| -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, | |||
| 135 | max8997->dev = &i2c->dev; | 135 | max8997->dev = &i2c->dev; |
| 136 | max8997->i2c = i2c; | 136 | max8997->i2c = i2c; |
| 137 | max8997->type = id->driver_data; | 137 | max8997->type = id->driver_data; |
| 138 | max8997->irq = i2c->irq; | ||
| 138 | 139 | ||
| 139 | if (!pdata) | 140 | if (!pdata) |
| 140 | goto err; | 141 | goto err; |
| 141 | 142 | ||
| 143 | max8997->irq_base = pdata->irq_base; | ||
| 144 | max8997->ono = pdata->ono; | ||
| 142 | max8997->wakeup = pdata->wakeup; | 145 | max8997->wakeup = pdata->wakeup; |
| 143 | 146 | ||
| 144 | mutex_init(&max8997->iolock); | 147 | mutex_init(&max8997->iolock); |
| @@ -152,6 +155,8 @@ static int max8997_i2c_probe(struct i2c_client *i2c, | |||
| 152 | 155 | ||
| 153 | pm_runtime_set_active(max8997->dev); | 156 | pm_runtime_set_active(max8997->dev); |
| 154 | 157 | ||
| 158 | max8997_irq_init(max8997); | ||
| 159 | |||
| 155 | mfd_add_devices(max8997->dev, -1, max8997_devs, | 160 | mfd_add_devices(max8997->dev, -1, max8997_devs, |
| 156 | ARRAY_SIZE(max8997_devs), | 161 | ARRAY_SIZE(max8997_devs), |
| 157 | NULL, 0); | 162 | NULL, 0); |
