Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97adeda0 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Sascha Hauer
Browse files

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 4998f1a3

arch/arm/mach-mx2/clock_imx21.c

+1 −1
Original line number Diff line number Diff line
@@ -1000,7 +1000,7 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href) 
	clk_enable(&per_clk[0]);

	clk_enable(&gpio_clk);



#ifdef CONFIG_DEBUG_LL_CONSOLE

#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)

	clk_enable(&uart_clk[0]);

#endif

arch/arm/mach-mx2/clock_imx27.c

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ int __init mx27_clocks_init(unsigned long fref) 
	clk_enable(&emi_clk);

	clk_enable(&iim_clk);



#ifdef CONFIG_DEBUG_LL_CONSOLE

#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)

	clk_enable(&uart1_clk);

#endif

arch/arm/mach-mx3/clock-imx35.c

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ int __init mx35_clocks_init() 
	int i;

	unsigned int ll = 0;



#ifdef CONFIG_DEBUG_LL_CONSOLE

#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC)

	ll = (3 << 16);

#endif