[PATCH v2] input: tca8418: Use the interrupt trigger from the device tree

[PATCH v2] input: tca8418: Use the interrupt trigger from the device tree

[Maxime Ripard]

The TCA8418 might be used using different interrupt triggers on various
boards. This is not working so far because the current code forces a
falling edge trigger.

The device tree already provides a trigger type, so let's use whatever it
sets up, and since we can be loaded without DT, keep the old behaviour for
the non-DT case.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
Hi,

This is the second version of the patch "drivers: tca8418: Change the
interrupt type".

Changes from v1:
  - Rely on the trigger type provided by the DT

 drivers/input/keyboard/tca8418_keypad.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/input/keyboard/tca8418_keypad.c b/drivers/input/keyboard/tca8418_keypad.c
index 9002298698fc..33e4950431c8 100644
--- a/drivers/input/keyboard/tca8418_keypad.c
+++ b/drivers/input/keyboard/tca8418_keypad.c
@@ -274,6 +274,7 @@ static int tca8418_keypad_probe(struct i2c_client *client,
 	bool irq_is_gpio = false;
 	int irq;
 	int error, row_shift, max_keys;
+	unsigned long trigger = 0;
 
 	/* Copy the platform data */
 	if (pdata) {
@@ -286,6 +287,7 @@ static int tca8418_keypad_probe(struct i2c_client *client,
 		cols = pdata->cols;
 		rep  = pdata->rep;
 		irq_is_gpio = pdata->irq_is_gpio;
+		trigger = IRQF_TRIGGER_FALLING;
 	} else {
 		struct device_node *np = dev->of_node;
 		int err;
@@ -360,9 +362,7 @@ static int tca8418_keypad_probe(struct i2c_client *client,
 		irq = gpio_to_irq(irq);
 
 	error = devm_request_threaded_irq(dev, irq, NULL, tca8418_irq_handler,
-					  IRQF_TRIGGER_FALLING |
-						IRQF_SHARED |
-						IRQF_ONESHOT,
+					  trigger | IRQF_SHARED | IRQF_ONESHOT,
 					  client->name, keypad_data);
 	if (error) {
 		dev_err(dev, "Unable to claim irq %d; error %d\n",
-- 
2.10.1

Re: [PATCH v2] input: tca8418: Use the interrupt trigger from the device tree

[Maxime Ripard]

[-- Attachment #1: Type: text/plain, Size: 665 bytes --]

Hi Dmitry,

On Mon, Nov 14, 2016 at 09:39:11AM +0100, Maxime Ripard wrote:
> The TCA8418 might be used using different interrupt triggers on various
> boards. This is not working so far because the current code forces a
> falling edge trigger.
> 
> The device tree already provides a trigger type, so let's use whatever it
> sets up, and since we can be loaded without DT, keep the old behaviour for
> the non-DT case.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

Did you have some time to review this?

Thanks,
Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 801 bytes --]