diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2018-09-05 10:36:06 -0400 |
---|---|---|
committer | Lee Jones <lee.jones@linaro.org> | 2018-10-23 03:58:34 -0400 |
commit | c1aaaa1cb7c82fe53463fba4928405fddcc4ea27 (patch) | |
tree | dbd515f2d147ea8c7bb2b164021ec26758d6864a | |
parent | efddff27c886e729a7f84a7205bd84d7d4af7336 (diff) |
mfd: max8997: Disable interrupt handling for suspend/resume cycle
Disable IRQs during suspend/resume cycle to ensure handling of wakeup
interrupts (i.e. RTC wake alarm) after max8997_resume(). This way it can
be properly handled when I2C bus is finally available. This pattern is
also used in other MAX PMIC MFD drivers.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
-rw-r--r-- | drivers/mfd/max8997.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c index f99e8da99782..8c06c09e36d1 100644 --- a/drivers/mfd/max8997.c +++ b/drivers/mfd/max8997.c | |||
@@ -448,6 +448,7 @@ static int max8997_suspend(struct device *dev) | |||
448 | struct i2c_client *i2c = to_i2c_client(dev); | 448 | struct i2c_client *i2c = to_i2c_client(dev); |
449 | struct max8997_dev *max8997 = i2c_get_clientdata(i2c); | 449 | struct max8997_dev *max8997 = i2c_get_clientdata(i2c); |
450 | 450 | ||
451 | disable_irq(max8997->irq); | ||
451 | if (device_may_wakeup(dev)) | 452 | if (device_may_wakeup(dev)) |
452 | irq_set_irq_wake(max8997->irq, 1); | 453 | irq_set_irq_wake(max8997->irq, 1); |
453 | return 0; | 454 | return 0; |
@@ -460,6 +461,7 @@ static int max8997_resume(struct device *dev) | |||
460 | 461 | ||
461 | if (device_may_wakeup(dev)) | 462 | if (device_may_wakeup(dev)) |
462 | irq_set_irq_wake(max8997->irq, 0); | 463 | irq_set_irq_wake(max8997->irq, 0); |
464 | enable_irq(max8997->irq); | ||
463 | return max8997_irq_resume(max8997); | 465 | return max8997_irq_resume(max8997); |
464 | } | 466 | } |
465 | 467 | ||