Merge branch 'next' into for-linus

Prepare input updates for 5.2 merge window.

diff --cc drivers/hid/hid-input.c
Simple merge

diff --cc drivers/input/keyboard/Kconfig
Simple merge

diff --cc drivers/input/keyboard/snvs_pwrkey.c
index 4c67cf30a5d9ab14bff5f5c53d289ba347d241f4,c8d748477bd4a8a490beecd28ee9f953865f3a93..5342d8d45f811b399bb740ec4a0158d50c502c44
--- 1/drivers/input/keyboard/snvs_pwrkey.c
--- 2/drivers/input/keyboard/snvs_pwrkey.c
+++ b/drivers/input/keyboard/snvs_pwrkey.c
@@@ -166,29 -164,13 +167,10 @@@ static int imx_snvs_pwrkey_probe(struc
                return error;
        }
  
 -      pdata->input = input;
 -      platform_set_drvdata(pdev, pdata);
 -
        device_init_wakeup(&pdev->dev, pdata->wakeup);
- 
-       return 0;
- }
- 
- static int __maybe_unused imx_snvs_pwrkey_suspend(struct device *dev)
- {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct pwrkey_drv_data *pdata = platform_get_drvdata(pdev);
- 
-       if (device_may_wakeup(&pdev->dev))
-               enable_irq_wake(pdata->irq);
- 
-       return 0;
- }
- 
- static int __maybe_unused imx_snvs_pwrkey_resume(struct device *dev)
- {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct pwrkey_drv_data *pdata = platform_get_drvdata(pdev);
- 
-       if (device_may_wakeup(&pdev->dev))
-               disable_irq_wake(pdata->irq);
+       error = dev_pm_set_wake_irq(&pdev->dev, pdata->irq);
+       if (error)
+               dev_err(&pdev->dev, "irq wake enable failed.\n");
  
        return 0;
  }

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc include/uapi/linux/input-event-codes.h
Simple merge