2 files changed, 26 insertions, 2 deletions

diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index f83103b8970d..dc58750bb71b 100644
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -23,6 +23,7 @@
 
 #include <linux/slab.h>
 #include <linux/i2c.h>
+#include <linux/interrupt.h>
 #include <linux/pm_runtime.h>
 #include <linux/mutex.h>
 #include <linux/mfd/core.h>
@@ -142,7 +143,6 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
 
         max8997->irq_base = pdata->irq_base;
         max8997->ono = pdata->ono;
-        max8997->wakeup = pdata->wakeup;
 
         mutex_init(&max8997->iolock);
 
@@ -169,6 +169,9 @@ static int max8997_i2c_probe(struct i2c_client *i2c,
         if (ret < 0)
                 goto err_mfd;
 
+        /* MAX8997 has a power button input. */
+        device_init_wakeup(max8997->dev, pdata->wakeup);
+
         return ret;
 
 err_mfd:
@@ -398,7 +401,29 @@ static int max8997_restore(struct device *dev)
         return 0;
 }
 
+static int max8997_suspend(struct device *dev)
+{
+        struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
+        struct max8997_dev *max8997 = i2c_get_clientdata(i2c);
+
+        if (device_may_wakeup(dev))
+                irq_set_irq_wake(max8997->irq, 1);
+        return 0;
+}
+
+static int max8997_resume(struct device *dev)
+{
+        struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
+        struct max8997_dev *max8997 = i2c_get_clientdata(i2c);
+
+        if (device_may_wakeup(dev))
+                irq_set_irq_wake(max8997->irq, 0);
+        return max8997_irq_resume(max8997);
+}
+
 const struct dev_pm_ops max8997_pm = {
+        .suspend = max8997_suspend,
+        .resume = max8997_resume,
         .freeze = max8997_freeze,
         .restore = max8997_restore,
 };
diff --git a/include/linux/mfd/max8997-private.h b/include/linux/mfd/max8997-private.h
index 5ff2400ad46c..3f4deb62d6b0 100644
--- a/include/linux/mfd/max8997-private.h
+++ b/include/linux/mfd/max8997-private.h
@@ -326,7 +326,6 @@ struct max8997_dev {
         int irq;
         int ono;
         int irq_base;
-        bool wakeup;
         struct mutex irqlock;
         int irq_masks_cur[MAX8997_IRQ_GROUP_NR];
         int irq_masks_cache[MAX8997_IRQ_GROUP_NR];