On 09/30/2011 03:54 PM, Hui Wang wrote: > The imx_keypad driver is set wake capable in the imx_keypad_probe(), > but it doesn't implement suspend and reusme callback interface. > >>From the i.MX series MCU Reference Manual, the kpp (keypad port) is > a major wake up source which can detect any key press even in low > power modes and even when there is no clock. > > Now add suspend and resume callback functions for this driver. > > Signed-off-by: Hui Wang <jason77.wang@xxxxxxxxx> > --- > Validated this patch both on i.MX51 PDK and i.MX31 PDK > > drivers/input/keyboard/imx_keypad.c | 42 +++++++++++++++++++++++++++++++++++ > 1 files changed, 42 insertions(+), 0 deletions(-) > > diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c > index d92c15c..9992617 100644 > --- a/drivers/input/keyboard/imx_keypad.c > +++ b/drivers/input/keyboard/imx_keypad.c > @@ -567,10 +567,52 @@ static int __devexit imx_keypad_remove(struct platform_device *pdev) > return 0; > } > > +#ifdef CONFIG_PM > +static int imx_kbd_suspend(struct device *dev) > +{ > + struct platform_device *pdev = to_platform_device(dev); > + struct imx_keypad *kbd = platform_get_drvdata(pdev); > + > + clk_disable(kbd->clk); > + > + if (device_may_wakeup(&pdev->dev)) > + enable_irq_wake(kbd->irq); > + > + return 0; > +} struct input_dev *input_dev = kbd->input_dev; if (device_may_wakeup(dev)) { enable_irq_wake(kdb->irq); } else { mutex_lock(&input_dev->mutex); if (input_dev->users) clk_disable(kbd->clk); mutex_unlock(&input_dev->mutex); } right? > + > +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; > + > + mutex_lock(&input_dev->mutex); > + > + if (device_may_wakeup(&pdev->dev)) > + disable_irq_wake(kbd->irq); > + > + if (input_dev->users) > + clk_enable(kbd->clk); > + > + mutex_unlock(&input_dev->mutex); > + > + return 0; > +} struct input_dev *input_dev = kbd->input_dev; if (device_may_wakeup(dev)) { disable_irq_wake(kdb->irq); } else { mutex_lock(&input_dev->mutex); if (input_dev->users) clk_enable(kbd->clk); mutex_unlock(&input_dev->mutex); } > + > +static const struct dev_pm_ops imx_kbd_pm_ops = { SIMPLE_DEV_PM_OPS? Thanks -Wanlong Gao -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html