From patchwork Tue Dec 2 20:49:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 5424451 Return-Path: X-Original-To: patchwork-linux-omap@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 937359F30B for ; Tue, 2 Dec 2014 20:51:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 88D17202F8 for ; Tue, 2 Dec 2014 20:51:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88B6B20253 for ; Tue, 2 Dec 2014 20:51:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932861AbaLBUvZ (ORCPT ); Tue, 2 Dec 2014 15:51:25 -0500 Received: from mail-ig0-f171.google.com ([209.85.213.171]:53767 "EHLO mail-ig0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932762AbaLBUuZ (ORCPT ); Tue, 2 Dec 2014 15:50:25 -0500 Received: by mail-ig0-f171.google.com with SMTP id z20so11615801igj.16 for ; Tue, 02 Dec 2014 12:50:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W21aET3QXvMlqbOLnxso7t4b/egasSEyZwctlNCHc9Y=; b=niHEmI6uAKXSfp5Fq0ISDycLnx110yEapNvuTuUWGUmiQV5jBHtDdA/wonk56RDUVA U1Vab6Ad/hMhOd9H5iCrbaz1Jt/Mv4sf11D+gAdKnpAHWHqWHKKowjvd+fVRtaH3UHiZ OZuF0nIx3oWv48gW6pRwaPkuiqc3y+crm8lgs= 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=W21aET3QXvMlqbOLnxso7t4b/egasSEyZwctlNCHc9Y=; b=cs97lAlKX8VqG6rMpZLO7+PxTBrfQq8THpHd9PBozRitbxnHfhlrQEURY89CS102Zj Lq41QJWttg7BxWJKkkbjQkHPtdA5liigfoQ+QFlty+PhaQxOT8Nf8ygE7X4jfw8zpniZ NKUjk5ORx/e1o34mHtIMC/PDEGm2I6WJiEc4rtT3zyKyDBfktaPXvQJ4XxNSR51fKQt7 8nJoMzym9s6RtFDJWtJL6L+lF5AeYqRh2tOmHjbO2tBOMUk/Nbzeg7Mn3uHTM/eHa/s5 OIllDNhGbc4qPIMYAmenkb4dhAfRf1dngBh6kDUFP5CXmRA4Qr7eAoCdZFc6sjhQNGs+ 6uVQ== X-Gm-Message-State: ALoCoQnYVNpStAx8NBZU3bt6KYb2zAM22MVotduktG9CVBJLbZAaZpOYxVSj+lA9LYzKvCFF4kN2 X-Received: by 10.50.18.68 with SMTP id u4mr26352356igd.36.1417553424171; Tue, 02 Dec 2014 12:50:24 -0800 (PST) Received: from tictac.mtv.corp.google.com ([172.22.65.76]) by mx.google.com with ESMTPSA id qc7sm6311238igb.5.2014.12.02.12.50.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 02 Dec 2014 12:50:23 -0800 (PST) From: Doug Anderson To: Jaehoon Chung , Seungwon Jeon , Ulf Hansson Cc: Alim Akhtar , Sonny Rao , Andrew Bresticker , Heiko Stuebner , Doug Anderson , tony@atomide.com, linux@arm.linux.org.uk, chris@printf.net, gsoutade@neotion.com, axel.lin@ingics.com, s.hauer@pengutronix.de, wsa@the-dreams.de, joe@perches.com, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org Subject: [PATCH v4 1/3] mmc: core: Support the optional init_card() callback for MMC and SD Date: Tue, 2 Dec 2014 12:49:55 -0800 Message-Id: <1417553397-460-2-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1417553397-460-1-git-send-email-dianders@chromium.org> References: <1417553397-460-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=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_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: - mmc core change 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 7f17087..969e100 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 02ad792..4a21d66 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -1297,6 +1297,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 d90a6de..29fccdc 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -933,6 +933,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)) { @@ -1271,4 +1277,3 @@ err: return err; } -