Input: rotary_encoder - add wake up support

This patch adds wake up support to GPIO rotary encoders.

Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

diff --git a/Documentation/devicetree/bindings/input/rotary-encoder.txt b/Documentation/devicetree/bindings/input/rotary-encoder.txt
index 331549593ed5e031ec696cad610f3347763574b7..891ddba2d79266cc25a3db387ae12d205fa22e54 100644 (file)
--- a/Documentation/devicetree/bindings/input/rotary-encoder.txt
+++ b/Documentation/devicetree/bindings/input/rotary-encoder.txt
@@ -15,6 +15,7 @@ Optional properties:
 - rotary-encoder,rollover: Automatic rollove when the rotary value becomes
   greater than the specified steps or smaller than 0. For absolute axis only.
 - rotary-encoder,half-period: Makes the driver work on half-period mode.
+- wakeup-source: Boolean, rotary encoder can wake up the system.
 
 See Documentation/input/rotary-encoder.txt for more information.
 

diff --git a/Documentation/input/rotary-encoder.txt b/Documentation/input/rotary-encoder.txt
index 5737e3590adb6a338d6165332fa1eff93a07d57e..bddbee1886245a39d37f1e3dc420f1bc94691247 100644 (file)
--- a/Documentation/input/rotary-encoder.txt
+++ b/Documentation/input/rotary-encoder.txt
@@ -109,6 +109,7 @@ static struct rotary_encoder_platform_data my_rotary_encoder_info = {
        .inverted_a     = 0,
        .inverted_b     = 0,
        .half_period    = false,
+       .wakeup_source  = false,
 };
 
 static struct platform_device rotary_encoder_device = {

diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index f27f81ee84edef53a4ed90ff150a7d096a43b2f7..d1665544e1091bd2cc26b8948f14ddee2d39698c 100644 (file)
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -26,6 +26,7 @@
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
+#include <linux/pm.h>
 
 #define DRV_NAME "rotary-encoder"
 
@@ -180,6 +181,8 @@ static struct rotary_encoder_platform_data *rotary_encoder_parse_dt(struct devic
                                        "rotary-encoder,rollover", NULL);
        pdata->half_period = !!of_get_property(np,
                                        "rotary-encoder,half-period", NULL);
+       pdata->wakeup_source = !!of_get_property(np,
+                                       "wakeup-source", NULL);
 
        return pdata;
 }
@@ -280,6 +283,8 @@ static int rotary_encoder_probe(struct platform_device *pdev)
                goto exit_free_irq_b;
        }
 
+       device_init_wakeup(&pdev->dev, pdata->wakeup_source);
+
        platform_set_drvdata(pdev, encoder);
 
        return 0;
@@ -306,6 +311,8 @@ static int rotary_encoder_remove(struct platform_device *pdev)
        struct rotary_encoder *encoder = platform_get_drvdata(pdev);
        const struct rotary_encoder_platform_data *pdata = encoder->pdata;
 
+       device_init_wakeup(&pdev->dev, false);
+
        free_irq(encoder->irq_a, encoder);
        free_irq(encoder->irq_b, encoder);
        gpio_free(pdata->gpio_a);
@@ -320,11 +327,41 @@ static int rotary_encoder_remove(struct platform_device *pdev)
        return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int rotary_encoder_suspend(struct device *dev)
+{
+       struct rotary_encoder *encoder = dev_get_drvdata(dev);
+
+       if (device_may_wakeup(dev)) {
+               enable_irq_wake(encoder->irq_a);
+               enable_irq_wake(encoder->irq_b);
+       }
+
+       return 0;
+}
+
+static int rotary_encoder_resume(struct device *dev)
+{
+       struct rotary_encoder *encoder = dev_get_drvdata(dev);
+
+       if (device_may_wakeup(dev)) {
+               disable_irq_wake(encoder->irq_a);
+               disable_irq_wake(encoder->irq_b);
+       }
+
+       return 0;
+}
+#endif
+
+static SIMPLE_DEV_PM_OPS(rotary_encoder_pm_ops,
+                rotary_encoder_suspend, rotary_encoder_resume);
+
 static struct platform_driver rotary_encoder_driver = {
        .probe          = rotary_encoder_probe,
        .remove         = rotary_encoder_remove,
        .driver         = {
                .name   = DRV_NAME,
+               .pm     = &rotary_encoder_pm_ops,
                .of_match_table = of_match_ptr(rotary_encoder_of_match),
        }
 };

diff --git a/include/linux/rotary_encoder.h b/include/linux/rotary_encoder.h
index 3f594dce571650c76253a785e8720490a7c0f80e..b33f2d2a708f812722a88fac32b51a968b8ae5ee 100644 (file)
--- a/include/linux/rotary_encoder.h
+++ b/include/linux/rotary_encoder.h
@@ -11,6 +11,7 @@ struct rotary_encoder_platform_data {
        bool relative_axis;
        bool rollover;
        bool half_period;
+       bool wakeup_source;
 };
 
 #endif /* __ROTARY_ENCODER_H__ */