Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2d347ff authored by Alexander Stein's avatar Alexander Stein Committed by Dmitry Torokhov
Browse files

Input: gpio_keys - add device tree support for interrupt only keys 



This features already exists for board config setups. Add support for
device tree based systems.

Signed-off-by: default avatarAlexander Stein <alexander.stein@systec-electronic.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent e147af49

Documentation/devicetree/bindings/input/gpio-keys.txt

+9 −1
Original line number Diff line number Diff line
@@ -10,10 +10,13 @@ Optional properties: 
Each button (key) is represented as a sub-node of "gpio-keys":

Subnode properties:



	- gpios: OF device-tree gpio specification.

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.



Required mutual exclusive subnode-properties:

	- gpios: OF device-tree gpio specification.

	- interrupts: the interrupt line for that input



Optional subnode-properties:

	- linux,input-type: Specify event type this button/key generates.

	  If not specified defaults to <1> == EV_KEY.
@@ -33,4 +36,9 @@ Example nodes: 
				linux,code = <103>;

				gpios = <&gpio1 0 1>;

			};

			button@22 {

				label = "GPIO Key DOWN";

				linux,code = <108>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

			};

			...

drivers/input/keyboard/gpio_keys.c

+20 −14
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/of.h>

#include <linux/of_platform.h>

#include <linux/of_gpio.h>

#include <linux/of_irq.h>

#include <linux/spinlock.h>



struct gpio_button_data {
@@ -617,15 +618,18 @@ gpio_keys_get_devtree_pdata(struct device *dev) 


	i = 0;

	for_each_child_of_node(node, pp) {

		int gpio;

		int gpio = -1;

		int irq;

		enum of_gpio_flags flags;



		if (!of_find_property(pp, "gpios", NULL)) {

			irq = irq_of_parse_and_map(pp, 0);

			if (irq == 0) {

				pdata->nbuttons--;

			dev_warn(dev, "Found button without gpios\n");

				dev_warn(dev, "Found button without gpios or irqs\n");

				continue;

			}



		} else {

			gpio = of_get_gpio_flags(pp, 0, &flags);

			if (gpio < 0) {

				error = gpio;
@@ -635,10 +639,12 @@ gpio_keys_get_devtree_pdata(struct device *dev) 
						error);

				return ERR_PTR(error);

			}

		}



		button = &pdata->buttons[i++];



		button->gpio = gpio;

		button->irq = irq;

		button->active_low = flags & OF_GPIO_ACTIVE_LOW;



		if (of_property_read_u32(pp, "linux,code", &button->code)) {