Merge branch 'next' into for-linus

Device tree bindings for Microchip CAP1106, 6 channel capacitive touch sensor

Device tree bindings for Microchip CAP11xx based capacitive touch sensors

The node for this driver must be a child of a I2C controller node, as the

The node for this device must be a child of a I2C controller node, as the

device communication via I2C only.

device communication via I2C only.

Required properties:

Required properties:

	compatible:		Must be "microchip,cap1106"

	compatible:		Must contain one of:

					"microchip,cap1106"

					"microchip,cap1126"

					"microchip,cap1188"

	reg:			The I2C slave address of the device.

	reg:			The I2C slave address of the device.

				Only 0x28 is valid.

	interrupts:		Property describing the interrupt line the

	interrupts:		Property describing the interrupt line the

				device's ALERT#/CM_IRQ# pin is connected to.

				device's ALERT#/CM_IRQ# pin is connected to.

				Valid values are 1, 2, 4, and 8.

				Valid values are 1, 2, 4, and 8.

				By default, a gain of 1 is set.

				By default, a gain of 1 is set.

	microchip,irq-active-high:	By default the interrupt pin is active low

				open drain. This property allows using the active

				high push-pull output.

	linux,keycodes:		Specifies an array of numeric keycode values to

	linux,keycodes:		Specifies an array of numeric keycode values to

				be used for the channels. If this property is

				be used for the channels. If this property is

				omitted, KEY_A, KEY_B, etc are used as

				omitted, KEY_A, KEY_B, etc are used as

		autorepeat;

		autorepeat;

		microchip,sensor-gain = <2>;

		microchip,sensor-gain = <2>;

		linux,keycodes = <103		/* KEY_UP */

		linux,keycodes = <103>,		/* KEY_UP */

				  106		/* KEY_RIGHT */

				 <106>,		/* KEY_RIGHT */

				  108		/* KEY_DOWN */

				 <108>,		/* KEY_DOWN */

				  105		/* KEY_LEFT */

				 <105>,		/* KEY_LEFT */

				  109		/* KEY_PAGEDOWN */

				 <109>,		/* KEY_PAGEDOWN */

				  104>;		/* KEY_PAGEUP */

				 <104>;		/* KEY_PAGEUP */

	};

	};

}

}

Elantech I2C Touchpad

Required properties:

- compatible: must be "elan,ekth3000".

- reg: I2C address of the chip.

- interrupt-parent: a phandle for the interrupt controller (see interrupt

  binding[0]).

- interrupts: interrupt to which the chip is connected (see interrupt

  binding[0]).

Optional properties:

- wakeup-source: touchpad can be used as a wakeup source.

- pinctrl-names: should be "default" (see pinctrl binding [1]).

- pinctrl-0: a phandle pointing to the pin settings for the device (see

  pinctrl binding [1]).

- vcc-supply: a phandle for the regulator supplying 3.3V power.

[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

[1]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

Example:

	&i2c1 {

		/* ... */

		touchpad@15 {

			compatible = "elan,ekth3000";

			reg = <0x15>;

			interrupt-parent = <&gpio4>;

			interrupts = <0x0 IRQ_TYPE_EDGE_FALLING>;

			wakeup-source;

		};

		/* ... */

	};

Elantech I2C Touchscreen

Required properties:

- compatible: must be "elan,ekth3500".

- reg: I2C address of the chip.

- interrupt-parent: a phandle for the interrupt controller (see interrupt

  binding[0]).

- interrupts: interrupt to which the chip is connected (see interrupt

  binding[0]).

Optional properties:

- wakeup-source: touchscreen can be used as a wakeup source.

- pinctrl-names: should be "default" (see pinctrl binding [1]).

- pinctrl-0: a phandle pointing to the pin settings for the device (see

  pinctrl binding [1]).

[0]: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

[1]: Documentation/devicetree/bindings/pinctrl/pinctrl-bindings.txt

Example:

	&i2c1 {

		/* ... */

		touchscreen@10 {

			compatible = "elan,ekth3500";

			reg = <0x10>;

			interrupt-parent = <&gpio4>;

			interrupts = <0x0 IRQ_TYPE_EDGE_FALLING>;

			wakeup-source;

		};

		/* ... */

	};

Each button (key) is represented as a sub-node of "gpio-keys":

Each button (key) is represented as a sub-node of "gpio-keys":

Subnode properties:

Subnode properties:

	- gpios: OF device-tree gpio specification.

	- label: Descriptive name of the key.

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.

	- 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:

Optional subnode-properties:

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

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

	  If not specified defaults to <1> == EV_KEY.

	  If not specified defaults to <1> == EV_KEY.

				linux,code = <103>;

				linux,code = <103>;

				gpios = <&gpio1 0 1>;

				gpios = <&gpio1 0 1>;

			};

			};

			button@22 {

				label = "GPIO Key DOWN";

				linux,code = <108>;

				interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;

			};

			...

			...

dmo	Data Modul AG

dmo	Data Modul AG

ebv	EBV Elektronik

ebv	EBV Elektronik

edt	Emerging Display Technologies

edt	Emerging Display Technologies

elan	Elan Microelectronic Corp.

emmicro	EM Microelectronic

emmicro	EM Microelectronic

epcos	EPCOS AG

epcos	EPCOS AG

epfl	Ecole Polytechnique Fédérale de Lausanne

epfl	Ecole Polytechnique Fédérale de Lausanne