diff mbox

mmc: dt: Add card-detection properties to core binding.

Message ID 874nnu245s.fsf_-_@octavius.laptop.org (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Chris Ball Aug. 22, 2012, 6:05 p.m. UTC
Signed-off-by: Chris Ball <cjb@laptop.org>
---
 Documentation/devicetree/bindings/mmc/mmc.txt | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Shawn Guo Aug. 24, 2012, 5:44 a.m. UTC | #1
On Wed, Aug 22, 2012 at 02:05:35PM -0400, Chris Ball wrote:
> Signed-off-by: Chris Ball <cjb@laptop.org>

Acked-by: Shawn Guo <shawn.guo@linaro.org>

Will move sdhci-esdhc-imx driver to this soon.

Regards,
Shawn

> ---
>  Documentation/devicetree/bindings/mmc/mmc.txt | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
> index 8a6811f..8e2e0ba 100644
> --- a/Documentation/devicetree/bindings/mmc/mmc.txt
> +++ b/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:
> -- 
> Chris Ball   <cjb@laptop.org>   <http://printf.net/>
> One Laptop Per Child
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt
index 8a6811f..8e2e0ba 100644
--- a/Documentation/devicetree/bindings/mmc/mmc.txt
+++ b/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: