Commit 259b77ef authored by Maxime Ripard's avatar Maxime Ripard Committed by Dmitry Torokhov
Browse files

Input: tca8418 - use the interrupt trigger from the device tree 



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: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 13e360ac

drivers/input/keyboard/tca8418_keypad.c

+3 −3
Original line number Diff line number Diff line
@@ -277,6 +277,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) {
@@ -289,6 +290,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;
@@ -363,9 +365,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",