* [PATCH v5 0/2] input: rotary encoder: Add wake up support
@ 2015-10-13 19:13 Sylvain Rochet
2015-10-13 19:13 ` [PATCH v5 1/2] Documentation: input: rotary encoder: Add wakeup-source property Sylvain Rochet
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Sylvain Rochet @ 2015-10-13 19:13 UTC (permalink / raw)
To: linux-input, Daniel Mack, Johan Hovold, Dmitry Torokhov; +Cc: Sylvain Rochet
Changes since v4:
* As suggested by Johan, Reverted the
device_set_wakeup_capable()/device_wakeup_enable() change,
stick to device_init_wakeup()
Changes since v3:
* Stick to the "wakeup-source" DT property, we are standardizing on it.
* Improved wake-up support: This driver is always supporting wake up
support, thus it is now calling device_set_wakeup_capable(dev, true)
followed by device_wakeup_enable(dev) if wake up is enabled at boot
time. This way the wakeup sysfs tree is always available to the user.
Only calling device_init_wakeup(dev, false) totally disable wake up
support at boot tine with no way to enable wake up support furtherly,
which isn't nice.
Changes since v2:
* Using false instead of 0 on boolean
* Splitted DT documentation in a separate patch
Changes since v1:
* Using DT property wakeup-source instead of rotary-encoder,wakeup
* Renamed int wakeup to bool wakeup_source
* Patch cleanup (checkpatch.pl)
Sylvain Rochet (2):
Documentation: input: rotary encoder: Add wakeup-source property
input: rotary encoder: Add wake up support
.../devicetree/bindings/input/rotary-encoder.txt | 1 +
Documentation/input/rotary-encoder.txt | 1 +
drivers/input/misc/rotary_encoder.c | 37 ++++++++++++++++++++++
include/linux/rotary_encoder.h | 1 +
4 files changed, 40 insertions(+)
--
2.5.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v5 1/2] Documentation: input: rotary encoder: Add wakeup-source property
2015-10-13 19:13 [PATCH v5 0/2] input: rotary encoder: Add wake up support Sylvain Rochet
@ 2015-10-13 19:13 ` Sylvain Rochet
2015-10-13 19:13 ` [PATCH v5 2/2] input: rotary encoder: Add wake up support Sylvain Rochet
2015-10-14 6:28 ` [PATCH v5 0/2] " Dmitry Torokhov
2 siblings, 0 replies; 4+ messages in thread
From: Sylvain Rochet @ 2015-10-13 19:13 UTC (permalink / raw)
To: linux-input, Daniel Mack, Johan Hovold, Dmitry Torokhov
Cc: Sylvain Rochet, devicetree
This patch adds property wakeup-source to GPIO rotary encoders.
Signed-off-by: Sylvain Rochet <sylvain.rochet@finsecur.com>
Reviewed-by: Johan Hovold <johan@kernel.org>
Cc: <devicetree@vger.kernel.org>
---
Documentation/devicetree/bindings/input/rotary-encoder.txt | 1 +
Documentation/input/rotary-encoder.txt | 1 +
2 files changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/input/rotary-encoder.txt b/Documentation/devicetree/bindings/input/rotary-encoder.txt
index 3315495..2c643a3 100644
--- 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 5737e35..bddbee1 100644
--- 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 = {
--
2.5.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v5 2/2] input: rotary encoder: Add wake up support
2015-10-13 19:13 [PATCH v5 0/2] input: rotary encoder: Add wake up support Sylvain Rochet
2015-10-13 19:13 ` [PATCH v5 1/2] Documentation: input: rotary encoder: Add wakeup-source property Sylvain Rochet
@ 2015-10-13 19:13 ` Sylvain Rochet
2015-10-14 6:28 ` [PATCH v5 0/2] " Dmitry Torokhov
2 siblings, 0 replies; 4+ messages in thread
From: Sylvain Rochet @ 2015-10-13 19:13 UTC (permalink / raw)
To: linux-input, Daniel Mack, Johan Hovold, Dmitry Torokhov; +Cc: Sylvain Rochet
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>
---
drivers/input/misc/rotary_encoder.c | 37 +++++++++++++++++++++++++++++++++++++
include/linux/rotary_encoder.h | 1 +
2 files changed, 38 insertions(+)
diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index f27f81e..d166554 100644
--- 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 3f594dc..b33f2d2 100644
--- 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__ */
--
2.5.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v5 0/2] input: rotary encoder: Add wake up support
2015-10-13 19:13 [PATCH v5 0/2] input: rotary encoder: Add wake up support Sylvain Rochet
2015-10-13 19:13 ` [PATCH v5 1/2] Documentation: input: rotary encoder: Add wakeup-source property Sylvain Rochet
2015-10-13 19:13 ` [PATCH v5 2/2] input: rotary encoder: Add wake up support Sylvain Rochet
@ 2015-10-14 6:28 ` Dmitry Torokhov
2 siblings, 0 replies; 4+ messages in thread
From: Dmitry Torokhov @ 2015-10-14 6:28 UTC (permalink / raw)
To: Sylvain Rochet; +Cc: linux-input, Daniel Mack, Johan Hovold
On Tue, Oct 13, 2015 at 09:13:38PM +0200, Sylvain Rochet wrote:
> Changes since v4:
> * As suggested by Johan, Reverted the
> device_set_wakeup_capable()/device_wakeup_enable() change,
> stick to device_init_wakeup()
>
> Changes since v3:
> * Stick to the "wakeup-source" DT property, we are standardizing on it.
> * Improved wake-up support: This driver is always supporting wake up
> support, thus it is now calling device_set_wakeup_capable(dev, true)
> followed by device_wakeup_enable(dev) if wake up is enabled at boot
> time. This way the wakeup sysfs tree is always available to the user.
> Only calling device_init_wakeup(dev, false) totally disable wake up
> support at boot tine with no way to enable wake up support furtherly,
> which isn't nice.
>
> Changes since v2:
> * Using false instead of 0 on boolean
> * Splitted DT documentation in a separate patch
>
> Changes since v1:
> * Using DT property wakeup-source instead of rotary-encoder,wakeup
> * Renamed int wakeup to bool wakeup_source
> * Patch cleanup (checkpatch.pl)
>
> Sylvain Rochet (2):
> Documentation: input: rotary encoder: Add wakeup-source property
> input: rotary encoder: Add wake up support
Folded the 2 patches together and applied.
Thank you.
>
> .../devicetree/bindings/input/rotary-encoder.txt | 1 +
> Documentation/input/rotary-encoder.txt | 1 +
> drivers/input/misc/rotary_encoder.c | 37 ++++++++++++++++++++++
> include/linux/rotary_encoder.h | 1 +
> 4 files changed, 40 insertions(+)
>
> --
> 2.5.1
>
--
Dmitry
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-10-14 6:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-13 19:13 [PATCH v5 0/2] input: rotary encoder: Add wake up support Sylvain Rochet
2015-10-13 19:13 ` [PATCH v5 1/2] Documentation: input: rotary encoder: Add wakeup-source property Sylvain Rochet
2015-10-13 19:13 ` [PATCH v5 2/2] input: rotary encoder: Add wake up support Sylvain Rochet
2015-10-14 6:28 ` [PATCH v5 0/2] " Dmitry Torokhov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.