diff options
Diffstat (limited to 'drivers/mfd/tc3589x.c')
-rw-r--r-- | drivers/mfd/tc3589x.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c index 0072e668c208..aacb3720065c 100644 --- a/drivers/mfd/tc3589x.c +++ b/drivers/mfd/tc3589x.c | |||
@@ -241,10 +241,8 @@ static struct irq_domain_ops tc3589x_irq_ops = { | |||
241 | 241 | ||
242 | static int tc3589x_irq_init(struct tc3589x *tc3589x, struct device_node *np) | 242 | static int tc3589x_irq_init(struct tc3589x *tc3589x, struct device_node *np) |
243 | { | 243 | { |
244 | int base = tc3589x->irq_base; | ||
245 | |||
246 | tc3589x->domain = irq_domain_add_simple( | 244 | tc3589x->domain = irq_domain_add_simple( |
247 | np, TC3589x_NR_INTERNAL_IRQS, base, | 245 | np, TC3589x_NR_INTERNAL_IRQS, 0, |
248 | &tc3589x_irq_ops, tc3589x); | 246 | &tc3589x_irq_ops, tc3589x); |
249 | 247 | ||
250 | if (!tc3589x->domain) { | 248 | if (!tc3589x->domain) { |
@@ -298,7 +296,7 @@ static int tc3589x_device_init(struct tc3589x *tc3589x) | |||
298 | if (blocks & TC3589x_BLOCK_GPIO) { | 296 | if (blocks & TC3589x_BLOCK_GPIO) { |
299 | ret = mfd_add_devices(tc3589x->dev, -1, tc3589x_dev_gpio, | 297 | ret = mfd_add_devices(tc3589x->dev, -1, tc3589x_dev_gpio, |
300 | ARRAY_SIZE(tc3589x_dev_gpio), NULL, | 298 | ARRAY_SIZE(tc3589x_dev_gpio), NULL, |
301 | tc3589x->irq_base, tc3589x->domain); | 299 | 0, tc3589x->domain); |
302 | if (ret) { | 300 | if (ret) { |
303 | dev_err(tc3589x->dev, "failed to add gpio child\n"); | 301 | dev_err(tc3589x->dev, "failed to add gpio child\n"); |
304 | return ret; | 302 | return ret; |
@@ -309,7 +307,7 @@ static int tc3589x_device_init(struct tc3589x *tc3589x) | |||
309 | if (blocks & TC3589x_BLOCK_KEYPAD) { | 307 | if (blocks & TC3589x_BLOCK_KEYPAD) { |
310 | ret = mfd_add_devices(tc3589x->dev, -1, tc3589x_dev_keypad, | 308 | ret = mfd_add_devices(tc3589x->dev, -1, tc3589x_dev_keypad, |
311 | ARRAY_SIZE(tc3589x_dev_keypad), NULL, | 309 | ARRAY_SIZE(tc3589x_dev_keypad), NULL, |
312 | tc3589x->irq_base, tc3589x->domain); | 310 | 0, tc3589x->domain); |
313 | if (ret) { | 311 | if (ret) { |
314 | dev_err(tc3589x->dev, "failed to keypad child\n"); | 312 | dev_err(tc3589x->dev, "failed to keypad child\n"); |
315 | return ret; | 313 | return ret; |
@@ -404,7 +402,6 @@ static int tc3589x_probe(struct i2c_client *i2c, | |||
404 | tc3589x->dev = &i2c->dev; | 402 | tc3589x->dev = &i2c->dev; |
405 | tc3589x->i2c = i2c; | 403 | tc3589x->i2c = i2c; |
406 | tc3589x->pdata = pdata; | 404 | tc3589x->pdata = pdata; |
407 | tc3589x->irq_base = pdata->irq_base; | ||
408 | 405 | ||
409 | switch (version) { | 406 | switch (version) { |
410 | case TC3589X_TC35893: | 407 | case TC3589X_TC35893: |