diff options
author | Kevin Hilman <khilman@linaro.org> | 2013-10-14 13:58:37 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-10-14 14:00:10 -0700 |
commit | 4fd0376356ed2e1f6c2a4e8628782aedf903292e (patch) | |
tree | 581f8dbb860ca6176c543379bc455bdc4a95c088 /Documentation/devicetree/bindings/mmc | |
parent | d174ec22872c35d5ce1d223072bc8bd12ad1fef4 (diff) | |
parent | 7d4bde88e1135c4a3106b79650d3b85335f35717 (diff) | |
download | talos-op-linux-4fd0376356ed2e1f6c2a4e8628782aedf903292e.tar.gz talos-op-linux-4fd0376356ed2e1f6c2a4e8628782aedf903292e.zip |
Merge branch 'renesas/boards2' into next/boards
From Simon Horman:
* renesas/boards2: (64 commits)
ARM: shmobile: marzen: enable INTC IRQ
ARM: shmobile: bockw: add SMSC support on reference
ARM: shmobile: Use SMP on Koelsch
ARM: shmobile: Remove KZM9D reference DTS
ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
ARM: shmobile: Remove non-multiplatform KZM9D reference support
ARM: shmobile: Use KZM9D without reference for multiplatform
ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
ARM: shmobile: Use arch timer on Koelsch
ARM: shmobile: Use r8a7791_add_standard_devices() on Koelsch
ARM: shmobile: Genmai support
ARM: shmobile: marzen: enable DMA for SDHI0
ARM: shmobile: bockw: enable DMA for SDHI0
ARM: shmobile: ape6evm: add DMA support to MMCIF
ARM: shmobile: r8a7791 SMP support
ARM: shmobile: r8a7779: split r8a7779_init_irq_extpin() for DT
ARM: shmobile: r8a7778: split r8a7778_init_irq_extpin() for DT
ARM: shmobile: r7s72100 SCIF support
ARM: shmobile: Initial r7s72100 SoC support
ARM: shmobile: r8a7791 Arch timer workaround
...
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'Documentation/devicetree/bindings/mmc')
-rw-r--r-- | Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt index df204e18e030..6a2a1160a70d 100644 --- a/Documentation/devicetree/bindings/mmc/tmio_mmc.txt +++ b/Documentation/devicetree/bindings/mmc/tmio_mmc.txt @@ -9,12 +9,15 @@ compulsory and any optional properties, common to all SD/MMC drivers, as described in mmc.txt, can be used. Additionally the following tmio_mmc-specific optional bindings can be used. +Required properties: +- compatible: "renesas,sdhi-shmobile" - a generic sh-mobile SDHI unit + "renesas,sdhi-sh7372" - SDHI IP on SH7372 SoC + "renesas,sdhi-sh73a0" - SDHI IP on SH73A0 SoC + "renesas,sdhi-r8a73a4" - SDHI IP on R8A73A4 SoC + "renesas,sdhi-r8a7740" - SDHI IP on R8A7740 SoC + "renesas,sdhi-r8a7778" - SDHI IP on R8A7778 SoC + "renesas,sdhi-r8a7779" - SDHI IP on R8A7779 SoC + "renesas,sdhi-r8a7790" - SDHI IP on R8A7790 SoC + Optional properties: - toshiba,mmc-wrprotect-disable: write-protect detection is unavailable - -When used with Renesas SDHI hardware, the following compatibility strings -configure various model-specific properties: - -"renesas,sh7372-sdhi": (default) compatible with SH7372 -"renesas,r8a7740-sdhi": compatible with R8A7740: certain MMC/SD commands have to - wait for the interface to become idle. |