IMX: don't disable the uart clock if DEBUG_LL uses it
Subsystems (3)
PATCH 1/1 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.
--- arch/arm/mach-mx2/clock_imx21.c | 2 +- arch/arm/mach-mx2/clock_imx27.c | 2 +- arch/arm/mach-mx3/clock-imx35.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-mx2/clock_imx21.c +1 -1
@@ -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
@@ -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
@@ -456,7 +456,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
Signature · 1 line
1.6.5.2
Sascha Hauer
maintainerPATCH 1/1 IMX: don't disable the uart clock if DEBUG_LL uses it
Quoted 17 lines · Uwe Kleine-K?nig
Before the clock was left enabled only for
DEBUG_LL_CONSOLEwhich requires an additional patch to exist at all. With this patch appliedDEBUG_LL_CONSOLEdepends onDEBUG_LL, so this doesn't break.Signed-off-by Uwe Kleine-K?nig <[email protected]>Cc Sascha Hauer <[email protected]>--- arch/arm/mach-mx2/clock_imx21.c | 2 +- arch/arm/mach-mx2/clock_imx27.c | 2 +- arch/arm/mach-mx3/clock-imx35.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)arch/arm/mach-mx2/clock_imx21.c +0
-0
arch/arm/mach-mx2/clock_imx21.c int __init mx21_clocks_init(unsigned long lref, unsigned long href) · line 1003
Quoted 5 lines
arch/arm/mach-mx2/clock_imx21.c +1
-1@@ -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 )
If Catalins/my early printk patch goes in, wouldn't it be better to do a
#if defined(CONFIG_EARLY_PRINTK) && !defined(CONFIG_DEBUG_ICEDCC)
here?
Signature · 4 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
PATCH 1/1 IMX: don't disable the uart clock if DEBUG_LL uses it
Hello Sascha,
Quoted 27 lines · Sascha Hauer
Quoted 17 lines · Uwe Kleine-K?nig
Before the clock was left enabled only for
DEBUG_LL_CONSOLEwhich requires an additional patch to exist at all. With this patch appliedDEBUG_LL_CONSOLEdepends onDEBUG_LL, so this doesn't break.Signed-off-by Uwe Kleine-K?nig <[email protected]>Cc Sascha Hauer <[email protected]>--- arch/arm/mach-mx2/clock_imx21.c | 2 +- arch/arm/mach-mx2/clock_imx27.c | 2 +- arch/arm/mach-mx3/clock-imx35.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)arch/arm/mach-mx2/clock_imx21.c +0
-0arch/arm/mach-mx2/clock_imx21.c int __init mx21_clocks_init(unsigned long lref, unsigned long href) · line 1003
Quoted 5 lines
arch/arm/mach-mx2/clock_imx21.c +1
-1@@ -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 )If Catalins/my early printk patch goes in, wouldn't it be better to do a
Quoted 3 lines
#if
defined(CONFIG_EARLY_PRINTK)&& !defined(CONFIG_DEBUG_ICEDCC)here?
No, after applying that patch[1] DEBUG_LL still works without EARLY_PRINTK and the latter depends on the former, so defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC) is the right thing.
Best regards
Uwe
[1] http://mid.gmane.org/20091105123448.27637.97119.stgit at pc1117.cambridge.arm.com
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |
PATCH 1/1 IMX: don't disable the uart clock if DEBUG_LL uses it
Hallo Sascha,
Quoted 28 lines · Sascha Hauer
Quoted 27 lines · Uwe Kleine-K?nig
Quoted 17 lines
Before the clock was left enabled only for
DEBUG_LL_CONSOLEwhich requires an additional patch to exist at all. With this patch appliedDEBUG_LL_CONSOLEdepends onDEBUG_LL, so this doesn't break.Signed-off-by Uwe Kleine-K?nig <[email protected]>Cc Sascha Hauer <[email protected]>--- arch/arm/mach-mx2/clock_imx21.c | 2 +- arch/arm/mach-mx2/clock_imx27.c | 2 +- arch/arm/mach-mx3/clock-imx35.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)arch/arm/mach-mx2/clock_imx21.c +0
-0arch/arm/mach-mx2/clock_imx21.c int __init mx21_clocks_init(unsigned long lref, unsigned long href) · line 1003
Quoted 5 lines
arch/arm/mach-mx2/clock_imx21.c +1
-1@@ -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 )If Catalins/my early printk patch goes in, wouldn't it be better to do a
Quoted 7 lines
Quoted 3 lines
#if
defined(CONFIG_EARLY_PRINTK)&& !defined(CONFIG_DEBUG_ICEDCC)here?
No, after applying that patch[1]
DEBUG_LLstill works withoutEARLY_PRINTKand the latter depends on the former, sodefined(CONFIG_DEBUG_LL)&& !defined(CONFIG_DEBUG_ICEDCC) is the right thing.
ping
Best regards
Uwe
Quoted 1 line
[1] http://mid.gmane.org/20091105123448.27637.97119.stgit at pc1117.cambridge.arm.com
Signature · 2 lines
Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ |