Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7eb3154e6caf7945ce60c196637b7ac06213befd

Authored by MyungJoo Ham
Committed by Samuel Ortiz
1 parent fa948761e6
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 5 additions and 0 deletions Side-by-side Diff

drivers/mfd/max8997.c
Diff comments   View file @ 7eb3154
... ... @@ -135,10 +135,13 @@
135 135 max8997->dev = &i2c->dev;
136 136 max8997->i2c = i2c;
137 137 max8997->type = id->driver_data;
  138 + max8997->irq = i2c->irq;
138 139  
139 140 if (!pdata)
140 141 goto err;
141 142  
  143 + max8997->irq_base = pdata->irq_base;
  144 + max8997->ono = pdata->ono;
142 145 max8997->wakeup = pdata->wakeup;
143 146  
144 147 mutex_init(&max8997->iolock);
... ... @@ -151,6 +154,8 @@
151 154 i2c_set_clientdata(max8997->muic, max8997);
152 155  
153 156 pm_runtime_set_active(max8997->dev);
  157 +
  158 + max8997_irq_init(max8997);
154 159  
155 160 mfd_add_devices(max8997->dev, -1, max8997_devs,
156 161 ARRAY_SIZE(max8997_devs),