aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2/clock_imx21.c
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2009-11-12 16:56:29 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2009-11-27 02:32:37 -0500
commit97adeda043d4c2e11dcaca64a7e5fd0c4574c3fe (patch)
tree6ffd371e9c0b8eea1a0f315e91a4dcb01d41fc07 /arch/arm/mach-mx2/clock_imx21.c
parent4998f1a30cf8e21c5bc0766fde4fa58e1adabd72 (diff)
IMX: don't disable the uart clock if DEBUG_LL uses it
Before the clock was left enabled only for DEBUG_LL_CONSOLE which requires an additional patch to exist at all. With this patch applied DEBUG_LL_CONSOLE depends on DEBUG_LL, so this doesn't break. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Cc: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx2/clock_imx21.c')
-rw-r--r--arch/arm/mach-mx2/clock_imx21.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-mx2/clock_imx21.c
index eede79855f4a..91901b5d56c2 100644
--- a/arch/arm/mach-mx2/clock_imx21.c
+++ b/arch/arm/mach-mx2/clock_imx21.c
@@ -1000,7 +1000,7 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href)
1000 clk_enable(&per_clk[0]); 1000 clk_enable(&per_clk[0]);
1001 clk_enable(&gpio_clk); 1001 clk_enable(&gpio_clk);
1002 1002
1003#ifdef CONFIG_DEBUG_LL_CONSOLE 1003#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)
1004 clk_enable(&uart_clk[0]); 1004 clk_enable(&uart_clk[0]);
1005#endif 1005#endif
1006 1006