From patchwork Wed Jan 15 15:32:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangfei Gao X-Patchwork-Id: 3492261 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 CC6689F2E9 for ; Wed, 15 Jan 2014 15:33:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B64E8200EC for ; Wed, 15 Jan 2014 15:33:00 +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 84191200C1 for ; Wed, 15 Jan 2014 15:32:59 +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 1W3SSb-0002K0-HF; Wed, 15 Jan 2014 15:32:53 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W3SSZ-0002ve-3Z; Wed, 15 Jan 2014 15:32:51 +0000 Received: from mail-pb0-f41.google.com ([209.85.160.41]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W3SSX-0002vG-56 for linux-arm-kernel@lists.infradead.org; Wed, 15 Jan 2014 15:32:49 +0000 Received: by mail-pb0-f41.google.com with SMTP id up15so756846pbc.0 for ; Wed, 15 Jan 2014 07:32:26 -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=DNkwxLukQelZTYXKU4jG9Zgestrm0gqx76ibh21Wlpc=; b=IqVw+y9NYmlqVz4jhcJSc+yag3klpqPY7PL6JYoLpKftSfMwvRKWYdzRlu2mrJOGQv p204qTGXToOXkw0N93y6fUgX6C5S61AkuO83axN9C41cr1tvzJtLFf5NXCCgeeeZOxTI 9pGiLsJzopE7M3vavJMj3trt36g8lTo3o+wmxO9DdN/v3ZZTqvn69xAyA/Ywxu/9Aae/ /YJlLLYdQL8K386c6P6VTqf5Y6H8L2nwkCCUAmXFzUz55i6iFz61Pr3IotHLbXQ2Dy4z vSSIocEz1N1bvxt9bYzzRly0cdvfqWlMXvFuSNnJN4wRcrP8GCj8DLp3txBRZU5ySLhV 1hAw== X-Gm-Message-State: ALoCoQkFcwb5l3KrMOHis3Nb08i+HJblW71JlmMnl0s4KpbbTjRYEYYDc2KyzCI7L9uxoNnbfTap X-Received: by 10.66.66.202 with SMTP id h10mr3614678pat.70.1389799946524; Wed, 15 Jan 2014 07:32:26 -0800 (PST) Received: from [192.168.3.108] ([124.73.90.72]) by mx.google.com with ESMTPSA id pe3sm8802800pbc.23.2014.01.15.07.32.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 Jan 2014 07:32:25 -0800 (PST) Message-ID: <52D6A9FF.3000603@linaro.org> Date: Wed, 15 Jan 2014 23:32:15 +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> <52D6938A.9050806@linaro.org> <002c01cf11ff$6790a8a0$36b1f9e0$%jun@samsung.com> In-Reply-To: <002c01cf11ff$6790a8a0$36b1f9e0$%jun@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140115_103249_282946_CB3A1DC9 X-CRM114-Status: GOOD ( 14.23 ) 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 10:38 PM, Seungwon Jeon wrote: >> 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". > > Ok, you could do more. > mmc_gpio_get_cd() is expected to return non-zero if card is detection. > I think your board seems not to use pull-up on GPIO line for card detection. > So, MMC_CAP2_CD_ACTIVE_HIGH would be needed. Unfortunately, the specific cd pin can not be configured. Suspect on our board the cd =1 when card is inserted, can not measure as no clear resister and need check with hardware guy tomorrow. "cd-inverted" may be required as mentioned by Arnd. Will update the patch as following if no problem. linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 9ded62c8225e..8326e54b96a8 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1042,7 +1042,7 @@ 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 ^ brd->cd_inverted; else present = (mci_readl(slot->host, CDETECT) & (1 << slot->id)) == 0 ? 1 : 0; @@ -2414,6 +2414,9 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) if (of_find_property(np, "caps2-mmc-hs200-1_2v", NULL)) pdata->caps2 |= MMC_CAP2_HS200_1_2V_SDR; + if (of_get_property(np, "cd-inverted", NULL)) + pdata->cd_inverted = 1; + return pdata; } diff --git a/include/linux/mmc/dw_mmc.h b/include/linux/mmc/dw_mmc.h index 6ce7d2cd3c7a..4535282589ab 100644 --- a/include/linux/mmc/dw_mmc.h +++ b/include/linux/mmc/dw_mmc.h @@ -238,6 +238,7 @@ struct dw_mci_board { u32 caps; /* Capabilities */ u32 caps2; /* More capabilities */ u32 pm_caps; /* PM capabilities */ + u8 cd_inverted; _______________________________________________ linux-arm-kernel mailing list