Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64cbd16a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-v4.9' of git://git.linaro.org/people/ulf.hansson/mmc 

Pull MMC updates from Ulf Hansson:

  MMC core:
   - Add support for sending commands during data transfer
   - Erase/discard/trim improvements
   - Improved error handling
   - Extend sysfs with SD status register
   - Document info about the vmmc/vmmcq regulators
   - Extend pwrseq-simple to manage an optional post-power-on-delay
   - Some various minor improvements and cleanups

  MMC host:
   - dw_mmc: Add reset support
   - dw_mmc: Return -EILSEQ for EBE and SBE error
   - dw_mmc: Some cleanups
   - dw_mmc-k3: Add UHS-I support Hisilicon Hikey
   - tmio: Add eMMC support
   - sh_mobile_sdhi: Add r8a7796 support
   - sunxi: Don't use sample clocks for sun4i/sun5i
   - sunxi: Add support for A64 mmc controller
   - sunxi: Some cleanups and improvements
   - sdhci: Support for sending commands during data transfer
   - sdhci: Do not allow tuning procedure to be interrupted
   - sdhci-pci: Enable SD/SDIO on Merrifield
   - sdhci-pci|acpi: Enable MMC_CAP_CMD_DURING_TFR
   - sdhci-pci: Some cleanups
   - sdhci-of-arasan: Set controller to test mode when no CD bit
   - sdhci-of-arasan: Some fixes for clocks and phys
   - sdhci-brcmstb: Don't use ADMA 64-bit when not supported
   - sdhci-tegra: Mark 64-bit DMA broken on Tegra124
   - sdhci-esdhc-imx: Fixups related to data timeouts

* tag 'mmc-v4.9' of git://git.linaro.org/people/ulf.hansson/mmc: (68 commits)
  mmc: dw_mmc: remove the deprecated "supports-highspeed" property
  mmc: dw_mmc: minor cleanup for dw_mci_adjust_fifoth
  mmc: dw_mmc: use macro to define ring buffer size
  mmc: dw_mmc: fix misleading error print if failing to do DMA transfer
  mmc: dw_mmc: avoid race condition of cpu and IDMAC
  mmc: dw_mmc: split out preparation of desc for IDMAC32 and IDMAC64
  mmc: core: don't try to switch block size for dual rate mode
  mmc: sdhci-of-arasan: Set controller to test mode when no CD bit
  dt: sdhci-of-arasan: Add device tree option xlnx, fails-without-test-cd
  mmc: tmio: add eMMC support
  mmc: rtsx_usb: use new macro for R1 without CRC
  mmc: rtsx_pci: use new macro for R1 without CRC
  mmc: add define for R1 response without CRC
  mmc: card: do away with indirection pointer
  mmc: sdhci-acpi: Set MMC_CAP_CMD_DURING_TFR for Intel eMMC controllers
  mmc: sdhci-pci: Set MMC_CAP_CMD_DURING_TFR for Intel eMMC controllers
  mmc: sdhci: Support cap_cmd_during_tfr requests
  mmc: mmc_test: Add tests for sending commands during transfer
  mmc: core: Add support for sending commands during data transfer
  mmc: sdhci-brcmstb: Fix incorrect capability
  ...
parents edadd0e5 0f75c404

Documentation/devicetree/bindings/mmc/arasan,sdhci.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -36,6 +36,9 @@ Optional Properties: 
  - #clock-cells: If specified this should be the value <0>.  With this property

  - #clock-cells: If specified this should be the value <0>.  With this property

    in place we will export a clock representing the Card Clock.  This clock

    in place we will export a clock representing the Card Clock.  This clock

    is expected to be consumed by our PHY.  You must also specify

    is expected to be consumed by our PHY.  You must also specify

  - xlnx,fails-without-test-cd: when present, the controller doesn't work when

    the CD line is not connected properly, and the line is not connected

    properly. Test mode can be used to force the controller to function.





Example:

Example:

	sdhci@e0100000 {

	sdhci@e0100000 {

Documentation/devicetree/bindings/mmc/brcm,bcm7425-sdhci.txt→Documentation/devicetree/bindings/mmc/brcm,sdhci-brcmstb.txt

+3 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,9 @@ on Device Tree properties to enable them for SoC/Board combinations 
that support them.

that support them.





Required properties:

Required properties:

- compatible: "brcm,bcm7425-sdhci"

- compatible: should be one of the following

  - "brcm,bcm7425-sdhci"

  - "brcm,bcm7445-sdhci"





Refer to clocks/clock-bindings.txt for generic clock consumer properties.

Refer to clocks/clock-bindings.txt for generic clock consumer properties.

Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ Optional properties: 
  See ../clocks/clock-bindings.txt for details.

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

- clock-names : Must include the following entry:

- clock-names : Must include the following entry:

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

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

- post-power-on-delay-ms : Delay in ms after powering the card and

	de-asserting the reset-gpios (if any)





Example:

Example:

Documentation/devicetree/bindings/mmc/mmc.txt

+14 −1
Original line number Original line Diff line number Diff line
@@ -75,6 +75,17 @@ Optional SDIO properties: 
- wakeup-source: Enables wake up of host system on SDIO IRQ assertion

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

		 (Legacy property supported: "enable-sdio-wakeup")

		 (Legacy property supported: "enable-sdio-wakeup")





MMC power

---------



Controllers may implement power control from both the connected cards and

the IO signaling (for example to change to high-speed 1.8V signalling). If

the system supports this, then the following two properties should point

to valid regulator nodes:



- vqmmc-supply: supply node for IO line power

- vmmc-supply: supply node for card's power







MMC power sequences:

MMC power sequences:

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

--------------------
@@ -102,11 +113,13 @@ Required host node properties when using function subnodes: 
- #size-cells: should be zero.

- #size-cells: should be zero.





Required function subnode properties:

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

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

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

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

       1 to 7 denote the SDIO functions.

       1 to 7 denote the SDIO functions.





Optional function subnode properties:

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







Examples

Examples

--------

--------

Documentation/devicetree/bindings/mmc/sunxi-mmc.txt

+6 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,12 @@ as the speed of SD standard 3.0. 
Absolute maximum transfer rate is 200MB/s

Absolute maximum transfer rate is 200MB/s





Required properties:

Required properties:

 - compatible : "allwinner,sun4i-a10-mmc" or "allwinner,sun5i-a13-mmc"

 - compatible : should be one of:

   * "allwinner,sun4i-a10-mmc"

   * "allwinner,sun5i-a13-mmc"

   * "allwinner,sun7i-a20-mmc"

   * "allwinner,sun9i-a80-mmc"

   * "allwinner,sun50i-a64-mmc"

 - reg : mmc controller base registers

 - reg : mmc controller base registers

 - clocks : a list with 4 phandle + clock specifier pairs

 - clocks : a list with 4 phandle + clock specifier pairs

 - clock-names : must contain "ahb", "mmc", "output" and "sample"

 - clock-names : must contain "ahb", "mmc", "output" and "sample"