Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1311718 > unrolled thread

[PATCH 0/4] rotary-encoder: use generic device properties

Back to article view | Back to linux.kernel

Contents

  [PATCH 0/4] rotary-encoder: use generic device properties Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2016-01-18 18:50 +0100
    [PATCH 3/4] Input: rotary_encoder - use input_set_capability() Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2016-01-18 18:50 +0100
    [PATCH 2/4] Input: rotary_encoder - convert to use gpiod API Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2016-01-18 18:50 +0100
    [PATCH 1/4] Input: rotary_encoder - mark PM methods as __maybe_unused Dmitry Torokhov <dmitry.torokhov@gmail.com> - 2016-01-18 18:50 +0100
    Re: [PATCH 0/4] rotary-encoder: use generic device properties Robert Jarzmik <robert.jarzmik@free.fr> - 2016-01-23 19:10 +0100

#1311718 — [PATCH 0/4] rotary-encoder: use generic device properties

Hi,

This series tries to move the driver away from legacy platform data towards
using platform-independent way of retrieving both configuration parameters and
GPIOs (device_property_read_* and gpiod APIs).

This is based on top of 2 Timo's patches converting the driver to use devm* API
and threaded IRQs. I uploaded all changes into 'rotary-encoder' branch of my
tree.

I do not have hard ware so please give it a spin, especially on raumfield as it
uses branch new way of passing platform parameters to the driver.

Thanks.

-- 
Dmitry

[toc] | [next] | [standalone]

#1311721 — [PATCH 3/4] Input: rotary_encoder - use input_set_capability()

Instead of manipulating capability bits directly let's use appropriate
helpers. Also there is no need to explicitly set EV_ABS when calling
input_set_abs_params().

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/misc/rotary_encoder.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index e913bfb64..1882e65 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -318,14 +318,10 @@ static int rotary_encoder_probe(struct platform_device *pdev)
 	input->id.bustype = BUS_HOST;
 	input->dev.parent = dev;
 
-	if (pdata->relative_axis) {
-		input->evbit[0] = BIT_MASK(EV_REL);
-		input->relbit[0] = BIT_MASK(pdata->axis);
-	} else {
-		input->evbit[0] = BIT_MASK(EV_ABS);
-		input_set_abs_params(encoder->input,
-				     pdata->axis, 0, pdata->steps, 0, 1);
-	}
+	if (pdata->relative_axis)
+		input_set_capability(input, EV_REL, pdata->axis);
+	else
+		input_set_abs_params(input, pdata->axis, 0, pdata->steps, 0, 1);
 
 	switch (pdata->steps_per_period) {
 	case 4:
-- 
2.6.0.rc2.230.g3dd15c0

[toc] | [prev] | [next] | [standalone]

#1311723 — [PATCH 2/4] Input: rotary_encoder - convert to use gpiod API

Instead of using old GPIO API, let's switch to GPIOD API, which
automatically handles polarity.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 arch/arm/mach-pxa/raumfeld.c        | 21 +++++++++--
 drivers/input/misc/rotary_encoder.c | 73 +++++++++++++++++--------------------
 include/linux/rotary_encoder.h      |  4 --
 3 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/arch/arm/mach-pxa/raumfeld.c b/arch/arm/mach-pxa/raumfeld.c
index 36571a9..d156f79 100644
--- a/arch/arm/mach-pxa/raumfeld.c
+++ b/arch/arm/mach-pxa/raumfeld.c
@@ -21,6 +21,7 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/gpio.h>
+#include <linux/gpio/machine.h>
 #include <linux/smsc911x.h>
 #include <linux/input.h>
 #include <linux/rotary_encoder.h>
@@ -366,14 +367,21 @@ static struct pxaohci_platform_data raumfeld_ohci_info = {
  * Rotary encoder input device
  */
 
+static struct gpiod_lookup_table raumfeld_rotary_gpios_table = {
+	.dev_id = "rotary-encoder",
+	.table = {
+		GPIO_LOOKUP_IDX("gpio-0",
+				GPIO_VOLENC_A, NULL, 0, GPIO_ACTIVE_LOW),
+		GPIO_LOOKUP_IDX("gpio-0",
+				GPIO_VOLENC_B, NULL, 1, GPIO_ACTIVE_HIGH),
+		{ },
+	},
+};
+
 static struct rotary_encoder_platform_data raumfeld_rotary_encoder_info = {
 	.steps		= 24,
 	.axis		= REL_X,
 	.relative_axis	= 1,
-	.gpio_a		= GPIO_VOLENC_A,
-	.gpio_b		= GPIO_VOLENC_B,
-	.inverted_a	= 1,
-	.inverted_b	= 0,
 };
 
 static struct platform_device rotary_encoder_device = {
@@ -1051,7 +1059,10 @@ static void __init raumfeld_controller_init(void)
 	int ret;
 
 	pxa3xx_mfp_config(ARRAY_AND_SIZE(raumfeld_controller_pin_config));
+
+	gpiod_add_lookup_table(&raumfeld_rotary_gpios_table);
 	platform_device_register(&rotary_encoder_device);
+
 	spi_register_board_info(ARRAY_AND_SIZE(controller_spi_devices));
 	i2c_register_board_info(0, &raumfeld_controller_i2c_board_info, 1);
 
@@ -1086,6 +1097,8 @@ static void __init raumfeld_speaker_init(void)
 	i2c_register_board_info(0, &raumfeld_connector_i2c_board_info, 1);
 
 	platform_device_register(&smc91x_device);
+
+	gpiod_add_lookup_table(&raumfeld_rotary_gpios_table);
 	platform_device_register(&rotary_encoder_device);
 
 	raumfeld_audio_init();
diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index b9a86ca..e913bfb64 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -20,12 +20,11 @@
 #include <linux/input.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/rotary_encoder.h>
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
-#include <linux/of_gpio.h>
 #include <linux/pm.h>
 
 #define DRV_NAME "rotary-encoder"
@@ -38,6 +37,9 @@ struct rotary_encoder {
 	unsigned int axis;
 	unsigned int pos;
 
+	struct gpio_desc *gpio_a;
+	struct gpio_desc *gpio_b;
+
 	unsigned int irq_a;
 	unsigned int irq_b;
 
@@ -47,13 +49,10 @@ struct rotary_encoder {
 	char last_stable;
 };
 
-static int rotary_encoder_get_state(const struct rotary_encoder_platform_data *pdata)
+static int rotary_encoder_get_state(struct rotary_encoder *encoder)
 {
-	int a = !!gpio_get_value_cansleep(pdata->gpio_a);
-	int b = !!gpio_get_value_cansleep(pdata->gpio_b);
-
-	a ^= pdata->inverted_a;
-	b ^= pdata->inverted_b;
+	int a = !!gpiod_get_value_cansleep(encoder->gpio_a);
+	int b = !!gpiod_get_value_cansleep(encoder->gpio_b);
 
 	return ((a << 1) | b);
 }
@@ -97,7 +96,7 @@ static irqreturn_t rotary_encoder_irq(int irq, void *dev_id)
 
 	mutex_lock(&encoder->access_mutex);
 
-	state = rotary_encoder_get_state(encoder->pdata);
+	state = rotary_encoder_get_state(encoder);
 
 	switch (state) {
 	case 0x0:
@@ -130,7 +129,7 @@ static irqreturn_t rotary_encoder_half_period_irq(int irq, void *dev_id)
 
 	mutex_lock(&encoder->access_mutex);
 
-	state = rotary_encoder_get_state(encoder->pdata);
+	state = rotary_encoder_get_state(encoder);
 
 	switch (state) {
 	case 0x00:
@@ -160,7 +159,7 @@ static irqreturn_t rotary_encoder_quarter_period_irq(int irq, void *dev_id)
 
 	mutex_lock(&encoder->access_mutex);
 
-	state = rotary_encoder_get_state(encoder->pdata);
+	state = rotary_encoder_get_state(encoder);
 
 	/*
 	 * We encode the previous and the current state using a byte.
@@ -232,12 +231,6 @@ static struct rotary_encoder_platform_data *rotary_encoder_parse_dt(struct devic
 	of_property_read_u32(np, "rotary-encoder,steps", &pdata->steps);
 	of_property_read_u32(np, "linux,axis", &pdata->axis);
 
-	pdata->gpio_a = of_get_gpio_flags(np, 0, &flags);
-	pdata->inverted_a = flags & OF_GPIO_ACTIVE_LOW;
-
-	pdata->gpio_b = of_get_gpio_flags(np, 1, &flags);
-	pdata->inverted_b = flags & OF_GPIO_ACTIVE_LOW;
-
 	pdata->relative_axis =
 		of_property_read_bool(np, "rotary-encoder,relative-axis");
 	pdata->rollover = of_property_read_bool(np, "rotary-encoder,rollover");
@@ -294,14 +287,32 @@ static int rotary_encoder_probe(struct platform_device *pdev)
 	if (!encoder)
 		return -ENOMEM;
 
+	mutex_init(&encoder->access_mutex);
+	encoder->pdata = pdata;
+
+	encoder->gpio_a = devm_gpiod_get_index(dev, NULL, 0, GPIOD_IN);
+	if (IS_ERR(encoder->gpio_a)) {
+		err = PTR_ERR(encoder->gpio_a);
+		dev_err(dev, "unable to get GPIO at index 0: %d\n", err);
+		return err;
+	}
+
+	encoder->irq_a = gpiod_to_irq(encoder->gpio_a);
+
+	encoder->gpio_b = devm_gpiod_get_index(dev, NULL, 1, GPIOD_IN);
+	if (IS_ERR(encoder->gpio_b)) {
+		err = PTR_ERR(encoder->gpio_b);
+		dev_err(dev, "unable to get GPIO at index 1: %d\n", err);
+		return err;
+	}
+
+	encoder->irq_b = gpiod_to_irq(encoder->gpio_b);
+
 	input = devm_input_allocate_device(dev);
 	if (!input)
 		return -ENOMEM;
 
-	mutex_init(&encoder->access_mutex);
-
 	encoder->input = input;
-	encoder->pdata = pdata;
 
 	input->name = pdev->name;
 	input->id.bustype = BUS_HOST;
@@ -316,32 +327,14 @@ static int rotary_encoder_probe(struct platform_device *pdev)
 				     pdata->axis, 0, pdata->steps, 0, 1);
 	}
 
-	/* request the GPIOs */
-	err = devm_gpio_request_one(dev, pdata->gpio_a, GPIOF_IN,
-				    dev_name(dev));
-	if (err) {
-		dev_err(dev, "unable to request GPIO %d\n", pdata->gpio_a);
-		return err;
-	}
-
-	err = devm_gpio_request_one(dev, pdata->gpio_b, GPIOF_IN,
-				    dev_name(dev));
-	if (err) {
-		dev_err(dev, "unable to request GPIO %d\n", pdata->gpio_b);
-		return err;
-	}
-
-	encoder->irq_a = gpio_to_irq(pdata->gpio_a);
-	encoder->irq_b = gpio_to_irq(pdata->gpio_b);
-
 	switch (pdata->steps_per_period) {
 	case 4:
 		handler = &rotary_encoder_quarter_period_irq;
-		encoder->last_stable = rotary_encoder_get_state(pdata);
+		encoder->last_stable = rotary_encoder_get_state(encoder);
 		break;
 	case 2:
 		handler = &rotary_encoder_half_period_irq;
-		encoder->last_stable = rotary_encoder_get_state(pdata);
+		encoder->last_stable = rotary_encoder_get_state(encoder);
 		break;
 	case 1:
 		handler = &rotary_encoder_irq;
diff --git a/include/linux/rotary_encoder.h b/include/linux/rotary_encoder.h
index fe3dc64..4536c81 100644
--- a/include/linux/rotary_encoder.h
+++ b/include/linux/rotary_encoder.h
@@ -4,10 +4,6 @@
 struct rotary_encoder_platform_data {
 	unsigned int steps;
 	unsigned int axis;
-	unsigned int gpio_a;
-	unsigned int gpio_b;
-	unsigned int inverted_a;
-	unsigned int inverted_b;
 	unsigned int steps_per_period;
 	bool relative_axis;
 	bool rollover;
-- 
2.6.0.rc2.230.g3dd15c0

[toc] | [prev] | [next] | [standalone]

#1311724 — [PATCH 1/4] Input: rotary_encoder - mark PM methods as __maybe_unused

Instead of guarding PM methods with #ifdef let's mark them as
__maybe_unused as it allows for better compile coverage.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/input/misc/rotary_encoder.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index 7828bd1..b9a86ca 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -381,8 +381,7 @@ static int rotary_encoder_probe(struct platform_device *pdev)
 	return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
-static int rotary_encoder_suspend(struct device *dev)
+static int __maybe_unused rotary_encoder_suspend(struct device *dev)
 {
 	struct rotary_encoder *encoder = dev_get_drvdata(dev);
 
@@ -394,7 +393,7 @@ static int rotary_encoder_suspend(struct device *dev)
 	return 0;
 }
 
-static int rotary_encoder_resume(struct device *dev)
+static int __maybe_unused rotary_encoder_resume(struct device *dev)
 {
 	struct rotary_encoder *encoder = dev_get_drvdata(dev);
 
@@ -405,10 +404,9 @@ static int rotary_encoder_resume(struct device *dev)
 
 	return 0;
 }
-#endif
 
 static SIMPLE_DEV_PM_OPS(rotary_encoder_pm_ops,
-		 rotary_encoder_suspend, rotary_encoder_resume);
+			 rotary_encoder_suspend, rotary_encoder_resume);
 
 static struct platform_driver rotary_encoder_driver = {
 	.probe		= rotary_encoder_probe,
-- 
2.6.0.rc2.230.g3dd15c0

[toc] | [prev] | [next] | [standalone]

#1315714

Dmitry Torokhov <dmitry.torokhov@gmail.com> writes:

> Hi,
>
> This series tries to move the driver away from legacy platform data towards
> using platform-independent way of retrieving both configuration parameters and
> GPIOs (device_property_read_* and gpiod APIs).
>
> This is based on top of 2 Timo's patches converting the driver to use devm* API
> and threaded IRQs. I uploaded all changes into 'rotary-encoder' branch of my
> tree.
>
> I do not have hard ware so please give it a spin, especially on raumfield as it
> uses branch new way of passing platform parameters to the driver.

Hi Dmitry,

From the pxa architecture point of view, it looks fine to me.
Daniel, I seem to remember you had this raumfeld hardware, would you have the
opportunity to give this serie a try ?

Cheers.

-- 
Robert

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web