linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: l.stach@pengutronix.de (Lucas Stach)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/8] clk: imx35: retain early UART clocks during kernel init
Date: Thu, 27 Aug 2015 18:39:18 +0200	[thread overview]
Message-ID: <1440693561-28095-6-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1440693561-28095-1-git-send-email-l.stach@pengutronix.de>

Make sure to keep UART clocks enabled during kernel init if
earlyprintk or earlycon are active.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/clk/imx/clk-imx35.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/clk/imx/clk-imx35.c b/drivers/clk/imx/clk-imx35.c
index 69138ba3dec7..7b2aaf123d3b 100644
--- a/drivers/clk/imx/clk-imx35.c
+++ b/drivers/clk/imx/clk-imx35.c
@@ -84,6 +84,14 @@ enum mx35_clks {
 
 static struct clk *clk[clk_max];
 
+static void __init imx35_uart_disable_cb(void)
+{
+	clk_disable_unprepare(clk[ipg]);
+	clk_disable_unprepare(clk[uart1_gate]);
+	clk_disable_unprepare(clk[uart2_gate]);
+	clk_disable_unprepare(clk[uart3_gate]);
+}
+
 int __init mx35_clocks_init(void)
 {
 	void __iomem *base;
@@ -292,6 +300,14 @@ int __init mx35_clocks_init(void)
 	 */
 	clk_prepare_enable(clk[scc_gate]);
 
+	if (imx_clk_keep_uart()) {
+		clk_prepare_enable(clk[ipg]);
+		clk_prepare_enable(clk[uart1_gate]);
+		clk_prepare_enable(clk[uart2_gate]);
+		clk_prepare_enable(clk[uart3_gate]);
+		imx_clk_set_uart_disable_callback(imx35_uart_disable_cb);
+	}
+
 	imx_print_silicon_rev("i.MX35", mx35_revision());
 
 	mxc_timer_init(MX35_GPT1_BASE_ADDR, MX35_INT_GPT, GPT_TYPE_IMX31);
-- 
2.5.0

  parent reply	other threads:[~2015-08-27 16:39 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-27 16:39 [PATCH 0/8] i.MX early debug UART clock fixes Lucas Stach
2015-08-27 16:39 ` [PATCH 1/8] clk: imx: add common logic to detect early UART usage Lucas Stach
2015-08-27 16:39 ` [PATCH 2/8] clk: imx25: retain early UART clocks during kernel init Lucas Stach
2015-08-27 16:39 ` [PATCH 3/8] clk: imx27: " Lucas Stach
2015-08-27 16:39 ` [PATCH 4/8] clk: imx31: " Lucas Stach
2015-08-27 16:39 ` Lucas Stach [this message]
2015-08-27 16:39 ` [PATCH 6/8] clk: imx5: " Lucas Stach
2015-08-27 16:39 ` [PATCH 7/8] clk: imx6: " Lucas Stach
2015-08-27 16:39 ` [PATCH 8/8] clk: imx7d: " Lucas Stach
2015-08-31 16:36 ` [PATCH 0/8] i.MX early debug UART clock fixes Lucas Stach
2015-09-02 22:49   ` Peter Hurley

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=1440693561-28095-6-git-send-email-l.stach@pengutronix.de \
    --to=l.stach@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.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).