Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (73 commits)
  power: Revert "power_supply: Mark twl4030_charger as broken"
  mfd: Fix a memory leak when unload mc13xxx-core module
  mfd: Fix resource reclaim for max8998
  mfd: Remove unneeded ret value checking for max8998 register updates
  mfd: Add free max8998->ono irq in max8998_irq_exit()
  mfd: Fix resource reclaim in pcf50633_remove()
  omap4: pandaboard: fix up mmc card detect logic
  mfd: Fix ezx_pcap_probe error path
  mfd: Fix off-by-one value range checking for tps6507x
  mfd: Remove __devinitdata from tc6393xb_mmc_resources
  mfd: Add WM831x SPI support
  mfd: Factor out WM831x I2C I/O from the core driver
  mfd: Remove DEBUG defines from mc13xxx-core
  mfd: Fix jz4740_adc_set_enabled
  mfd: Add TPS658621C device ID
  mfd: Fix twl-irq function declaration warnings
  regulator: max8998 BUCK1/2 voltage change with use of GPIOs
  mfd: Voltages and GPIOs platform_data definitions for max8998
  regulator: max8998 BUCK1/2 internal voltages and indexes defined
  mfd: Support for ICs compliant with max8998
  ...

1 files changed, 32 insertions, 0 deletions

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 0754c5e91995..b11487f1e1cb 100644
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -873,6 +873,28 @@ static int __devinit stmpe_devices_init(struct stmpe *stmpe)
         return ret;
 }
 
+#ifdef CONFIG_PM
+static int stmpe_suspend(struct device *dev)
+{
+        struct i2c_client *i2c = to_i2c_client(dev);
+
+        if (device_may_wakeup(&i2c->dev))
+                enable_irq_wake(i2c->irq);
+
+        return 0;
+}
+
+static int stmpe_resume(struct device *dev)
+{
+        struct i2c_client *i2c = to_i2c_client(dev);
+
+        if (device_may_wakeup(&i2c->dev))
+                disable_irq_wake(i2c->irq);
+
+        return 0;
+}
+#endif
+
 static int __devinit stmpe_probe(struct i2c_client *i2c,
                                  const struct i2c_device_id *id)
 {
@@ -960,9 +982,19 @@ static const struct i2c_device_id stmpe_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, stmpe_id);
 
+#ifdef CONFIG_PM
+static const struct dev_pm_ops stmpe_dev_pm_ops = {
+        .suspend        = stmpe_suspend,
+        .resume         = stmpe_resume,
+};
+#endif
+
 static struct i2c_driver stmpe_driver = {
         .driver.name    = "stmpe",
         .driver.owner   = THIS_MODULE,
+#ifdef CONFIG_PM
+        .driver.pm      = &stmpe_dev_pm_ops,
+#endif
         .probe          = stmpe_probe,
         .remove         = __devexit_p(stmpe_remove),
         .id_table       = stmpe_id,