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

Commit a6be1fcb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mmc-merge-for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc 

Pull MMC updates from Chris Ball:
 "MMC highlights for 3.6:

  Core:
   - Rename cd-gpio to slot-gpio and extend it to support more slot GPIO
     functions, such as write-protect.
   - Add a function to get regulators (Vdd and Vccq) for a host.

  Drivers:
   - sdhci-pxav2, sdhci-pxav3: Add device tree support.
   - sdhi: Add device tree support.
   - sh_mmcif: Add support for regulators, device tree, slot-gpio.
   - tmio: Add regulator support, use slot-gpio."

* tag 'mmc-merge-for-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (62 commits)
  mmc: sdhci-dove: Prepare for common clock framework
  mmc: sdhci-dove: Add SDHCI_QUIRK_NO_HISPD_BIT
  mmc: omap_hsmmc: ensure probe returns error upon resource failure
  mmc: mxs-mmc: Add wp-inverted property
  mmc: esdhc: Fix DMA_MASK to not break mx25 DMA access
  mmc: core: reset signal voltage on power up
  mmc: sd: Fix sd current limit setting
  mmc: omap_hsmmc: add clk_prepare and clk_unprepare
  mmc: sdhci: When a UHS switch fails, cycle power if regulator is used
  mmc: atmel-mci: modify CLKDIV displaying in debugfs
  mmc: atmel-mci: fix incorrect setting of host->data to NULL
  mmc: sdhci: poll for card even when card is logically unremovable
  mmc: sdhci: Introduce new flag SDHCI_USING_RETUNING_TIMER
  mmc: sdio: Change pr_warning to pr_warn_ratelimited
  mmc: core: Simplify and fix for SD switch processing
  mmc: sdhci: restore host settings when card is removed
  mmc: sdhci: fix incorrect command used in tuning
  mmc: sdhci-pci: CaFe has broken card detection
  mmc: sdhci: Report failure reasons for all cases in sdhci_add_host()
  mmc: s3cmci: Convert s3cmci driver to gpiolib API
  ...
parents 5b160bd4 30b87c60

Documentation/devicetree/bindings/mmc/fsl-esdhc.txt

+13 −12
Original line number Original line Diff line number Diff line
@@ -3,21 +3,22 @@ 
The Enhanced Secure Digital Host Controller provides an interface

The Enhanced Secure Digital Host Controller provides an interface

for MMC, SD, and SDIO types of memory cards.

for MMC, SD, and SDIO types of memory cards.





This file documents differences between the core properties described

by mmc.txt and the properties used by the sdhci-esdhc driver.



Required properties:

Required properties:

  - compatible : should be

    "fsl,<chip>-esdhc", "fsl,esdhc"

  - reg : should contain eSDHC registers location and length.

  - interrupts : should contain eSDHC interrupt.

  - interrupt-parent : interrupt source phandle.

  - interrupt-parent : interrupt source phandle.

  - clock-frequency : specifies eSDHC base clock frequency.

  - clock-frequency : specifies eSDHC base clock frequency.

  - sdhci,wp-inverted : (optional) specifies that eSDHC controller



    reports inverted write-protect state; New devices should use

Optional properties:

    the generic "wp-inverted" property.

  - sdhci,wp-inverted : specifies that eSDHC controller reports

  - sdhci,1-bit-only : (optional) specifies that a controller can

    inverted write-protect state; New devices should use the generic

    only handle 1-bit data transfers. New devices should use the

    "wp-inverted" property.

    generic "bus-width = <1>" property.

  - sdhci,1-bit-only : specifies that a controller can only handle

  - sdhci,auto-cmd12: (optional) specifies that a controller can

    1-bit data transfers. New devices should use the generic

    only handle auto CMD12.

    "bus-width = <1>" property.

  - sdhci,auto-cmd12: specifies that a controller can only handle auto

    CMD12.





Example:

Example:

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

+3 −5
Original line number Original line Diff line number Diff line
@@ -3,17 +3,15 @@ 
The Enhanced Secure Digital Host Controller on Freescale i.MX family

The Enhanced Secure Digital Host Controller on Freescale i.MX family

provides an interface for MMC, SD, and SDIO types of memory cards.

provides an interface for MMC, SD, and SDIO types of memory cards.





This file documents differences between the core properties described

by mmc.txt and the properties used by the sdhci-esdhc-imx driver.



Required properties:

Required properties:

- compatible : Should be "fsl,<chip>-esdhc"

- compatible : Should be "fsl,<chip>-esdhc"

- reg : Should contain eSDHC registers location and length

- interrupts : Should contain eSDHC interrupt





Optional properties:

Optional properties:

- non-removable : Indicate the card is wired to host permanently

- fsl,cd-internal : Indicate to use controller internal card detection

- fsl,cd-internal : Indicate to use controller internal card detection

- fsl,wp-internal : Indicate to use controller internal write protection

- fsl,wp-internal : Indicate to use controller internal write protection

- cd-gpios : Specify GPIOs for card detection

- wp-gpios : Specify GPIOs for write protection





Examples:

Examples:

Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt

+4 −4
Original line number Original line Diff line number Diff line 
MMC/SD/SDIO slot directly connected to a SPI bus

MMC/SD/SDIO slot directly connected to a SPI bus





This file documents differences between the core properties described

by mmc.txt and the properties used by the mmc_spi driver.



Required properties:

Required properties:

- compatible : should be "mmc-spi-slot".

- reg : should specify SPI address (chip-select number).

- spi-max-frequency : maximum frequency for this device (Hz).

- spi-max-frequency : maximum frequency for this device (Hz).

- voltage-ranges : two cells are required, first cell specifies minimum

- voltage-ranges : two cells are required, first cell specifies minimum

  slot voltage (mV), second cell specifies maximum slot voltage (mV).

  slot voltage (mV), second cell specifies maximum slot voltage (mV).
@@ -11,8 +12,7 @@ Required properties: 
Optional properties:

Optional properties:

- gpios : may specify GPIOs in this order: Card-Detect GPIO,

- gpios : may specify GPIOs in this order: Card-Detect GPIO,

  Write-Protect GPIO. Note that this does not follow the

  Write-Protect GPIO. Note that this does not follow the

  binding from mmc.txt, for historic reasons.

  binding from mmc.txt, for historical reasons.

- interrupts : the interrupt of a card detect interrupt.

- interrupt-parent : the phandle for the interrupt controller that

- interrupt-parent : the phandle for the interrupt controller that

  services interrupts for this device.

  services interrupts for this device.

Documentation/devicetree/bindings/mmc/mmc.txt

+7 −3
Original line number Original line Diff line number Diff line
@@ -2,13 +2,17 @@ These properties are common to multiple MMC host controllers. Any host 
that requires the respective functionality should implement them using

that requires the respective functionality should implement them using

these definitions.

these definitions.





Interpreted by the OF core:

- reg: Registers location and length.

- interrupts: Interrupts used by the MMC controller.



Required properties:

Required properties:

- bus-width: Number of data lines, can be <1>, <4>, or <8>

- bus-width: Number of data lines, can be <1>, <4>, or <8>





Optional properties:

Optional properties:

- cd-gpios: Specify GPIOs for card detection, see gpio binding

- cd-gpios: Specify GPIOs for card detection, see gpio binding

- wp-gpios: Specify GPIOs for write protection, see gpio binding

- wp-gpios: Specify GPIOs for write protection, see gpio binding

- cd-inverted: when present, polarity on the wp gpio line is inverted

- cd-inverted: when present, polarity on the cd gpio line is inverted

- wp-inverted: when present, polarity on the wp gpio line is inverted

- wp-inverted: when present, polarity on the wp gpio line is inverted

- non-removable: non-removable slot (like eMMC)

- non-removable: non-removable slot (like eMMC)

- max-frequency: maximum operating clock frequency

- max-frequency: maximum operating clock frequency

Documentation/devicetree/bindings/mmc/mmci.txt

+4 −8
Original line number Original line Diff line number Diff line 
* ARM PrimeCell MultiMedia Card Interface (MMCI) PL180/1

* ARM PrimeCell MultiMedia Card Interface (MMCI) PL180/1





The ARM PrimeCell MMCI PL180 and PL181 provides and interface for

The ARM PrimeCell MMCI PL180 and PL181 provides an interface for

reading and writing to MultiMedia and SD cards alike.

reading and writing to MultiMedia and SD cards alike.





This file documents differences between the core properties described

by mmc.txt and the properties used by the mmci driver.



Required properties:

Required properties:

- compatible             : contains "arm,pl18x", "arm,primecell".

- compatible             : contains "arm,pl18x", "arm,primecell".

- reg                    : contains pl18x registers and length.

- interrupts             : contains the device IRQ(s).

- arm,primecell-periphid : contains the PrimeCell Peripheral ID.

- arm,primecell-periphid : contains the PrimeCell Peripheral ID.





Optional properties:

Optional properties:

- wp-gpios               : contains any write protect (ro) gpios

- cd-gpios               : contains any card detection gpios

- cd-inverted            : indicates whether the cd gpio is inverted

- max-frequency          : contains the maximum operating frequency

- bus-width              : number of data lines, can be <1>, <4>, or <8>

- mmc-cap-mmc-highspeed  : indicates whether MMC is high speed capable

- mmc-cap-mmc-highspeed  : indicates whether MMC is high speed capable

- mmc-cap-sd-highspeed   : indicates whether SD is high speed capable
 
- mmc-cap-sd-highspeed   : indicates whether SD is high speed capable