Merge branch 'next' into for-linus

Samsung tm2-touchkey

Required properties:

- compatible: must be "cypress,tm2-touchkey"

- 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]).

- vcc-supply : internal regulator output. 1.8V

- vdd-supply : power supply for IC 3.3V

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

Example:

	&i2c0 {

		/* ... */

		touchkey@20 {

			compatible = "cypress,tm2-touchkey";

			reg = <0x20>;

			interrupt-parent = <&gpa3>;

			interrupts = <2 IRQ_TYPE_EDGE_FALLING>;

			vcc-supply=<&ldo32_reg>;

			vdd-supply=<&ldo33_reg>;

		};

	};

* Freescale MPR121 Controllor

Required Properties:

- compatible:		Should be "fsl,mpr121-touchkey"

- reg:			The I2C slave address of the device.

- interrupts:		The interrupt number to the cpu.

- vdd-supply:		Phandle to the Vdd power supply.

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

			be used for reporting button presses. The array can

			contain up to 12 entries.

Optional Properties:

- wakeup-source:	Use any event on keypad as wakeup event.

- autorepeat:		Enable autorepeat feature.

Example:

#include "dt-bindings/input/input.h"

	touchkey: mpr121@5a {

		compatible = "fsl,mpr121-touchkey";

		reg = <0x5a>;

		interrupt-parent = <&gpio1>;

		interrupts = <28 2>;

		autorepeat;

		vdd-supply = <&ldo4_reg>;

		linux,keycodes = <KEY_0>, <KEY_1>, <KEY_2>, <KEY_3>,

				<KEY_4> <KEY_5>, <KEY_6>, <KEY_7>,

				<KEY_8>, <KEY_9>, <KEY_A>, <KEY_B>;

	};

Required properties:

- compatible: should be "pwm-beeper"

- pwms: phandle to the physical PWM device

Optional properties:

- amp-supply: phandle to a regulator that acts as an amplifier for the beeper

Example:

beeper_amp: amplifier {

	compatible = "fixed-regulator";

	gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;

};

beeper {

	compatible = "pwm-beeper";

	pwms = <&pwm0>;

	amp-supply = <&beeper_amp>;

};

Zeitec ZET6223 I2C touchscreen controller

Required properties:

- compatible		  : "zeitec,zet6223"

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

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

			    serving the interrupt for this chip

- interrupts		  : interrupt specification for the zet6223 interrupt

Optional properties:

- vio-supply		  : Specification for VIO supply (1.8V or 3.3V,

			    depending on system interface needs).

- vcc-supply		  : Specification for 3.3V VCC supply.

- touchscreen-size-x	  : See touchscreen.txt

- touchscreen-size-y	  : See touchscreen.txt

- touchscreen-inverted-x  : See touchscreen.txt

- touchscreen-inverted-y  : See touchscreen.txt

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

Example:

i2c@00000000 {

	zet6223: touchscreen@76 {

		compatible = "zeitec,zet6223";

		reg = <0x76>;

		interrupt-parent = <&pio>;

		interrupts = <6 11 IRQ_TYPE_EDGE_FALLING>

	};

};

xillybus	Xillybus Ltd.

xlnx	Xilinx

zarlink	Zarlink Semiconductor

zeitec	ZEITEC Semiconductor Co., LTD.

zii	Zodiac Inflight Innovations

zte	ZTE Corp.

zyxel	ZyXEL Communications Corp.