From patchwork Tue Feb 7 21:35:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9561229 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BC50360576 for ; Tue, 7 Feb 2017 21:37:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AF35D28485 for ; Tue, 7 Feb 2017 21:37:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A456A28490; Tue, 7 Feb 2017 21:37:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7256A28485 for ; Tue, 7 Feb 2017 21:37:52 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cbDSO-0003hB-MF; Tue, 07 Feb 2017 21:37:48 +0000 Received: from mail-wr0-f195.google.com ([209.85.128.195]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cbDSH-0003Qn-M7 for linux-amlogic@lists.infradead.org; Tue, 07 Feb 2017 21:37:45 +0000 Received: by mail-wr0-f195.google.com with SMTP id k90so6660974wrc.3 for ; Tue, 07 Feb 2017 13:37:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=5pFEX8Wa3lWTQoc+jBrGWAwy80Ng81/V+gP/+XOs1PI=; b=BB3rHt6TsWYxtpwZklA9rudtbnC+ljb/1FMLkwzkKIBDkhzSsRipv0YOVIwOKbZzyc ZRkw1+1NCvxotVzC8540GBwVknm4t9lFJB3f7gL1J654d3JBjgtJm6Ufxdy4gBo3xR6E p0EUv164DWulB+TEIrNYmV4SnRDBjRtrM4TeCE72Jdh4gp0TS/C/1zAYo6ZHoYI7m+gI hYxeyrUSrLvuDFR8xFnwGDU9P82ig7DA+chc+8vfmqcXRXNbYqXDB8kEjCOnENSP7uKS XxJ+A9FpFXq2oGhc0rEtXyd7VvAPRn/IIIofgR0EsKnvr/NXHNLWwg0AdfkFYbQe1abw 7hDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=5pFEX8Wa3lWTQoc+jBrGWAwy80Ng81/V+gP/+XOs1PI=; b=bJPTwwRrNqNTOyUmmKjCqORnhRO/D1xtOaJWGPmXjCmrI0StijNAq+VcpuL8XObWcF VT2wycg45RfHMztvUSLBSQNfGLWo9kfs9ALqitNuR0q8Pi82BIPOHPMv8UAcA+7oDCRI 5Z8MOhsO7gwskV0iDomMOQROnpgqcG8iRWcOAVx89OT+Rwd4UhlZ7mkgMWlMdWphTr1w 4Gv/SIN58MRBco5A21IU05OjdyMBOKnNqV6wY76IDu10aKdVW6FIuAgAZ7l8diJpc+RE VZeIJMrZ8Ph7qoI/TZ4njTKww5jXy6VtTgjtY7T7lPjhcX0q3fS6FAz+v+7x3LD+ag4K oWzw== X-Gm-Message-State: AIkVDXIWQWjyYF/Fp5anQsgJ5QukEFactAguuIRkzRhkVG4beXYERoCyi2THTgLEju2+GA== X-Received: by 10.223.138.9 with SMTP id w9mr15761844wrw.50.1486503383617; Tue, 07 Feb 2017 13:36:23 -0800 (PST) Received: from ?IPv6:2003:c6:ebce:1e00:cd3f:c3c7:98c5:4fec? (p200300C6EBCE1E00CD3FC3C798C54FEC.dip0.t-ipconnect.de. [2003:c6:ebce:1e00:cd3f:c3c7:98c5:4fec]) by smtp.googlemail.com with ESMTPSA id x135sm640665wme.23.2017.02.07.13.36.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Feb 2017 13:36:23 -0800 (PST) From: Heiner Kallweit Subject: [PATCH v3 9/9] mmc: meson-gx: add support for HS400 mode To: Ulf Hansson , Kevin Hilman References: <0991d40b-e05b-2fcb-9ee4-7b529448de69@gmail.com> Message-ID: <282ded48-616d-b0c3-b1e1-34f0987a9255@gmail.com> Date: Tue, 7 Feb 2017 22:35:59 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <0991d40b-e05b-2fcb-9ee4-7b529448de69@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170207_133742_156402_3754478F X-CRM114-Status: UNSURE ( 7.63 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlo Caione , linux-amlogic@lists.infradead.org, "linux-mmc@vger.kernel.org" Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for HS400 mode. The driver still misses support for tuning, therefore highspeed modes like HS400 might not work under all circumstances yet. Successfully tested on a Odroid C2 (S905 GXBB). Signed-off-by: Heiner Kallweit Reviewed-by: Kevin Hilman Tested-by: Kevin Hilman --- v3: - extended commit message --- drivers/mmc/host/meson-gx-mmc.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 3cc6334a..5a959783 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -83,6 +83,7 @@ #define CFG_RC_CC_MASK 0xf #define CFG_STOP_CLOCK BIT(22) #define CFG_CLK_ALWAYS_ON BIT(18) +#define CFG_CHK_DS BIT(20) #define CFG_AUTO_CLK BIT(23) #define SD_EMMC_STATUS 0x48 @@ -408,6 +409,16 @@ static void meson_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) val &= ~(CFG_RC_CC_MASK << CFG_RC_CC_SHIFT); val |= ilog2(SD_EMMC_CFG_CMD_GAP) << CFG_RC_CC_SHIFT; + val &= ~CFG_DDR; + if (ios->timing == MMC_TIMING_UHS_DDR50 || + ios->timing == MMC_TIMING_MMC_DDR52 || + ios->timing == MMC_TIMING_MMC_HS400) + val |= CFG_DDR; + + val &= ~CFG_CHK_DS; + if (ios->timing == MMC_TIMING_MMC_HS400) + val |= CFG_CHK_DS; + writel(val, host->regs + SD_EMMC_CFG); if (val != orig)