From patchwork Tue Oct 6 01:22:42 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 7333011 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3D9BF9F302 for ; Tue, 6 Oct 2015 01:19:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 60220206AD for ; Tue, 6 Oct 2015 01:19:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1FA762069D for ; Tue, 6 Oct 2015 01:19:42 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZjGsh-0004IS-Iu; Tue, 06 Oct 2015 01:17:27 +0000 Received: from mail-lb0-f173.google.com ([209.85.217.173]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZjGrp-0003cG-P6 for linux-arm-kernel@lists.infradead.org; Tue, 06 Oct 2015 01:16:34 +0000 Received: by lbcao8 with SMTP id ao8so67665653lbc.3 for ; Mon, 05 Oct 2015 18:16:12 -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=V5LfZLJ51GrO3j1amPn4/0xLfnRbm0CxQw3gfisER5Q=; b=hdlHb0biQl7W0lE++CN2EoCE53bmU4yuMAvHuGbPIgewAw1xuw4/WjwbSOewKRbwaZ A04TIin2I6QAwTyharxRu8QQWPAnNPa9cEJZIquM7gKTFWdbboZ/TRLoFeahlwX8p4Fb nZRFij6MABvrmGZCxGVpXFAu0b2tuPXvK7l2C8gWD9IbTtr0PQR/gE+AyBqoV4sa/q/h q0ty3eWHMV6+udsXtUziStK8W8qqBLY47QbfjjxQImInnBsbdkOOPY38wEvLkELUA0qP eFFib6ZhgPevsg5WdtMn69HhjI2u0YK5XyatIp099R8GX643H6t0Tirmdr81KTGqZk9+ 001Q== X-Gm-Message-State: ALoCoQkvWl6hW3+YXm26AUrVN0ssgpicIu2nut63OCqwjCyfrH+YIzywvRuqHDKsOtZTqgm70Q7p X-Received: by 10.25.43.9 with SMTP id r9mr8665332lfr.45.1444094171987; Mon, 05 Oct 2015 18:16:11 -0700 (PDT) Received: from enkidu.semihalf.local (cardhu.semihalf.com. [213.17.239.108]) by smtp.gmail.com with ESMTPSA id x1sm4694780lbb.32.2015.10.05.18.16.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Oct 2015 18:16:11 -0700 (PDT) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org Subject: [PATCH 8/8] mmc: sdhci-pxav3: enable modifying MMC_CARD bit during card initialization Date: Tue, 6 Oct 2015 03:22:42 +0200 Message-Id: <1444094562-31165-9-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1444094562-31165-1-git-send-email-mw@semihalf.com> References: <1444094562-31165-1-git-send-email-mw@semihalf.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151005_181634_156087_1CCC4D40 X-CRM114-Status: GOOD ( 12.64 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@free-electrons.com, andrew@lunn.ch, ulf.hansson@linaro.org, jason@lakedaemon.net, tawfik@marvell.com, jaz@semihalf.com, nadavh@marvell.com, alior@marvell.com, gregory.clement@free-electrons.com, mw@semihalf.com, sebastian.hesselbarth@gmail.com 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 On Marvell Armada 38x SoC's the MMC_CARD bit in SD_CE_ATA_1 register must be set to 0x1 when a MMC card is supposed to work in DDR mode, or when commands CMD11, CMD14 and CMD20 are used. This commit enables the above for all MMC cards by modifying the host registers during card initialization. It is done by using init_card() callback. Signed-off-by: Marcin Wojtas --- drivers/mmc/host/sdhci-pxav3.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index ce96640..315dc4e 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -57,6 +57,7 @@ #define SD_SPI_MODE 0x108 #define SD_CE_ATA_1 0x10C +#define SDCE_MMC_CARD BIT(28) #define SD_CE_ATA_2 0x10E #define SDCE_MISC_INT (1<<2) @@ -221,6 +222,22 @@ static void pxav3_reset(struct sdhci_host *host, u8 mask) } } +static void pxav3_init_card(struct sdhci_host *host, struct mmc_card *card) +{ + struct platform_device *pdev = to_platform_device(mmc_dev(host->mmc)); + struct device_node *np = pdev->dev.of_node; + u32 reg_val; + + if (of_device_is_compatible(np, "marvell,armada-380-sdhci")) { + reg_val = sdhci_readl(host, SD_CE_ATA_1); + if (mmc_card_mmc(card)) + reg_val |= SDCE_MMC_CARD; + else + reg_val &= ~SDCE_MMC_CARD; + sdhci_writel(host, reg_val, SD_CE_ATA_1); + } +} + #define MAX_WAIT_COUNT 5 static void pxav3_gen_init_74_clocks(struct sdhci_host *host, u8 power_mode) { @@ -338,6 +355,7 @@ static const struct sdhci_ops pxav3_sdhci_ops = { .set_bus_width = sdhci_set_bus_width, .reset = pxav3_reset, .set_uhs_signaling = pxav3_set_uhs_signaling, + .init_card = pxav3_init_card, }; static struct sdhci_pltfm_data sdhci_pxav3_pdata = {