On Tue, Jul 16, 2024 at 04:56:11PM -0400, Frank Li wrote:
> From: Jacky Bai <ping.bai@xxxxxxx>
Sorry, Please forget this patch, this one accidently sent out with other
2 patches. And this one already applied.
Frank
>
> Report input event directly on wakeup to ensure no press event is missed
> when resuming from suspend.
>
> Signed-off-by: Jacky Bai <ping.bai@xxxxxxx>
> Reviewed-by: Peng Fan <peng.fan@xxxxxxx>
> Acked-by: Jason Liu <jason.hui.liu@xxxxxxx>
> Signed-off-by: Frank Li <Frank.Li@xxxxxxx>
> ---
> Change from v1 to v2
> - move before mod_time
> - clean suspend flag to make sure only fire once
> ---
> drivers/input/misc/nxp-bbnsm-pwrkey.c | 38 +++++++++++++++++++++++++++
> 1 file changed, 38 insertions(+)
>
> diff --git a/drivers/input/misc/nxp-bbnsm-pwrkey.c b/drivers/input/misc/nxp-bbnsm-pwrkey.c
> index 1d99206dd3a8b..eb4173f9c8204 100644
> --- a/drivers/input/misc/nxp-bbnsm-pwrkey.c
> +++ b/drivers/input/misc/nxp-bbnsm-pwrkey.c
> @@ -38,6 +38,7 @@ struct bbnsm_pwrkey {
> int irq;
> int keycode;
> int keystate; /* 1:pressed */
> + bool suspended;
> struct timer_list check_timer;
> struct input_dev *input;
> };
> @@ -70,6 +71,7 @@ static irqreturn_t bbnsm_pwrkey_interrupt(int irq, void *dev_id)
> {
> struct platform_device *pdev = dev_id;
> struct bbnsm_pwrkey *bbnsm = platform_get_drvdata(pdev);
> + struct input_dev *input = bbnsm->input;
> u32 event;
>
> regmap_read(bbnsm->regmap, BBNSM_EVENTS, &event);
> @@ -78,6 +80,18 @@ static irqreturn_t bbnsm_pwrkey_interrupt(int irq, void *dev_id)
>
> pm_wakeup_event(bbnsm->input->dev.parent, 0);
>
> + /*
> + * Directly report key event after resume to make sure key press
> + * event is never missed.
> + */
> + if (bbnsm->suspended) {
> + bbnsm->keystate = 1;
> + input_event(input, EV_KEY, bbnsm->keycode, 1);
> + input_sync(input);
> + /* Fire at most once per suspend/resume cycle */
> + bbnsm->suspended = false;
> + }
> +
> mod_timer(&bbnsm->check_timer,
> jiffies + msecs_to_jiffies(DEBOUNCE_TIME));
>
> @@ -173,6 +187,29 @@ static int bbnsm_pwrkey_probe(struct platform_device *pdev)
> return 0;
> }
>
> +static int __maybe_unused bbnsm_pwrkey_suspend(struct device *dev)
> +{
> + struct platform_device *pdev = to_platform_device(dev);
> + struct bbnsm_pwrkey *bbnsm = platform_get_drvdata(pdev);
> +
> + bbnsm->suspended = true;
> +
> + return 0;
> +}
> +
> +static int __maybe_unused bbnsm_pwrkey_resume(struct device *dev)
> +{
> + struct platform_device *pdev = to_platform_device(dev);
> + struct bbnsm_pwrkey *bbnsm = platform_get_drvdata(pdev);
> +
> + bbnsm->suspended = false;
> +
> + return 0;
> +}
> +
> +static SIMPLE_DEV_PM_OPS(bbnsm_pwrkey_pm_ops, bbnsm_pwrkey_suspend,
> + bbnsm_pwrkey_resume);
> +
> static const struct of_device_id bbnsm_pwrkey_ids[] = {
> { .compatible = "nxp,imx93-bbnsm-pwrkey" },
> { /* sentinel */ }
> @@ -182,6 +219,7 @@ MODULE_DEVICE_TABLE(of, bbnsm_pwrkey_ids);
> static struct platform_driver bbnsm_pwrkey_driver = {
> .driver = {
> .name = "bbnsm_pwrkey",
> + .pm = &bbnsm_pwrkey_pm_ops,
> .of_match_table = bbnsm_pwrkey_ids,
> },
> .probe = bbnsm_pwrkey_probe,
> --
> 2.34.1
>
