Merge tag 'mmc-v3.20-1' of git://git.linaro.org/people/ulf.hansson/mmc

* The simple eMMC hardware reset provider

The purpose of this driver is to perform standard eMMC hw reset

procedure, as descibed by Jedec 4.4 specification. This procedure is

performed just after MMC core enabled power to the given mmc host (to

fix possible issues if bootloader has left eMMC card in initialized or

unknown state), and before performing complete system reboot (also in

case of emergency reboot call). The latter is needed on boards, which

doesn't have hardware reset logic connected to emmc card and (limited or

broken) ROM bootloaders are unable to read second stage from the emmc

card if the card is left in unknown or already initialized state.

Required properties:

- compatible : contains "mmc-pwrseq-emmc".

- reset-gpios : contains a GPIO specifier. The reset GPIO is asserted

	and then deasserted to perform eMMC card reset. To perform

	reset procedure as described in Jedec 4.4 specification, the

	gpio line should be defined as GPIO_ACTIVE_LOW.

Example:

	sdhci0_pwrseq {

		compatible = "mmc-pwrseq-emmc";

		reset-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;

	}

* The simple MMC power sequence provider

The purpose of the simple MMC power sequence provider is to supports a set of

common properties between various SOC designs. It thus enables us to use the

same provider for several SOC designs.

Required properties:

- compatible : contains "mmc-pwrseq-simple".

Optional properties:

- reset-gpios : contains a list of GPIO specifiers. The reset GPIOs are asserted

	at initialization and prior we start the power up procedure of the card.

	They will be de-asserted right after the power has been provided to the

	card.

- clocks : Must contain an entry for the entry in clock-names.

  See ../clocks/clock-bindings.txt for details.

- clock-names : Must include the following entry:

  "ext_clock" (External clock provided to the card).

Example:

	sdhci0_pwrseq {

		compatible = "mmc-pwrseq-simple";

		reset-gpios = <&gpio1 12 0>;

	}

- keep-power-in-suspend: Preserves card power during a suspend/resume cycle

- enable-sdio-wakeup: Enables wake up of host system on SDIO IRQ assertion

Example:

MMC power sequences:

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

System on chip designs may specify a specific MMC power sequence. To

successfully detect an (e)MMC/SD/SDIO card, that power sequence must be

maintained while initializing the card.

Optional property:

- mmc-pwrseq: phandle to the MMC power sequence node. See "mmc-pwrseq-*"

	for documentation of MMC power sequence bindings.

Use of Function subnodes

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

On embedded systems the cards connected to a host may need additional

properties. These can be specified in subnodes to the host controller node.

The subnodes are identified by the standard 'reg' property.

Which information exactly can be specified depends on the bindings for the

SDIO function driver for the subnode, as specified by the compatible string.

Required host node properties when using function subnodes:

- #address-cells: should be one. The cell is the slot id.

- #size-cells: should be zero.

Required function subnode properties:

- compatible: name of SDIO function following generic names recommended practice

- reg: Must contain the SDIO function number of the function this subnode

       describes. A value of 0 denotes the memory SD function, values from

       1 to 7 denote the SDIO functions.

Examples

--------

Basic example:

sdhci@ab000000 {

	compatible = "sdhci";

	max-frequency = <50000000>;

	keep-power-in-suspend;

	enable-sdio-wakeup;

	mmc-pwrseq = <&sdhci0_pwrseq>

}

Example with sdio function subnode:

mmc3: mmc@01c12000 {

	#address-cells = <1>;

	#size-cells = <0>;

	pinctrl-names = "default";

	pinctrl-0 = <&mmc3_pins_a>;

	vmmc-supply = <&reg_vmmc3>;

	bus-width = <4>;

	non-removable;

	mmc-pwrseq = <&sdhci0_pwrseq>

	status = "okay";

	brcmf: bcrmf@1 {

		reg = <1>;

		compatible = "brcm,bcm43xx-fmac";

		interrupt-parent = <&pio>;

		interrupts = <10 8>; /* PH10 / EINT10 */

		interrupt-names = "host-wake";

	};

};

* Fujitsu SDHCI controller

This file documents differences between the core properties in mmc.txt

and the properties used by the sdhci_f_sdh30 driver.

Required properties:

- compatible: "fujitsu,mb86s70-sdhci-3.0"

- clocks: Must contain an entry for each entry in clock-names. It is a

  list of phandles and clock-specifier pairs.

  See ../clocks/clock-bindings.txt for details.

- clock-names: Should contain the following two entries:

	"iface" - clock used for sdhci interface

	"core"  - core clock for sdhci controller

Optional properties:

- vqmmc-supply: phandle to the regulator device tree node, mentioned

  as the VCCQ/VDD_IO supply in the eMMC/SD specs.

Example:

	sdhci1: mmc@36600000 {

		compatible = "fujitsu,mb86s70-sdhci-3.0";

		reg = <0 0x36600000 0x1000>;

		interrupts = <0 172 0x4>,

			     <0 173 0x4>;

		bus-width = <4>;

		vqmmc-supply = <&vccq_sdhci1>;

		clocks = <&clock 2 2 0>, <&clock 2 3 0>;

		clock-names = "iface", "core";

	};

- reg:

  * for "mrvl,pxav2-mmc" and "mrvl,pxav3-mmc", one register area for

    the SDHCI registers.

  * for "marvell,armada-380-sdhci", two register areas. The first one

    for the SDHCI registers themselves, and the second one for the

    AXI/Mbus bridge registers of the SDHCI unit.

  * for "marvell,armada-380-sdhci", three register areas. The first

    one for the SDHCI registers themselves, the second one for the

    AXI/Mbus bridge registers of the SDHCI unit, the third one for the

    SDIO3 Configuration register

- reg names: should be "sdhci", "mbus", "conf-sdio3". only mandatory

  for "marvell,armada-380-sdhci"

- clocks: Array of clocks required for SDHCI; requires at least one for

    I/O clock.

- clock-names: Array of names corresponding to clocks property; shall be

sdhci@d8000 {

	compatible = "marvell,armada-380-sdhci";

	reg = <0xd8000 0x1000>, <0xdc000 0x100>;

	reg-names = "sdhci", "mbus", "conf-sdio3";

	reg = <0xd8000 0x1000>,

		<0xdc000 0x100>;

		<0x18454 0x4>;

	interrupts = <0 25 0x4>;

	clocks = <&gateclk 17>;

	clock-names = "io";