From patchwork Fri Oct 18 21:56:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 3070231 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 60A169F243 for ; Fri, 18 Oct 2013 21:57:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7470720394 for ; Fri, 18 Oct 2013 21:57:48 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E9A42038E for ; Fri, 18 Oct 2013 21:57:47 +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 1VXI2Y-0006T0-Tw; Fri, 18 Oct 2013 21:57:03 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VXI2O-0008JS-Rq; Fri, 18 Oct 2013 21:56:52 +0000 Received: from mail-oa0-f73.google.com ([209.85.219.73]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VXI2B-0008Hd-6y for linux-arm-kernel@lists.infradead.org; Fri, 18 Oct 2013 21:56:40 +0000 Received: by mail-oa0-f73.google.com with SMTP id n12so838866oag.0 for ; Fri, 18 Oct 2013 14:56:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=n932FRdY8AbBr5gAEcg0zx9AJif+I25yGSsd8yqyTqg=; b=FLx7EOjjJb8cuJPuqC1oApkHOLWTb5trYHWVIYS+NMiXJOUPwJqh5TWeOe8U92Jloi XgqjB1x26BgZtyOf9btrvrKZu4GqyQBhBM/n15+4UFIAB3LuHpMqYzf5Cs07ppTBZosz 9rSw4/3RqF2VqSjGei5vvquD4SeCR8aVH03LE7CUtNuGVfxtZJKJsQJf46l0NGrahdfl BDKHgq1CROwVPnehJqQVZr3/GpJpbLpXI+KwVTlgEgGM6j3YoKmR3w4UTAqa1nZUm8cN 3yJ+LCEJEP1Tw1yJWyM7lXGGKs3ZndT6bGYCUZoDWhtpUgktJj0r8/kivXyzPpYfCz0x Q9sw== X-Gm-Message-State: ALoCoQmFrgbC8Y2RJbgtjWbsk5ootsOzPRFuyMg53+V/a/cFWUjSbRMu6nhKmF/TbOnl8PHq4tbstJXSlI5ppwNpK2TfiPva8kZnxB/ciYFjXv/7DrCPTnsvwIicqgp1fmuyxXvv2Qnb73CoMdLdu0GH2R2F73GEBZglgOya+O3qYw5qrlbUMQ5n/gVNJDveWBuXD+CM1G833riRlPzi8VYulh/AzQZFeA== X-Received: by 10.182.213.5 with SMTP id no5mr1888904obc.15.1382133376619; Fri, 18 Oct 2013 14:56:16 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id k45si206516yhn.4.2013.10.18.14.56.16 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 18 Oct 2013 14:56:16 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.72.141]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id 4C8F531C1B6; Fri, 18 Oct 2013 14:56:16 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id EDD68803A0; Fri, 18 Oct 2013 14:56:15 -0700 (PDT) From: Doug Anderson To: Jaehoon Chung , Seungwon Jeon , Chris Ball Subject: [PATCH v3 1/3] mmc: core: Support the optional init_card() callback for MMC and SD Date: Fri, 18 Oct 2013 14:56:00 -0700 Message-Id: <1382133362-31747-2-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.4 In-Reply-To: <1382133362-31747-1-git-send-email-dianders@chromium.org> References: <1382126905-14654-1-git-send-email-dianders@chromium.org> <1382133362-31747-1-git-send-email-dianders@chromium.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131018_175639_325544_8482F796 X-CRM114-Status: GOOD ( 18.14 ) X-Spam-Score: -3.0 (---) Cc: Johan Rudholm , Ulf Hansson , James Hogan , Russell King , Daniel Mack , Bing Zhao , Grant Grundler , linux-kernel@vger.kernel.org, Sascha Hauer , linux-mmc@vger.kernel.org, Tomasz Figa , Doug Anderson , Olof Johansson , Tony Lindgren , Alim Akhtar , Abhilash Kesavan , linux-omap@vger.kernel.org, Sonny Rao , Namjae Jeon , linux-arm-kernel@lists.infradead.org, Kevin Liu 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: , MIME-Version: 1.0 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.6 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 In (3fcb027 ARM: MXC: mxcmmc: work around a bug in the SDHC busy line handling) the optional init_card() callback was added. According to the original change it was "for now only called from mmc_sdio_init_card()". This callback really ought to be called from the SD and MMC init functions as well. One current user of this callback (mxcmci_init_card) will not work as expected if you insert an SDIO card, then eject it and put a normal SD card in. Specifically the normal SD card will not get to run with 4-bit data. I'd like to use the init_card() callback to handle a similar quirk on dw_mmc when using SDIO Interrupts (the "low power" feature of the card needs to be disabled), so that will add a second user of the function. As part of this change fixup the one place that relied on the callback only happening for SDIO cards. Signed-off-by: Doug Anderson Reviewed-by: Grant Grundler --- Changes in v3: - Add fixup to pandora_wl1251_init_card(). Changes in v2: - New for this version. arch/arm/mach-omap2/board-omap3pandora.c | 14 ++++++++------ drivers/mmc/core/mmc.c | 6 ++++++ drivers/mmc/core/sd.c | 7 ++++++- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index de1bc6b..6404595 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c @@ -254,12 +254,14 @@ static void pandora_wl1251_init_card(struct mmc_card *card) * We have TI wl1251 attached to MMC3. Pass this information to * SDIO core because it can't be probed by normal methods. */ - card->quirks |= MMC_QUIRK_NONSTD_SDIO; - card->cccr.wide_bus = 1; - card->cis.vendor = 0x104c; - card->cis.device = 0x9066; - card->cis.blksize = 512; - card->cis.max_dtr = 20000000; + if (card->type == MMC_TYPE_SDIO || card->type == MMC_TYPE_SD_COMBO) { + card->quirks |= MMC_QUIRK_NONSTD_SDIO; + card->cccr.wide_bus = 1; + card->cis.vendor = 0x104c; + card->cis.device = 0x9066; + card->cis.blksize = 512; + card->cis.max_dtr = 20000000; + } } static struct omap2_hsmmc_info omap3pandora_mmc[] = { diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 6d02012..7ad75c0 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -940,6 +940,12 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, } /* + * Call the optional HC's init_card function to handle quirks. + */ + if (host->ops->init_card) + host->ops->init_card(host, card); + + /* * For native busses: set card RCA and quit open drain mode. */ if (!mmc_host_is_spi(host)) { diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 5e8823d..59e2318 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -940,6 +940,12 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr, } /* + * Call the optional HC's init_card function to handle quirks. + */ + if (host->ops->init_card) + host->ops->init_card(host, card); + + /* * For native busses: get card RCA and quit open drain mode. */ if (!mmc_host_is_spi(host)) { @@ -1286,4 +1292,3 @@ err: return err; } -