diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-05-14 15:48:45 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-15 07:31:11 -0400 |
| commit | c49314fa6c7d2c130d850b30980cffab53a40592 (patch) | |
| tree | 9c7597ad98a42ef8ba1e18e897106c2cb29e52e6 /Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt | |
| parent | 21b7f153dd0d7366197c37e7a630c7585db0b8ea (diff) | |
| parent | 7f217794ffa72f208a250b79ab0b7ea3de19677f (diff) | |
Merge branch 'drivers/mmc' into next/drivers
* drivers/mmc:
mmc: dt: Consolidate DT bindings
Also pulls in the omap/dt-missed-3.4 branch as a dependency.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt index 89a0084df2f7..d64aea5a4203 100644 --- a/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt +++ b/Documentation/devicetree/bindings/mmc/mmc-spi-slot.txt | |||
| @@ -10,7 +10,8 @@ Required properties: | |||
| 10 | 10 | ||
| 11 | Optional properties: | 11 | Optional properties: |
| 12 | - gpios : may specify GPIOs in this order: Card-Detect GPIO, | 12 | - gpios : may specify GPIOs in this order: Card-Detect GPIO, |
| 13 | Write-Protect GPIO. | 13 | Write-Protect GPIO. Note that this does not follow the |
| 14 | binding from mmc.txt, for historic reasons. | ||
| 14 | - interrupts : the interrupt of a card detect interrupt. | 15 | - interrupts : the interrupt of a card detect interrupt. |
| 15 | - interrupt-parent : the phandle for the interrupt controller that | 16 | - interrupt-parent : the phandle for the interrupt controller that |
| 16 | services interrupts for this device. | 17 | services interrupts for this device. |