Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

* Marvell 88PM860x Power Management IC

Required parent device properties:

- compatible : "marvell,88pm860x"

- reg : the I2C slave address for the 88pm860x chip

- interrupts : IRQ line for the 88pm860x chip

- interrupt-controller: describes the 88pm860x as an interrupt controller (has its own domain)

- #interrupt-cells : should be 1.

		- The cell is the 88pm860x local IRQ number

Optional parent device properties:

- marvell,88pm860x-irq-read-clr: inicates whether interrupt status is cleared by read

- marvell,88pm860x-slave-addr: 88pm860x are two chips solution. <reg> stores the I2C address

				of one chip, and this property stores the I2C address of

				another chip.

88pm860x consists of a large and varied group of sub-devices:

Device			 Supply Names	 Description

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

88pm860x-onkey		:		: On key

88pm860x-rtc		:		: RTC

88pm8607		:		: Regulators

88pm860x-backlight	:		: Backlight

88pm860x-led		:		: Led

88pm860x-touch		:		: Touchscreen

Example:

	pmic: 88pm860x@34 {

		compatible = "marvell,88pm860x";

		reg = <0x34>;

		interrupts = <4>;

		interrupt-parent = <&intc>;

		interrupt-controller;

		#interrupt-cells = <1>;

		marvell,88pm860x-irq-read-clr;

		marvell,88pm860x-slave-addr = <0x11>;

		regulators {

			BUCK1 {

				regulator-min-microvolt = <1000000>;

				regulator-max-microvolt = <1500000>;

				regulator-boot-on;

				regulator-always-on;

			};

			LDO1 {

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <2800000>;

				regulator-boot-on;

				regulator-always-on;

			};

		};

		rtc {

			marvell,88pm860x-vrtc = <1>;

		};

		touch {

			marvell,88pm860x-gpadc-prebias = <1>;

			marvell,88pm860x-gpadc-slot-cycle = <1>;

			marvell,88pm860x-tsi-prebias = <6>;

			marvell,88pm860x-pen-prebias = <16>;

			marvell,88pm860x-pen-prechg = <2>;

			marvell,88pm860x-resistor-X = <300>;

		};

		backlights {

			backlight-0 {

				marvell,88pm860x-iset = <4>;

				marvell,88pm860x-pwm = <3>;

			};

			backlight-2 {

			};

		};

		leds {

			led0-red {

				marvell,88pm860x-iset = <12>;

			};

			led0-green {

				marvell,88pm860x-iset = <12>;

			};

			led0-blue {

				marvell,88pm860x-iset = <12>;

			};

		};

	};

* System Controller Registers R/W driver

System controller node represents a register region containing a set

of miscellaneous registers. The registers are not cohesive enough to

represent as any specific type of device. The typical use-case is for

some other node's driver, or platform-specific code, to acquire a

reference to the syscon node (e.g. by phandle, node path, or search

using a specific compatible value), interrogate the node (or associated

OS driver) to determine the location of the registers, and access the

registers directly.

Required properties:

- compatible: Should contain "syscon".

- reg: the register region can be accessed from syscon

Examples:

gpr: iomuxc-gpr@020e0000 {

	compatible = "fsl,imx6q-iomuxc-gpr", "syscon";

	reg = <0x020e0000 0x38>;

};

  in TPS6591X datasheet)

- ti,en-gpio-sleep: enable sleep control for gpios

  There should be 9 entries here, one for each gpio.

- ti,system-power-controller: Telling whether or not this pmic is controlling

  the system power.

Regulator Optional properties:

- ti,regulator-ext-sleep-control: enable external sleep

		#interrupt-cells = <2>;

		interrupt-controller;

		ti,system-power-controller;

		ti,vmbch-threshold = 0;

		ti,vmbch2-threshold = 0;

		ti,en-ck32k-xtal;

Texas Instruments TWL family (twl4030) audio module

The audio module inside the TWL family consist of an audio codec and a vibra

driver.

Required properties:

- compatible : must be "ti,twl4030-audio"

Optional properties, nodes:

Audio functionality:

- codec { }: Need to be present if the audio functionality is used. Within this

	     section the following options can be used:

- ti,digimic_delay: Delay need after enabling the digimic to reduce artifacts

		    from the start of the recorded sample (in ms)

-ti,ramp_delay_value: HS ramp delay configuration to reduce pop noise

-ti,hs_extmute: Use external mute for HS pop reduction

-ti,hs_extmute_gpio: Use external GPIO to control the external mute

-ti,offset_cncl_path: Offset cancellation path selection, refer to TRM for the

		      valid values.

Vibra functionality

- ti,enable-vibra: Need to be set to <1> if the vibra functionality is used. if

		   missing or it is 0, the vibra functionality is disabled.

Example:

&i2c1 {

	clock-frequency = <2600000>;

	twl: twl@48 {

		reg = <0x48>;

		interrupts = <7>; /* SYS_NIRQ cascaded to intc */

		interrupt-parent = <&intc>;

		twl_audio: audio {

			compatible = "ti,twl4030-audio";

			ti,enable-vibra = <1>;

			codec {

				ti,ramp_delay_value = <3>;

			};

		};

	};

};

Texas Instruments TWL6040 family

The TWL6040s are 8-channel high quality low-power audio codecs providing audio

and vibra functionality on OMAP4+ platforms.

The TWL6040s are 8-channel high quality low-power audio codecs providing audio,

vibra and GPO functionality on OMAP4+ platforms.

They are connected ot the host processor via i2c for commands, McPDM for audio

data and commands.

- reg: must be 0x4b for i2c address

- interrupts: twl6040 has one interrupt line connecteded to the main SoC

- interrupt-parent: The parent interrupt controller

- gpio-controller:

- #gpio-cells = <1>: twl6040 provides GPO lines.

- twl6040,audpwron-gpio: Power on GPIO line for the twl6040

- vio-supply: Regulator for the twl6040 VIO supply

&i2c1 {

	twl6040: twl@4b {

		compatible = "ti,twl6040";

		reg = <0x4b>;

		interrupts = <0 119 4>;

		interrupt-parent = <&gic>;

		};

	};

};

/include/ "twl6040.dtsi"