Merge branch 'next' into for-linus

* GPIO driven matrix keypad device tree bindings

GPIO driven matrix keypad is used to interface a SoC with a matrix keypad.

The matrix keypad supports multiple row and column lines, a key can be

placed at each intersection of a unique row and a unique column. The matrix

keypad can sense a key-press and key-release by means of GPIO lines and

report the event using GPIO interrupts to the cpu.

Required Properties:

- compatible:		Should be "gpio-matrix-keypad"

- row-gpios:		List of gpios used as row lines. The gpio specifier

			for this property depends on the gpio controller to

			which these row lines are connected.

- col-gpios:		List of gpios used as column lines. The gpio specifier

			for this property depends on the gpio controller to

			which these column lines are connected.

- linux,keymap:		The definition can be found at

			bindings/input/matrix-keymap.txt

Optional Properties:

- linux,no-autorepeat:	do no enable autorepeat feature.

- linux,wakeup:		use any event on keypad as wakeup event.

- debounce-delay-ms:	debounce interval in milliseconds

- col-scan-delay-us:	delay, measured in microseconds, that is needed

			before we can scan keypad after activating column gpio

Example:

	matrix-keypad {

		compatible = "gpio-matrix-keypad";

		debounce-delay-ms = <5>;

		col-scan-delay-us = <2>;

		row-gpios = <&gpio2 25 0

			     &gpio2 26 0

			     &gpio2 27 0>;

		col-gpios = <&gpio2 21 0

			     &gpio2 22 0>;

		linux,keymap = <0x0000008B

				0x0100009E

				0x02000069

				0x0001006A

				0x0101001C

				0x0201006C>;

	};

* PWM beeper device tree bindings

Registers a PWM device as beeper.

Required properties:

- compatible: should be "pwm-beeper"

- pwms: phandle to the physical PWM device

* STMPE Keypad

Required properties:

 - compatible               : "st,stmpe-keypad"

 - linux,keymap             : See ./matrix-keymap.txt

Optional properties:

 - debounce-interval        : Debouncing interval time in milliseconds

 - st,scan-count            : Scanning cycles elapsed before key data is updated

 - st,no-autorepeat         : If specified device will not autorepeat

Example:

	stmpe_keypad {

		compatible = "st,stmpe-keypad";

		debounce-interval = <64>;

		st,scan-count = <8>;

		st,no-autorepeat;

		linux,keymap = <0x205006b

				0x4010074

				0x3050072

				0x1030004

				0x502006a

				0x500000a

				0x5008b

				0x706001c

				0x405000b

				0x6070003

				0x3040067

				0x303006c

				0x60400e7

				0x602009e

				0x4020073

				0x5050002

				0x4030069

				0x3020008>;

	};

Required properties:

- compatible: "ti,tca8418"

- reg: the I2C address

- interrupts: IRQ line number, should trigger on falling edge

- keypad,num-rows: The number of rows

- keypad,num-columns: The number of columns

- linux,keymap: Keys definitions, see keypad-matrix.

* MELFAS MMS114 touchscreen controller

Required properties:

- compatible: must be "melfas,mms114"

- reg: I2C address of the chip

- interrupts: interrupt to which the chip is connected

- x-size: horizontal resolution of touchscreen

- y-size: vertical resolution of touchscreen

Optional properties:

- contact-threshold:

- moving-threshold:

- x-invert: invert X axis

- y-invert: invert Y axis

Example:

	i2c@00000000 {

		/* ... */

		touchscreen@48 {

			compatible = "melfas,mms114";

			reg = <0x48>;

			interrupts = <39 0>;

			x-size = <720>;

			y-size = <1280>;

			contact-threshold = <10>;

			moving-threshold = <10>;

			x-invert;

			y-invert;

		};

		/* ... */

	};