linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: James Liao <jamesjj.liao@mediatek.com>
To: Matthias Brugger <matthias.bgg@gmail.com>,
	Mike Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@codeaurora.org>,
	Rob Herring <robh@kernel.org>
Cc: John Crispin <blogic@openwrt.org>, Arnd Bergmann <arnd@arndb.de>,
	Sascha Hauer <kernel@pengutronix.de>,
	Daniel Kurtz <djkurtz@chromium.org>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	<devicetree@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<linux-kernel@vger.kernel.org>,
	<linux-mediatek@lists.infradead.org>, <linux-clk@vger.kernel.org>,
	<srv_heupstream@mediatek.com>,
	James Liao <jamesjj.liao@mediatek.com>
Subject: [PATCH v7 7/9] clk: mediatek: Enable critical clocks for MT2701
Date: Thu, 14 Apr 2016 16:11:52 +0800	[thread overview]
Message-ID: <1460621514-65191-8-git-send-email-jamesjj.liao@mediatek.com> (raw)
In-Reply-To: <1460621514-65191-1-git-send-email-jamesjj.liao@mediatek.com>

Some system clocks should be turned on by default on MT2701.
This patch enable these clocks when related clocks have
been registered.

Signed-off-by: James Liao <jamesjj.liao@mediatek.com>
---
 drivers/clk/mediatek/clk-mt2701.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/mediatek/clk-mt2701.c b/drivers/clk/mediatek/clk-mt2701.c
index 9542e47..90294e7 100644
--- a/drivers/clk/mediatek/clk-mt2701.c
+++ b/drivers/clk/mediatek/clk-mt2701.c
@@ -671,6 +671,21 @@ static const struct mtk_gate top_clks[] __initconst = {
 		28),
 };
 
+static struct clk_onecell_data *top_clk_data __initdata;
+static struct clk_onecell_data *pll_clk_data __initdata;
+
+static void __init mtk_clk_enable_critical(void)
+{
+	if (!top_clk_data || !pll_clk_data)
+		return;
+
+	clk_prepare_enable(pll_clk_data->clks[CLK_APMIXED_ARMPLL]);
+	clk_prepare_enable(top_clk_data->clks[CLK_TOP_AXI_SEL]);
+	clk_prepare_enable(top_clk_data->clks[CLK_TOP_MEM_SEL]);
+	clk_prepare_enable(top_clk_data->clks[CLK_TOP_DDRPHYCFG_SEL]);
+	clk_prepare_enable(top_clk_data->clks[CLK_TOP_RTC_SEL]);
+}
+
 static void __init mtk_topckgen_init(struct device_node *node)
 {
 	struct clk_onecell_data *clk_data;
@@ -683,7 +698,7 @@ static void __init mtk_topckgen_init(struct device_node *node)
 		return;
 	}
 
-	clk_data = mtk_alloc_clk_data(CLK_TOP_NR);
+	top_clk_data = clk_data = mtk_alloc_clk_data(CLK_TOP_NR);
 
 	mtk_clk_register_fixed_clks(top_fixed_clks, ARRAY_SIZE(top_fixed_clks),
 								clk_data);
@@ -704,6 +719,8 @@ static void __init mtk_topckgen_init(struct device_node *node)
 	if (r)
 		pr_err("%s(): could not register clock provider: %d\n",
 			__func__, r);
+
+	mtk_clk_enable_critical();
 }
 CLK_OF_DECLARE(mtk_topckgen, "mediatek,mt2701-topckgen", mtk_topckgen_init);
 
@@ -1297,7 +1314,7 @@ static void __init mtk_apmixedsys_init(struct device_node *node)
 	struct clk_onecell_data *clk_data;
 	int r;
 
-	clk_data = mtk_alloc_clk_data(CLK_APMIXED_NR);
+	pll_clk_data = clk_data = mtk_alloc_clk_data(CLK_APMIXED_NR);
 	if (!clk_data)
 		return;
 
@@ -1308,6 +1325,8 @@ static void __init mtk_apmixedsys_init(struct device_node *node)
 	if (r)
 		pr_err("%s(): could not register clock provider: %d\n",
 			__func__, r);
+
+	mtk_clk_enable_critical();
 }
 CLK_OF_DECLARE(mtk_apmixedsys, "mediatek,mt2701-apmixedsys",
 							mtk_apmixedsys_init);
-- 
1.9.1

  parent reply	other threads:[~2016-04-14  8:18 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-14  8:11 [PATCH v7 0/9] Add clock support for Mediatek MT2701 James Liao
2016-04-14  8:11 ` [PATCH v7 1/9] clk: mediatek: Refine the makefile to support multiple clock drivers James Liao
2016-04-22  9:02   ` Matthias Brugger
2016-04-14  8:11 ` [PATCH v7 2/9] dt-bindings: ARM: Mediatek: Document bindings for MT2701 James Liao
2016-04-14  8:11 ` [PATCH v7 3/9] clk: mediatek: Add dt-bindings for MT2701 clocks James Liao
2016-04-22  9:06   ` Matthias Brugger
2016-04-14  8:11 ` [PATCH v7 4/9] clk: mediatek: Add MT2701 clock support James Liao
2016-04-22 18:43   ` Matthias Brugger
2016-05-06 23:11   ` Stephen Boyd
2016-05-09  6:38     ` James Liao
2016-05-09 22:29       ` Stephen Boyd
2016-05-10  2:30         ` James Liao
2016-04-14  8:11 ` [PATCH v7 5/9] reset: mediatek: Add MT2701 reset controller dt-binding file James Liao
2016-04-14  8:11 ` [PATCH v7 6/9] reset: mediatek: Add MT2701 reset driver James Liao
2016-04-14  8:11 ` James Liao [this message]
2016-05-06 23:12   ` [PATCH v7 7/9] clk: mediatek: Enable critical clocks for MT2701 Stephen Boyd
2016-05-09  5:40     ` James Liao
2016-05-09 22:13       ` Stephen Boyd
2016-05-10  2:20         ` James Liao
2016-05-11  2:51         ` James Liao
2016-04-14  8:11 ` [PATCH v7 8/9] clk: mediatek: Add config options for MT2701 subsystem clocks James Liao
2016-05-06 23:02   ` Stephen Boyd
2016-05-09  5:37     ` James Liao
2016-05-09 22:13       ` Stephen Boyd
2016-04-14  8:11 ` [PATCH v7 9/9] arm: dts: mt2701: Add clock controller device nodes James Liao

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=1460621514-65191-8-git-send-email-jamesjj.liao@mediatek.com \
    --to=jamesjj.liao@mediatek.com \
    --cc=arnd@arndb.de \
    --cc=blogic@openwrt.org \
    --cc=devicetree@vger.kernel.org \
    --cc=djkurtz@chromium.org \
    --cc=kernel@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=matthias.bgg@gmail.com \
    --cc=mturquette@baylibre.com \
    --cc=p.zabel@pengutronix.de \
    --cc=robh@kernel.org \
    --cc=sboyd@codeaurora.org \
    --cc=srv_heupstream@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;
as well as URLs for NNTP newsgroup(s).