From 20f12309e837ff4de4c656f21ebee2aef4fc4047 Mon Sep 17 00:00:00 2001 From: Hui Wang Date: Wed, 12 Oct 2011 21:11:16 -0700 Subject: [PATCH] --- yaml --- r: 269511 b: refs/heads/master c: 81e8f2bc82cd591a749c0cc5694f57676db749ae h: refs/heads/master i: 269509: 1ad2e684360643d7c951d45d214299b6d57e5749 269507: 13da601c64e56f244d0b4876a0e68ab106eac821 269503: 0bf35c5b0aa0eb334dbf505f44a99feadc86dbb0 v: v3 --- [refs] | 2 +- trunk/drivers/input/keyboard/imx_keypad.c | 44 +++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4009aeb24547..3b1ca7c1c544 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05be8b81aafd4f95106a91ff3fd8581fa984fad9 +refs/heads/master: 81e8f2bc82cd591a749c0cc5694f57676db749ae diff --git a/trunk/drivers/input/keyboard/imx_keypad.c b/trunk/drivers/input/keyboard/imx_keypad.c index 4b093faf5786..ccebd2d09151 100644 --- a/trunk/drivers/input/keyboard/imx_keypad.c +++ b/trunk/drivers/input/keyboard/imx_keypad.c @@ -567,10 +567,54 @@ static int __devexit imx_keypad_remove(struct platform_device *pdev) return 0; } +#ifdef CONFIG_PM_SLEEP +static int imx_kbd_suspend(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct imx_keypad *kbd = platform_get_drvdata(pdev); + struct input_dev *input_dev = kbd->input_dev; + + /* imx kbd can wake up system even clock is disabled */ + mutex_lock(&input_dev->mutex); + + if (input_dev->users) + clk_disable(kbd->clk); + + mutex_unlock(&input_dev->mutex); + + if (device_may_wakeup(&pdev->dev)) + enable_irq_wake(kbd->irq); + + return 0; +} + +static int imx_kbd_resume(struct device *dev) +{ + struct platform_device *pdev = to_platform_device(dev); + struct imx_keypad *kbd = platform_get_drvdata(pdev); + struct input_dev *input_dev = kbd->input_dev; + + if (device_may_wakeup(&pdev->dev)) + disable_irq_wake(kbd->irq); + + mutex_lock(&input_dev->mutex); + + if (input_dev->users) + clk_enable(kbd->clk); + + mutex_unlock(&input_dev->mutex); + + return 0; +} +#endif + +static SIMPLE_DEV_PM_OPS(imx_kbd_pm_ops, imx_kbd_suspend, imx_kbd_resume); + static struct platform_driver imx_keypad_driver = { .driver = { .name = "imx-keypad", .owner = THIS_MODULE, + .pm = &imx_kbd_pm_ops, }, .probe = imx_keypad_probe, .remove = __devexit_p(imx_keypad_remove),