Merge branches 'delete-gts-bfs', 'misc', 'novell-bugzilla-757888-numa' and 'osc-pcie...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / wm8994-core.c

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index 1e321d349777199dad0bdd050288f72af60917a6..eec74aa55fdfe28c46476c3360e1632bfd51cf7f 100644 (file)
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -283,9 +283,24 @@ static int wm8994_suspend(struct device *dev)
        wm8994_reg_write(wm8994, WM8994_SOFTWARE_RESET,
                         wm8994_reg_read(wm8994, WM8994_SOFTWARE_RESET));
 
-       regcache_cache_only(wm8994->regmap, true);
        regcache_mark_dirty(wm8994->regmap);
 
+       /* Restore GPIO registers to prevent problems with mismatched
+        * pin configurations.
+        */
+       ret = regcache_sync_region(wm8994->regmap, WM8994_GPIO_1,
+                                  WM8994_GPIO_11);
+       if (ret != 0)
+               dev_err(dev, "Failed to restore GPIO registers: %d\n", ret);
+
+       /* In case one of the GPIOs is used as a wake input. */
+       ret = regcache_sync_region(wm8994->regmap,
+                                  WM8994_INTERRUPT_STATUS_1_MASK,
+                                  WM8994_INTERRUPT_STATUS_1_MASK);
+       if (ret != 0)
+               dev_err(dev, "Failed to restore interrupt mask: %d\n", ret);
+
+       regcache_cache_only(wm8994->regmap, true);
        wm8994->suspended = true;
 
        ret = regulator_bulk_disable(wm8994->num_supplies,