Merge branch 'next' into for-linus

ADC attached resistor ladder buttons

------------------------------------

Required properties:

 - compatible: "adc-keys"

 - io-channels: Phandle to an ADC channel

 - io-channel-names = "buttons";

 - keyup-threshold-microvolt: Voltage at which all the keys are considered up.

Optional properties:

	- poll-interval: Poll interval time in milliseconds

	- autorepeat: Boolean, Enable auto repeat feature of Linux input

	  subsystem.

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

Required subnode-properties:

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.

	- press-threshold-microvolt: Voltage ADC input when this key is pressed.

Example:

#include <dt-bindings/input/input.h>

	adc-keys {

		compatible = "adc-keys";

		io-channels = <&lradc 0>;

		io-channel-names = "buttons";

		keyup-threshold-microvolt = <2000000>;

		button-up {

			label = "Volume Up";

			linux,code = <KEY_VOLUMEUP>;

			press-threshold-microvolt = <1500000>;

		};

		button-down {

			label = "Volume Down";

			linux,code = <KEY_VOLUMEDOWN>;

			press-threshold-microvolt = <1000000>;

		};

		button-enter {

			label = "Enter";

			linux,code = <KEY_ENTER>;

			press-threshold-microvolt = <500000>;

		};

	};

* GPIO Decoder DT bindings

Required Properties:

- compatible: should be "gpio-decoder"

- gpios: a spec of gpios (at least two) to be decoded to a number with

  first entry representing the MSB.

Optional Properties:

- decoder-max-value: Maximum possible value that can be reported by

  the gpios.

- linux,axis: the input subsystem axis to map to (ABS_X/ABS_Y).

  Defaults to 0 (ABS_X).

Example:

	gpio-decoder0 {

		compatible = "gpio-decoder";

		gpios = <&pca9536 3 GPIO_ACTIVE_HIGH>,

			<&pca9536 2 GPIO_ACTIVE_HIGH>,

			<&pca9536 1 GPIO_ACTIVE_HIGH>,

			<&pca9536 0 GPIO_ACTIVE_HIGH>;

		linux,axis = <0>; /* ABS_X */

		decoder-max-value = <9>;

	};

	gpio_keys_polled {

			compatible = "gpio-keys-polled";

			#address-cells = <1>;

			#size-cells = <0>;

			poll-interval = <100>;

			autorepeat;

			button@21 {

			button21 {

				label = "GPIO Key UP";

				linux,code = <103>;

				gpios = <&gpio1 0 1>;

           or:  "edt,edt-ft5306"

           or:  "edt,edt-ft5406"

           or:  "edt,edt-ft5506"

           or:  "focaltech,ft6236"

 - reg:         I2C slave address of the chip (0x38)

 - interrupt-parent: a phandle pointing to the interrupt controller

 - offset:      allows setting the edge compensation in the range from

                0 to 31.

 - touchscreen-size-x	   : See touchscreen.txt

 - touchscreen-size-y	   : See touchscreen.txt

 - touchscreen-fuzz-x      : See touchscreen.txt

 - touchscreen-fuzz-y      : See touchscreen.txt

 - touchscreen-inverted-x  : See touchscreen.txt

 - touchscreen-inverted-y  : See touchscreen.txt

 - touchscreen-swapped-x-y : See touchscreen.txt

Example:

	polytouch: edt-ft5x06@38 {

* Elan eKTF2127 I2C touchscreen controller

Required properties:

 - compatible		  : "elan,ektf2127"

 - reg			  : I2C slave address of the chip (0x40)

 - interrupt-parent	  : a phandle pointing to the interrupt controller

			    serving the interrupt for this chip

 - interrupts		  : interrupt specification for the ektf2127 interrupt

 - power-gpios		  : GPIO specification for the pin connected to the

			    ektf2127's wake input. This needs to be driven high

			    to take ektf2127 out of it's low power state

For additional optional properties see: touchscreen.txt

Example:

i2c@00000000 {

	ektf2127: touchscreen@15 {

		compatible = "elan,ektf2127";

		reg = <0x15>;

		interrupt-parent = <&pio>;

		interrupts = <6 11 IRQ_TYPE_EDGE_FALLING>

		power-gpios = <&pio 1 3 GPIO_ACTIVE_HIGH>;

		touchscreen-inverted-x;

		touchscreen-swapped-x-y;

	};

};