From patchwork Fri Oct 9 01:03:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcin Wojtas X-Patchwork-Id: 7358451 Return-Path: X-Original-To: patchwork-linux-mmc@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 6A2E19F32B for ; Fri, 9 Oct 2015 00:57:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9EF4B207D3 for ; Fri, 9 Oct 2015 00:57:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C006C207B9 for ; Fri, 9 Oct 2015 00:57:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755325AbbJIA4v (ORCPT ); Thu, 8 Oct 2015 20:56:51 -0400 Received: from mail-lb0-f180.google.com ([209.85.217.180]:36364 "EHLO mail-lb0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755231AbbJIA4s (ORCPT ); Thu, 8 Oct 2015 20:56:48 -0400 Received: by lbcao8 with SMTP id ao8so65579915lbc.3 for ; Thu, 08 Oct 2015 17:56:47 -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=/Je/ETLUo3tTH1C3lKd1Iw2e0Jqw6Faet/hE7e2UFhA=; b=PSEP3y/elzlDOLTASxRIuekc2ucPG1iC6e5EQ+jQyhCcySggoHhjgqvexD0fhCCQKV 9y2j+l1xKKsfA1o8PzZejd7xea9a3V9+xhTZgMlNSldwQkV5FU67NQHiKXIzVFk9oPOe 6Qqbb71gSOfa44t2q21nZ0vgampYgRk1XMAVfKt0a8Tzz88rguyiP848RDJEifh3y1yB shUBo7f9HMIcMMCTNLts6uC0w5Hb11Pj4Ha1Iy8c5gsD9Pww7iXK4wm8z43ZLrqa/nN7 E+Du6SsTHYHhAOmXkYvv2Ma/OjLe+xzAi3G15DBxKVZL6Uxr/qV/flnDxZBNJWJ6mju/ D64A== X-Gm-Message-State: ALoCoQkdkjqNni8+66bojGkH1ncze+XT20EDMNtGq2o+G/JTaU9rHz/XZ/AyM1da+LeNt/XKuoSI X-Received: by 10.112.13.201 with SMTP id j9mr5045630lbc.45.1444352207007; Thu, 08 Oct 2015 17:56:47 -0700 (PDT) Received: from enkidu.semihalf.local (cardhu.semihalf.com. [213.17.239.108]) by smtp.gmail.com with ESMTPSA id og8sm7668933lbc.5.2015.10.08.17.56.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Oct 2015 17:56:46 -0700 (PDT) From: Marcin Wojtas To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mmc@vger.kernel.org Cc: ulf.hansson@linaro.org, sebastian.hesselbarth@gmail.com, andrew@lunn.ch, jason@lakedaemon.net, thomas.petazzoni@free-electrons.com, gregory.clement@free-electrons.com, nadavh@marvell.com, alior@marvell.com, tawfik@marvell.com, mw@semihalf.com, jaz@semihalf.com Subject: [PATCH v2 5/5] mmc: sdhci-pxav3: enable modifying MMC_CARD bit during card initialization Date: Fri, 9 Oct 2015 03:03:55 +0200 Message-Id: <1444352635-21965-6-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1444352635-21965-1-git-send-email-mw@semihalf.com> References: <1444352635-21965-1-git-send-email-mw@semihalf.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 352c5eb..9bdeeb1 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 = {