diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-22 19:36:08 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-22 19:36:08 -0400 |
commit | a6be1fcbc57f95bb47ef3c8e4ee3d83731b8f21e (patch) | |
tree | 88d762edfd97e7cdb0b41b8fe20c1ddb204c28c9 /Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt | |
parent | 5b160bd426946c85f32b15e5d34d62d2618a5a87 (diff) | |
parent | 30b87c60e9cbfcdfce22aa652fc1e5d061fcb733 (diff) |
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
...
Diffstat (limited to 'Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt')
-rw-r--r-- | Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt b/Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt index f77c3031607f..c6d7b11db9eb 100644 --- a/Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt +++ b/Documentation/devicetree/bindings/mmc/nvidia-sdhci.txt | |||
@@ -3,15 +3,13 @@ | |||
3 | This controller on Tegra family SoCs provides an interface for MMC, SD, | 3 | This controller on Tegra family SoCs provides an interface for MMC, SD, |
4 | and SDIO types of memory cards. | 4 | and SDIO types of memory cards. |
5 | 5 | ||
6 | This file documents differences between the core properties described | ||
7 | by mmc.txt and the properties used by the sdhci-tegra driver. | ||
8 | |||
6 | Required properties: | 9 | Required properties: |
7 | - compatible : Should be "nvidia,<chip>-sdhci" | 10 | - compatible : Should be "nvidia,<chip>-sdhci" |
8 | - reg : Should contain SD/MMC registers location and length | ||
9 | - interrupts : Should contain SD/MMC interrupt | ||
10 | - bus-width : Number of data lines, can be <1>, <4>, or <8> | ||
11 | 11 | ||
12 | Optional properties: | 12 | Optional properties: |
13 | - cd-gpios : Specify GPIOs for card detection | ||
14 | - wp-gpios : Specify GPIOs for write protection | ||
15 | - power-gpios : Specify GPIOs for power control | 13 | - power-gpios : Specify GPIOs for power control |
16 | 14 | ||
17 | Example: | 15 | Example: |