From patchwork Tue Jul 31 13:44:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 1260591 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 8A980DF26F for ; Tue, 31 Jul 2012 14:46:34 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SwDdb-0005ur-3z; Tue, 31 Jul 2012 14:41:31 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SwCkw-00008n-Vp for linux-arm-kernel@lists.infradead.org; Tue, 31 Jul 2012 13:45:03 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1SwCkg-0004tc-KG; Tue, 31 Jul 2012 15:44:46 +0200 Received: from ukl by dude.hi.pengutronix.de with local (Exim 4.80) (envelope-from ) id 1SwCkg-0007hZ-J9; Tue, 31 Jul 2012 15:44:46 +0200 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Sascha Hauer Subject: [PATCH] ARM: imx35: don't disable the uart clock when DEBUG_LL is in use Date: Tue, 31 Jul 2012 15:44:39 +0200 Message-Id: <1343742279-29570-1-git-send-email-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-Spam-Note: CRM114 invocation failed X-Spam-Note: SpamAssassin invocation failed Cc: linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Otherwise printch et al. and printk with earlyprintk and keep_bootcon becomes unfunctional when the clk framework disables all unused clocks. Signed-off-by: Uwe Kleine-König --- arch/arm/mach-imx/clk-imx35.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-imx/clk-imx35.c b/arch/arm/mach-imx/clk-imx35.c index c6422fb..83d614c 100644 --- a/arch/arm/mach-imx/clk-imx35.c +++ b/arch/arm/mach-imx/clk-imx35.c @@ -271,6 +271,10 @@ int __init mx35_clocks_init() */ clk_prepare_enable(clk[scc_gate]); + /* Assert that the UART clock keeps running if DEBUG_LL is in use */ + if (IS_ENABLED(CONFIG_DEBUG_IMX31_IMX35_UART)) + clk_prepare_enable(clk[uart1_gate]); + imx_print_silicon_rev("i.MX35", mx35_revision()); #ifdef CONFIG_MXC_USE_EPIT