From patchwork Wed Jan 15 13:56:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 3491891 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1C3669F2E9 for ; Wed, 15 Jan 2014 13:57:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 09C9F20121 for ; Wed, 15 Jan 2014 13:57:23 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E22C9200E9 for ; Wed, 15 Jan 2014 13:57:21 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W3Qy5-0007vA-Rr; Wed, 15 Jan 2014 13:57:17 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W3Qy3-0008FB-9E; Wed, 15 Jan 2014 13:57:15 +0000 Received: from mail-pb0-f48.google.com ([209.85.160.48]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W3Qy0-0008E7-Eg for linux-arm-kernel@lists.infradead.org; Wed, 15 Jan 2014 13:57:13 +0000 Received: by mail-pb0-f48.google.com with SMTP id rr13so1161382pbb.7 for ; Wed, 15 Jan 2014 05:56:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=0d5e39RHK/OHmPQ8Lo2EHBDT57dxLnCmu6CeDKurDbU=; b=hxSfKEsvAQx6pzKBN7GwKnIiyH8ai/dChSAnzuvNSsRZdI+U2Xu7Y4DAv1XLNMcdcz qdILSFbhgkukYNEUEkAeu7Q7Qpg3gXLOIX4YpO4B+JJ8qCHWh3R5hVLE63R+oIXhuSfJ xIKQZK4JV0Wd1qrbOeH1ic6RwLDQNy94L4O90v7pw2xTaL24fY8QHcHS5BqFh9C6VI/q LvjbhsvQjINZyh3wp5NuWX92di7AzPWnFwHfXh2hteXMnEWVfJVNKQ441fxO49z2HXid eeYIB/6ozlcj8DproRKzuIj8JpXk9KASYUT7oJcOxq+Vto+hLSQfsVjDHoBeFZHKGr3e AFLg== X-Gm-Message-State: ALoCoQl9oPniRg3rP8RP6UVEsKlc8qHmo5WAApQSq3U1h5P2OFXd0USdcTI/CUbJsRKK7M3S5w1i X-Received: by 10.69.31.97 with SMTP id kl1mr2808407pbd.127.1389794206115; Wed, 15 Jan 2014 05:56:46 -0800 (PST) Received: from [192.168.3.108] ([124.73.90.72]) by mx.google.com with ESMTPSA id os1sm10611803pac.20.2014.01.15.05.56.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Jan 2014 05:56:45 -0800 (PST) Message-ID: <52D6938A.9050806@linaro.org> Date: Wed, 15 Jan 2014 21:56:26 +0800 From: zhangfei User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.0 MIME-Version: 1.0 To: Seungwon Jeon , 'Kevin Hilman' , 'Sachin Kamat' , 'Chris Ball' , 'Arnd Bergmann' , 'Mike Turquette' , 'Jaehoon Chung' Subject: Re: [PATCH] mmc: dw_mmc: fix dw_mci_get_cd References: <1389770159-21125-1-git-send-email-zhangfei.gao@linaro.org> <1389780469-32633-1-git-send-email-zhangfei.gao@linaro.org> <001701cf11e9$25b5fe50$7121faf0$%jun@samsung.com> <52D67A9B.4090607@linaro.org> <001c01cf11ed$039b6270$0ad22750$%jun@samsung.com> In-Reply-To: <001c01cf11ed$039b6270$0ad22750$%jun@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140115_085712_575542_7AAC7A71 X-CRM114-Status: GOOD ( 11.16 ) X-Spam-Score: -2.6 (--) Cc: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On 01/15/2014 08:26 PM, Seungwon Jeon wrote: >>>> @@ -1033,7 +1033,8 @@ static int dw_mci_get_cd(struct mmc_host *mmc) >>>> int present; >>>> struct dw_mci_slot *slot = mmc_priv(mmc); >>>> struct dw_mci_board *brd = slot->host->pdata; >>>> - int gpio_cd = !mmc_gpio_get_cd(mmc); >>>> + struct dw_mci *host = slot->host; >>>> + int gpio_cd = mmc_gpio_get_cd(mmc); >>>> >>>> /* Use platform get_cd function, else try onboard card detect */ >>>> if (brd->quirks & DW_MCI_QUIRK_BROKEN_CARD_DETECTION) >>>> @@ -1041,11 +1042,12 @@ static int dw_mci_get_cd(struct mmc_host *mmc) >>>> else if (brd->get_cd) >>>> present = !brd->get_cd(slot->id); >>>> else if (!IS_ERR_VALUE(gpio_cd)) >>>> - present = !!gpio_cd; >>>> + present = !gpio_cd; >>> !!gpio_cd or gpio_cd is correct, isn't it? >>> >> >> No, mmc_gpio_get_cd(mmc) has to revert. > I'm missing something? > If card is detected, mmc_gpio_get_cd() returns non-zero, right? > I guess gpio_cd should be kept. > Hmm, looks you are right. Though not see clearly mmc_gpio_get_cd declaratoin, other drivers directly set get_cd as mmc_gpio_get_cd. .get_cd = mmc_gpio_get_cd However, in our board cd =0 when card is deteced while cd=1 when card is removed. In order to mmc_gpio_get_cd return 1, MMC_CAP2_CD_ACTIVE_HIGH has to be set, as well as new property "caps2-mmc-cd-active-low". int mmc_gpio_get_cd(struct mmc_host *host) { return !gpio_get_value_cansleep(ctx->cd_gpio) ^ !!(host->caps2 & MMC_CAP2_CD_ACTIVE_HIGH); } Thanks --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt @@ -73,6 +73,8 @@ Optional properties: +* caps2-mmc-cd-active-low: cd pin is low when card active + diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c + if (of_find_property(np, "caps2-mmc-cd-active-low", NULL)) + pdata->caps2 |= MMC_CAP2_CD_ACTIVE_HIGH; + But it looks strange "cd-active-low" describing "CD_ACTIVE_HIGH" flag. When card active, cd = 0, and ACTIVE_HIGH is required to make mmc_gpio_get_cd return 1.