mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 19:56:18 +00:00
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>
This commit is contained in:
parent
4998f1a30c
commit
97adeda043
3 changed files with 3 additions and 3 deletions
|
@ -1000,7 +1000,7 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href)
|
||||||
clk_enable(&per_clk[0]);
|
clk_enable(&per_clk[0]);
|
||||||
clk_enable(&gpio_clk);
|
clk_enable(&gpio_clk);
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_LL_CONSOLE
|
#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)
|
||||||
clk_enable(&uart_clk[0]);
|
clk_enable(&uart_clk[0]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -751,7 +751,7 @@ int __init mx27_clocks_init(unsigned long fref)
|
||||||
clk_enable(&emi_clk);
|
clk_enable(&emi_clk);
|
||||||
clk_enable(&iim_clk);
|
clk_enable(&iim_clk);
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_LL_CONSOLE
|
#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)
|
||||||
clk_enable(&uart1_clk);
|
clk_enable(&uart1_clk);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -485,7 +485,7 @@ int __init mx35_clocks_init()
|
||||||
int i;
|
int i;
|
||||||
unsigned int ll = 0;
|
unsigned int ll = 0;
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_LL_CONSOLE
|
#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)
|
||||||
ll = (3 << 16);
|
ll = (3 << 16);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue