From patchwork Wed Aug 22 18:05:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Ball X-Patchwork-Id: 10889 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8D54223F46 for ; Wed, 22 Aug 2012 18:05:56 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2D5A6A1853D for ; Wed, 22 Aug 2012 18:05:44 +0000 (UTC) Received: by iadj38 with SMTP id j38so1053854iad.11 for ; Wed, 22 Aug 2012 11:05:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:references:date:in-reply-to:message-id:user-agent :mime-version:content-type:x-gm-message-state; bh=rsHAkMNmSNGmwkwt1tuKMBizLdToHyqyNJEKaAKbX6o=; b=PRGNJsvRF2Z9rhPkU66bgULEXWsPuHJHlEZNaczGcMZCiaaNkNcKMmbGGOwpKA4MfF d8aNpAjU5ZZP3BLJgvhSam4OJ3U6Rb9qew/eHnidK081NbMYE1uC7v43tFr51dYVT9/b eprAHGN3czTJVjGuTelqT0L+En3K5gnzaUq0/uxf2fuslhcwpRJSnQGH3nb2zm6cS/aJ kK5ne05OUiBwbeIaeFL7lT2K111WXa4+cX5SS7FGEECtkXZSFnS80+/KuTC8w3GeyNqn 5eSH9jUeXMyfRNqn+daDzj+DGKy22tJSE71DWfEPT0wCrWS0pOLYQvLrdZimNnmFTG9F HcBg== Received: by 10.42.109.194 with SMTP id m2mr14885420icp.48.1345658755308; Wed, 22 Aug 2012 11:05:55 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp216253igc; Wed, 22 Aug 2012 11:05:54 -0700 (PDT) Received: by 10.180.84.169 with SMTP id a9mr7805641wiz.8.1345658752848; Wed, 22 Aug 2012 11:05:52 -0700 (PDT) Received: from void.printf.net (void.printf.net. [89.145.121.20]) by mx.google.com with ESMTPS id l62si6845691wei.17.2012.08.22.11.05.52 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 22 Aug 2012 11:05:52 -0700 (PDT) Received-SPF: neutral (google.com: 89.145.121.20 is neither permitted nor denied by best guess record for domain of cjb@laptop.org) client-ip=89.145.121.20; Authentication-Results: mx.google.com; spf=neutral (google.com: 89.145.121.20 is neither permitted nor denied by best guess record for domain of cjb@laptop.org) smtp.mail=cjb@laptop.org Received: from c-76-24-28-220.hsd1.ma.comcast.net ([76.24.28.220] helo=octavius.laptop.org) by void.printf.net with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1T4FJE-00029H-36; Wed, 22 Aug 2012 19:05:40 +0100 From: Chris Ball To: Thomas Abraham Cc: Shawn Guo , Rob Herring , Arnd Bergmann , linux-mmc@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, linux-samsung-soc@vger.kernel.org, grant.likely@secretlab.ca, patches@linaro.org, Wolfram Sang Subject: [PATCH] mmc: dt: Add card-detection properties to core binding. References: <1345547371-6784-1-git-send-email-thomas.abraham@linaro.org> <87k3ws5uhs.fsf@octavius.laptop.org> <201208211208.49987.arnd@arndb.de> <87393g5mic.fsf@octavius.laptop.org> <5033A34E.7040201@gmail.com> <87pq6k46jg.fsf@octavius.laptop.org> <5033B0F0.7050506@gmail.com> <20120822055151.GT24242@S2101-09.ap.freescale.net> <877gsr5iz1.fsf@octavius.laptop.org> <87y5l7421h.fsf@octavius.laptop.org> <87393f3rkj.fsf@octavius.laptop.org> Date: Wed, 22 Aug 2012 14:05:35 -0400 In-Reply-To: <87393f3rkj.fsf@octavius.laptop.org> (Chris Ball's message of "Wed, 22 Aug 2012 10:54:36 -0400") Message-ID: <874nnu245s.fsf_-_@octavius.laptop.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) MIME-Version: 1.0 X-Gm-Message-State: ALoCoQkspviIwrlYJgHwS69kuLtPlLEt5f+kxrKSIkh7A6A3TBLW3XC4y3lbOEDbza2JUTf5ZdOZ Signed-off-by: Chris Ball Acked-by: Shawn Guo --- 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: