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: 3070261 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A30C2BF924 for ; Fri, 18 Oct 2013 22:02:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B70B520394 for ; Fri, 18 Oct 2013 22:02:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A982B202C7 for ; Fri, 18 Oct 2013 22:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757293Ab3JRWCZ (ORCPT ); Fri, 18 Oct 2013 18:02:25 -0400 Received: from mail-ie0-f201.google.com ([209.85.223.201]:63755 "EHLO mail-ie0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755604Ab3JRWCZ (ORCPT ); Fri, 18 Oct 2013 18:02:25 -0400 Received: by mail-ie0-f201.google.com with SMTP id u16so848582iet.4 for ; Fri, 18 Oct 2013 15:02:24 -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=WXrePciOf8eMiPSSuLVqd/Ln/RNZ6v1AFQrrpjL5JRk5fi5pCgQh1b+DJ38Jw+OKzj Laj8wPOPCa7pHR4c2fFpVRNd6QklSk4J/z5IAX6U3wtAARXjToyLw0EMFjj5vc3gsc9F Op9oZ2sf5w93+/xjVUDN/LeV8bu7D759OiUukKKR+KXqqSkvQ2ujgazKDpehIMcA/YKt JYcJW8RuPvoWBMYX5DfeNj2om+k4iovpFvVyRX9hxjjjkC3b6BfSXfC4aAFUgS0SqwM5 sfx88t7EwQt44zTLMM27F3ex2iZeeWlSNM606avveX5u/q5Qm78AnblRgU+t77ldzZpR fpBw== X-Gm-Message-State: ALoCoQniCmp18nPuNB/+1Y6UmVipCJ1YsLBdbPjInx72787zcGK7dzChfcceVnQ0cuzp6ZatgLdbuyCEYbVraH0UbDyOQMebnmK1w2jgotij2H+e10RmXS44cx2ucsT29W7YVmQjkf8g/r8jYRpQucfFZkXgWIVT748tx49pCgdV7bESG+kIE62A8IPHaUYNfVwD2LEAVM+ZScsRL659eNGmq6t3us6fOA== 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 Cc: James Hogan , Grant Grundler , Alim Akhtar , Abhilash Kesavan , Tomasz Figa , Olof Johansson , Sonny Rao , Bing Zhao , Daniel Mack , Sascha Hauer , Doug Anderson , Tony Lindgren , Russell King , Ulf Hansson , Johan Rudholm , Namjae Jeon , Kevin Liu , linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org 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> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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; } -