Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
  sh: sh7785lcr: Map whole PCI address space.
  sh: Fix up DSP context save/restore.
  sh: Fix up number of on-chip DMA channels on SH7091.
  sh: update defconfigs.
  sh: Kill off broken direct-mapped cache mode.
  sh: Wire up ARCH_HAS_DEFAULT_IDLE for cpuidle.
  sh: Add a command line option for disabling I/O trapping.
  sh: Select ARCH_HIBERNATION_POSSIBLE.
  sh: migor: Fix up CEU use flags.
  input: migor_ts: add wakeup support
  rtc: rtc-sh: use set_irq_wake()
  input: sh_keysc: use enable/disable_irq_wake()
  sh: intc: set_irq_wake() support
  sh: intc: install enable, disable and shutdown callbacks
  clocksource: sh_cmt: use remove_irq() and remove clockevent workaround
  sh: ap325 and Migo-R use new sh_mobile_ceu_info flags
  sh: Fix up -Wformat-security whining.
  sh: ap325rxa: Add ov772x support, again.
  sh: Sanitize asm/mmu.h for assembly use.
  sh: Tidy up sh7786 pinmux table.
  ...

2 files changed, 39 insertions, 1 deletions

diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c
index e1480fb11de3..cea70e6a1031 100644
--- a/drivers/input/keyboard/sh_keysc.c
+++ b/drivers/input/keyboard/sh_keysc.c
@@ -259,12 +259,15 @@ static int sh_keysc_suspend(struct device *dev)
 {
         struct platform_device *pdev = to_platform_device(dev);
         struct sh_keysc_priv *priv = platform_get_drvdata(pdev);
+        int irq = platform_get_irq(pdev, 0);
         unsigned short value;
 
         value = ioread16(priv->iomem_base + KYCR1_OFFS);
 
-        if (device_may_wakeup(dev))
+        if (device_may_wakeup(dev)) {
                 value |= 0x80;
+                enable_irq_wake(irq);
+        }
         else
                 value &= ~0x80;
 
@@ -272,8 +275,20 @@ static int sh_keysc_suspend(struct device *dev)
         return 0;
 }
 
+static int sh_keysc_resume(struct device *dev)
+{
+        struct platform_device *pdev = to_platform_device(dev);
+        int irq = platform_get_irq(pdev, 0);
+
+        if (device_may_wakeup(dev))
+                disable_irq_wake(irq);
+
+        return 0;
+}
+
 static struct dev_pm_ops sh_keysc_dev_pm_ops = {
         .suspend = sh_keysc_suspend,
+        .resume = sh_keysc_resume,
 };
 
 struct platform_driver sh_keysc_device_driver = {
diff --git a/drivers/input/touchscreen/migor_ts.c b/drivers/input/touchscreen/migor_ts.c
index 504ca11749a1..141dd584330e 100644
--- a/drivers/input/touchscreen/migor_ts.c
+++ b/drivers/input/touchscreen/migor_ts.c
@@ -198,6 +198,7 @@ static int migor_ts_probe(struct i2c_client *client,
                 goto err2;
         }
 
+        device_init_wakeup(&client->dev, 1);
         return 0;
 
  err2:
@@ -224,6 +225,26 @@ static int migor_ts_remove(struct i2c_client *client)
         return 0;
 }
 
+static int migor_ts_suspend(struct i2c_client *client, pm_message_t mesg)
+{
+        struct migor_ts_priv *priv = dev_get_drvdata(&client->dev);
+
+        if (device_may_wakeup(&client->dev))
+                enable_irq_wake(priv->irq);
+
+        return 0;
+}
+
+static int migor_ts_resume(struct i2c_client *client)
+{
+        struct migor_ts_priv *priv = dev_get_drvdata(&client->dev);
+
+        if (device_may_wakeup(&client->dev))
+                disable_irq_wake(priv->irq);
+
+        return 0;
+}
+
 static const struct i2c_device_id migor_ts_id[] = {
         { "migor_ts", 0 },
         { }
@@ -236,6 +257,8 @@ static struct i2c_driver migor_ts_driver = {
         },
         .probe = migor_ts_probe,
         .remove = migor_ts_remove,
+        .suspend = migor_ts_suspend,
+        .resume = migor_ts_resume,
         .id_table = migor_ts_id,
 };