Commit 4ba50df6 authored by Magnus Damm's avatar Magnus Damm Committed by Paul Mundt

input: sh_keysc: use enable/disable_irq_wake()

Modify the sh_keysc driver to use enable/disable_irq_wake()
during suspend and resume. These functions are used to enable
the sh_keysc interrupt in the interrupt controller so the
keypad can be used to wakeup the system from suspend.
Signed-off-by: default avatarMagnus Damm <damm@igel.co.jp>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 2dcec7a9
...@@ -259,12 +259,15 @@ static int sh_keysc_suspend(struct device *dev) ...@@ -259,12 +259,15 @@ static int sh_keysc_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct sh_keysc_priv *priv = platform_get_drvdata(pdev); struct sh_keysc_priv *priv = platform_get_drvdata(pdev);
int irq = platform_get_irq(pdev, 0);
unsigned short value; unsigned short value;
value = ioread16(priv->iomem_base + KYCR1_OFFS); value = ioread16(priv->iomem_base + KYCR1_OFFS);
if (device_may_wakeup(dev)) if (device_may_wakeup(dev)) {
value |= 0x80; value |= 0x80;
enable_irq_wake(irq);
}
else else
value &= ~0x80; value &= ~0x80;
...@@ -272,8 +275,20 @@ static int sh_keysc_suspend(struct device *dev) ...@@ -272,8 +275,20 @@ static int sh_keysc_suspend(struct device *dev)
return 0; 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 = { static struct dev_pm_ops sh_keysc_dev_pm_ops = {
.suspend = sh_keysc_suspend, .suspend = sh_keysc_suspend,
.resume = sh_keysc_resume,
}; };
struct platform_driver sh_keysc_device_driver = { struct platform_driver sh_keysc_device_driver = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment