From def2acf596ad7490fb0b75d6c649d296a5ad86b6 Mon Sep 17 00:00:00 2001 From: Chris Ball Date: Wed, 22 Aug 2012 13:21:01 -0400 Subject: [PATCH] --- yaml --- r: 332811 b: refs/heads/master c: abe1e05da365350ac282ba5f6831aae13d97074e h: refs/heads/master i: 332809: 69fe1c5cb2fb2619432d21d79393af166711d323 332807: 0e8fb105bfbe4fbd91d1e30eca30d99f7013bcee v: v3 --- [refs] | 2 +- trunk/Documentation/devicetree/bindings/mmc/mmc.txt | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3b6f6e8c47ff..4174fdf95a96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a4585c634534ca5a6d5e60b4d2850b4efedc85e +refs/heads/master: abe1e05da365350ac282ba5f6831aae13d97074e diff --git a/trunk/Documentation/devicetree/bindings/mmc/mmc.txt b/trunk/Documentation/devicetree/bindings/mmc/mmc.txt index 8a6811f4a02f..8e2e0ba2f486 100644 --- a/trunk/Documentation/devicetree/bindings/mmc/mmc.txt +++ b/trunk/Documentation/devicetree/bindings/mmc/mmc.txt @@ -9,12 +9,17 @@ Interpreted by the OF core: Required properties: - bus-width: Number of data lines, can be <1>, <4>, or <8> +Card detection: +If no property below is supplied, standard SDHCI card detect is used. +Only one of the properties in this section should be supplied: + - broken-cd: There is no card detection available; polling must be used. + - cd-gpios: Specify GPIOs for card detection, see gpio binding + - non-removable: non-removable slot (like eMMC); assume always present. + Optional properties: -- cd-gpios: Specify GPIOs for card detection, see gpio binding - wp-gpios: Specify GPIOs for write protection, see gpio binding - cd-inverted: when present, polarity on the cd gpio line is inverted - wp-inverted: when present, polarity on the wp gpio line is inverted -- non-removable: non-removable slot (like eMMC) - max-frequency: maximum operating clock frequency Example: