linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Chen-Yu Tsai <wens@csie.org>,
	Maxime Ripard <maxime.ripard@free-electrons.com>,
	Ulf Hansson <ulf.hansson@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>,
	devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org,
	Andre Przywara <andre.przywara@arm.com>
Subject: [PATCH v4 2/13] mmc: sunxi: Gate the clock when rate is 0
Date: Thu, 26 Jan 2017 10:05:55 +0100	[thread overview]
Message-ID: <fa9886d81af2415a6b83e9ff68bb5ebd430d4425.1485421557.git-series.maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <cover.8d42a39b7bd5143e709979dc42cc47862ebe3728.1485421557.git-series.maxime.ripard@free-electrons.com>
In-Reply-To: <cover.8d42a39b7bd5143e709979dc42cc47862ebe3728.1485421557.git-series.maxime.ripard@free-electrons.com>

The MMC core assumes that the code will gate the clock when the bus
frequency is set to 0, which we've been ignoring so far.

Handle that.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 drivers/mmc/host/sunxi-mmc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c
index ab4324e6eb74..019f95e8e7c5 100644
--- a/drivers/mmc/host/sunxi-mmc.c
+++ b/drivers/mmc/host/sunxi-mmc.c
@@ -765,6 +765,9 @@ static int sunxi_mmc_clk_set_rate(struct sunxi_mmc_host *host,
 	if (ret)
 		return ret;
 
+	if (!ios->clock)
+		return 0;
+
 	/* 8 bit DDR requires a higher module clock */
 	if (ios->timing == MMC_TIMING_MMC_DDR52 &&
 	    ios->bus_width == MMC_BUS_WIDTH_8)
@@ -882,7 +885,7 @@ static void sunxi_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 	mmc_writel(host, REG_GCTRL, rval);
 
 	/* set up clock */
-	if (ios->clock && ios->power_mode) {
+	if (ios->power_mode) {
 		host->ferror = sunxi_mmc_clk_set_rate(host, ios);
 		/* Android code had a usleep_range(50000, 55000); here */
 	}
-- 
git-series 0.8.11

  parent reply	other threads:[~2017-01-26  9:09 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-26  9:05 [PATCH v4 0/13] arm64: allwinner: a64: Enable MMC support Maxime Ripard
2017-01-26  9:05 ` [PATCH v4 1/13] mmc: sunxi: Fix clock frequency change sequence Maxime Ripard
2017-01-26  9:05 ` Maxime Ripard [this message]
2017-01-26  9:05 ` [PATCH v4 3/13] mmc: sunxi: Always set signal delay to 0 for A64 Maxime Ripard
2017-01-26  9:05 ` [PATCH v4 4/13] mmc: sunxi: Enable the new timings for the A64 MMC controllers Maxime Ripard
2017-01-26  9:05 ` [PATCH v4 5/13] mmc: sunxi: Mask DATA0 when updating the clock Maxime Ripard
2017-01-26  9:05 ` [PATCH v4 6/13] mmc: sunxi: Add EMMC (MMC2) controller compatible Maxime Ripard
2017-01-26  9:06 ` [PATCH v4 7/13] mmc: sunxi: Add more debug informations Maxime Ripard
2017-01-26  9:06 ` [PATCH v4 8/13] arm64: allwinner: a64: Add MMC nodes Maxime Ripard
2017-01-26  9:06 ` [PATCH v4 9/13] arm64: allwinner: a64: Add MMC pinctrl nodes Maxime Ripard
2017-01-26  9:06 ` [PATCH v4 10/13] arm64: allwinner: a64: Increase the MMC max frequency Maxime Ripard
2017-01-27 10:29   ` Florian Vaussard
2017-01-27 21:26     ` Maxime Ripard
2017-01-26  9:06 ` [PATCH v4 11/13] arm64: allwinner: pine64: add MMC support Maxime Ripard
2017-01-26  9:06 ` [PATCH v4 12/13] arm64: allwinner: a64: add UART1 pin nodes Maxime Ripard
2017-01-26  9:06 ` [PATCH v4 13/13] arm64: allwinner: add BananaPi-M64 support Maxime Ripard
2017-01-27 10:37 ` [PATCH v4 0/13] arm64: allwinner: a64: Enable MMC support Florian Vaussard
2017-01-27 21:27   ` Maxime Ripard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fa9886d81af2415a6b83e9ff68bb5ebd430d4425.1485421557.git-series.maxime.ripard@free-electrons.com \
    --to=maxime.ripard@free-electrons.com \
    --cc=andre.przywara@arm.com \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=ulf.hansson@linaro.org \
    --cc=wens@csie.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).