public inbox for linux-mediatek@lists.infradead.org
 help / color / mirror / Atom feed
From: Chaotian Jing <chaotian.jing@mediatek.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>,
	Chaotian Jing <chaotian.jing@mediatek.com>,
	yong mao <yong.mao@mediatek.com>,
	Linus Walleij <linus.walleij@linaro.org>,
	Javier Martinez Canillas <javier@osg.samsung.com>,
	Heiner Kallweit <hkallweit1@gmail.com>,
	Phong LE <ple@baylibre.com>,
	linux-mmc@vger.kernel.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org,
	srv_heupstream@mediatek.com
Subject: [PATCH v2 10/13] mmc: mediatek: add support of source_cg clock
Date: Mon, 9 Oct 2017 19:35:23 +0800	[thread overview]
Message-ID: <1507548926-9555-11-git-send-email-chaotian.jing@mediatek.com> (raw)
In-Reply-To: <1507548926-9555-1-git-send-email-chaotian.jing@mediatek.com>

source clock need an independent cg to control, when doing clk mode
switch, need gate source clock to avoid hw issue(multi-bit sync hw hang)

Signed-off-by: Chaotian Jing <chaotian.jing@mediatek.com>
---
 drivers/mmc/host/mtk-sd.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index 5d99e05..522fd0a 100644
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -372,6 +372,7 @@ struct msdc_host {
 
 	struct clk *src_clk;	/* msdc source clock */
 	struct clk *h_clk;      /* msdc h_clk */
+	struct clk *src_clk_cg; /* msdc source clock control gate */
 	u32 mclk;		/* mmc subsystem clock frequency */
 	u32 src_clk_freq;	/* source clock frequency */
 	u32 sclk;		/* SD/MS bus clock frequency */
@@ -612,6 +613,7 @@ static void msdc_set_timeout(struct msdc_host *host, u32 ns, u32 clks)
 
 static void msdc_gate_clock(struct msdc_host *host)
 {
+	clk_disable_unprepare(host->src_clk_cg);
 	clk_disable_unprepare(host->src_clk);
 	clk_disable_unprepare(host->h_clk);
 }
@@ -620,6 +622,7 @@ static void msdc_ungate_clock(struct msdc_host *host)
 {
 	clk_prepare_enable(host->h_clk);
 	clk_prepare_enable(host->src_clk);
+	clk_prepare_enable(host->src_clk_cg);
 	while (!(readl(host->base + MSDC_CFG) & MSDC_CFG_CKSTB))
 		cpu_relax();
 }
@@ -691,6 +694,15 @@ static void msdc_set_mclk(struct msdc_host *host, unsigned char timing, u32 hz)
 			sclk = (host->src_clk_freq >> 2) / div;
 		}
 	}
+	sdr_clr_bits(host->base + MSDC_CFG, MSDC_CFG_CKPDN);
+	/*
+	 * As src_clk/HCLK use the same bit to gate/ungate,
+	 * So if want to only gate src_clk, need gate its parent(mux).
+	 */
+	if (host->src_clk_cg)
+		clk_disable_unprepare(host->src_clk_cg);
+	else
+		clk_disable_unprepare(clk_get_parent(host->src_clk));
 	if (host->dev_comp->clk_div_bits == 8)
 		sdr_set_field(host->base + MSDC_CFG,
 			      MSDC_CFG_CKMOD | MSDC_CFG_CKDIV,
@@ -699,10 +711,14 @@ static void msdc_set_mclk(struct msdc_host *host, unsigned char timing, u32 hz)
 		sdr_set_field(host->base + MSDC_CFG,
 			      MSDC_CFG_CKMOD_EXTRA | MSDC_CFG_CKDIV_EXTRA,
 			      (mode << 12) | div);
+	if (host->src_clk_cg)
+		clk_prepare_enable(host->src_clk_cg);
+	else
+		clk_prepare_enable(clk_get_parent(host->src_clk));
 
-	sdr_set_bits(host->base + MSDC_CFG, MSDC_CFG_CKPDN);
 	while (!(readl(host->base + MSDC_CFG) & MSDC_CFG_CKSTB))
 		cpu_relax();
+	sdr_set_bits(host->base + MSDC_CFG, MSDC_CFG_CKPDN);
 	host->sclk = sclk;
 	host->mclk = hz;
 	host->timing = timing;
@@ -1832,6 +1848,11 @@ static int msdc_drv_probe(struct platform_device *pdev)
 		goto host_free;
 	}
 
+	/*source clock control gate is optional clock*/
+	host->src_clk_cg = devm_clk_get(&pdev->dev, "source_cg");
+	if (IS_ERR(host->src_clk_cg))
+		host->src_clk_cg = NULL;
+
 	host->irq = platform_get_irq(pdev, 0);
 	if (host->irq < 0) {
 		ret = -EINVAL;
-- 
1.8.1.1.dirty

  parent reply	other threads:[~2017-10-09 11:35 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-09 11:35 [PATCH v2 00/13] mmc: mediatek: add support of mt2701/mt2712 Chaotian Jing
2017-10-09 11:35 ` [PATCH v2 02/13] " Chaotian Jing
2017-10-09 11:35 ` [PATCH v2 03/13] mmc: dt-bindings: make compatible explicit Chaotian Jing
2017-10-09 14:54   ` Matthias Brugger
     [not found]     ` <e4e5fa8b-b6a5-dc70-fbfc-6328493cd073-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2017-10-10  1:37       ` Chaotian Jing
2017-10-10  7:19         ` Ulf Hansson
2017-10-10  8:35           ` Matthias Brugger
2017-10-13 20:09           ` Rob Herring
2017-10-13 20:14   ` Rob Herring
2017-10-14  2:11     ` Chaotian Jing
     [not found] ` <1507548926-9555-1-git-send-email-chaotian.jing-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2017-10-09 11:35   ` [PATCH v2 01/13] mmc: dt-bindings: Add reg/source_cg/latch-ck for Mediatek MMC bindings Chaotian Jing
2017-10-09 14:53     ` Matthias Brugger
2017-10-09 11:35   ` [PATCH v2 04/13] arm64: dts: mt8173: remove "mediatek, mt8135-mmc" from mmc nodes Chaotian Jing
2017-10-09 11:35   ` [PATCH v2 07/13] mmc: mediatek: add async fifo and data tune support Chaotian Jing
2017-10-09 11:35   ` [PATCH v2 08/13] mmc: mediatek: add busy_check support Chaotian Jing
2017-10-09 11:35   ` [PATCH v2 09/13] mmc: mediatek: add stop_clk fix and enhance_rx support Chaotian Jing
     [not found]     ` <1507548926-9555-10-git-send-email-chaotian.jing-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
2017-10-09 15:00       ` Matthias Brugger
2017-10-10  1:39         ` Chaotian Jing
2017-10-09 11:35 ` [PATCH v2 05/13] mmc: mediatek: make hs400_tune_response only for mt8173 Chaotian Jing
2017-10-09 14:58   ` Matthias Brugger
2017-10-10  1:39     ` Chaotian Jing
2017-10-09 11:35 ` [PATCH v2 06/13] mmc: mediatek: add pad_tune0 support Chaotian Jing
2017-10-09 11:35 ` Chaotian Jing [this message]
2017-10-09 11:35 ` [PATCH v2 11/13] mmc: mediatek: add latch-ck support Chaotian Jing
2017-10-09 11:35 ` [PATCH v2 12/13] mmc: mediatek: improve eMMC hs400 mode read performance Chaotian Jing
2017-10-09 11:35 ` [PATCH v2 13/13] mmc: mediatek: perfer to use rise edge latching for cmd line Chaotian Jing

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=1507548926-9555-11-git-send-email-chaotian.jing@mediatek.com \
    --to=chaotian.jing@mediatek.com \
    --cc=catalin.marinas@arm.com \
    --cc=devicetree@vger.kernel.org \
    --cc=hkallweit1@gmail.com \
    --cc=javier@osg.samsung.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=matthias.bgg@gmail.com \
    --cc=ple@baylibre.com \
    --cc=robh+dt@kernel.org \
    --cc=srv_heupstream@mediatek.com \
    --cc=ulf.hansson@linaro.org \
    --cc=will.deacon@arm.com \
    --cc=yong.mao@mediatek.com \
    /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