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 v2 1/8] clk: imx: add common logic to detect early UART usage
Date: Fri,  4 Sep 2015 18:00:12 +0200	[thread overview]
Message-ID: <1441382419-4343-2-git-send-email-l.stach@pengutronix.de> (raw)
In-Reply-To: <1441382419-4343-1-git-send-email-l.stach@pengutronix.de>

Both earlycon and eralyprintk depend on the bootloader setup UART
clocks being retained. This patch adds the common logic to detect such
situations and make the information available to the clock drivers, as
well as adding the facilities to disable those clocks at the end of
the kernel init.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/clk/imx/clk.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 drivers/clk/imx/clk.h |  1 +
 2 files changed, 47 insertions(+)

diff --git a/drivers/clk/imx/clk.c b/drivers/clk/imx/clk.c
index df12b5307175..3357e29e43ab 100644
--- a/drivers/clk/imx/clk.c
+++ b/drivers/clk/imx/clk.c
@@ -73,3 +73,49 @@ void imx_cscmr1_fixup(u32 *val)
 	*val ^= CSCMR1_FIXUP;
 	return;
 }
+
+static int __initdata imx_keep_uart_clocks;
+static struct clk __initdata ***imx_uart_clocks;
+
+static int __init imx_keep_uart_clocks_param(char *str)
+{
+	imx_keep_uart_clocks = 1;
+
+	return 0;
+}
+__setup_param("earlycon", imx_keep_uart_earlycon,
+	      imx_keep_uart_clocks_param, 0);
+__setup_param("earlyprintk", imx_keep_uart_earlyprintk,
+	      imx_keep_uart_clocks_param, 0);
+
+void __init imx_register_uart_clocks(struct clk **clks[])
+{
+	if (imx_keep_uart_clocks) {
+		int i;
+
+		imx_uart_clocks = clks;
+		for (i = 0;; i++) {
+			if (imx_uart_clocks[i])
+				clk_prepare_enable(*imx_uart_clocks[i]);
+			else
+				break;
+		}
+	}
+}
+
+static int __init imx_clk_disable_uart(void)
+{
+	if (imx_keep_uart_clocks) {
+		int i;
+
+		for (i = 0;; i++) {
+			if (imx_uart_clocks[i])
+				clk_disable_unprepare(*imx_uart_clocks[i]);
+			else
+				break;
+		}
+	}
+
+	return 0;
+}
+late_initcall_sync(imx_clk_disable_uart);
diff --git a/drivers/clk/imx/clk.h b/drivers/clk/imx/clk.h
index 1049b0c7d818..c4e2e282e892 100644
--- a/drivers/clk/imx/clk.h
+++ b/drivers/clk/imx/clk.h
@@ -7,6 +7,7 @@
 extern spinlock_t imx_ccm_lock;
 
 void imx_check_clocks(struct clk *clks[], unsigned int count);
+void imx_register_uart_clocks(struct clk **clks[]);
 
 extern void imx_cscmr1_fixup(u32 *val);
 
-- 
2.5.0

  reply	other threads:[~2015-09-04 16:00 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-04 16:00 [PATCH v2 0/8] i.MX early debug UART clock fixes Lucas Stach
2015-09-04 16:00 ` Lucas Stach [this message]
2015-09-06 14:21   ` [PATCH v2 1/8] clk: imx: add common logic to detect early UART usage Shawn Guo
2015-09-07  9:06   ` Uwe Kleine-König
2015-09-07  9:15     ` Lucas Stach
2015-09-07  9:50       ` Uwe Kleine-König
2015-09-04 16:00 ` [PATCH v2 2/8] clk: imx25: retain early UART clocks during kernel init Lucas Stach
2015-09-06 14:23   ` Shawn Guo
2015-09-07  9:10     ` Uwe Kleine-König
2015-09-07  9:18       ` Lucas Stach
2015-09-04 16:00 ` [PATCH v2 3/8] clk: imx27: " Lucas Stach
2015-09-04 16:00 ` [PATCH v2 4/8] clk: imx31: " Lucas Stach
2015-09-04 16:00 ` [PATCH v2 5/8] clk: imx35: " Lucas Stach
2015-09-04 16:00 ` [PATCH v2 6/8] clk: imx5: " Lucas Stach
2015-09-04 16:00 ` [PATCH v2 7/8] clk: imx6: " Lucas Stach
2015-09-04 16:00 ` [PATCH v2 8/8] clk: imx7d: " Lucas Stach

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=1441382419-4343-2-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).