* [PATCH] [ARM] IMX: don't disable the uart clock if DEBUG_LL uses it
@ 2009-11-12 21:56 Uwe Kleine-König
2009-11-13 7:52 ` Sascha Hauer
0 siblings, 1 reply; 4+ messages in thread
From: Uwe Kleine-König @ 2009-11-12 21:56 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
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(-)
diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-mx2/clock_imx21.c
index eede798..91901b5 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)
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
diff --git a/arch/arm/mach-mx2/clock_imx27.c b/arch/arm/mach-mx2/clock_imx27.c
index ff5e332..f79af9b 100644
--- a/arch/arm/mach-mx2/clock_imx27.c
+++ b/arch/arm/mach-mx2/clock_imx27.c
@@ -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
diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c
index c595260..f221b42 100644
--- a/arch/arm/mach-mx3/clock-imx35.c
+++ b/arch/arm/mach-mx3/clock-imx35.c
@@ -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
--
1.6.5.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] [ARM] IMX: don't disable the uart clock if DEBUG_LL uses it
2009-11-12 21:56 [PATCH] [ARM] IMX: don't disable the uart clock if DEBUG_LL uses it Uwe Kleine-König
@ 2009-11-13 7:52 ` Sascha Hauer
2009-11-13 9:40 ` Uwe Kleine-König
0 siblings, 1 reply; 4+ messages in thread
From: Sascha Hauer @ 2009-11-13 7:52 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Nov 12, 2009 at 10:56:29PM +0100, Uwe Kleine-K?nig wrote:
> 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>
> ---
> 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(-)
>
> diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-mx2/clock_imx21.c
> index eede798..91901b5 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)
> 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?
--
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 |
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] [ARM] IMX: don't disable the uart clock if DEBUG_LL uses it
2009-11-13 7:52 ` Sascha Hauer
@ 2009-11-13 9:40 ` Uwe Kleine-König
2009-11-26 10:18 ` Uwe Kleine-König
0 siblings, 1 reply; 4+ messages in thread
From: Uwe Kleine-König @ 2009-11-13 9:40 UTC (permalink / raw)
To: linux-arm-kernel
Hello Sascha,
On Fri, Nov 13, 2009 at 08:52:10AM +0100, Sascha Hauer wrote:
> On Thu, Nov 12, 2009 at 10:56:29PM +0100, Uwe Kleine-K?nig wrote:
> > 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>
> > ---
> > 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(-)
> >
> > diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-mx2/clock_imx21.c
> > index eede798..91901b5 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)
> > 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?
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
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] [ARM] IMX: don't disable the uart clock if DEBUG_LL uses it
2009-11-13 9:40 ` Uwe Kleine-König
@ 2009-11-26 10:18 ` Uwe Kleine-König
0 siblings, 0 replies; 4+ messages in thread
From: Uwe Kleine-König @ 2009-11-26 10:18 UTC (permalink / raw)
To: linux-arm-kernel
Hallo Sascha,
> On Fri, Nov 13, 2009 at 08:52:10AM +0100, Sascha Hauer wrote:
> > On Thu, Nov 12, 2009 at 10:56:29PM +0100, Uwe Kleine-K?nig wrote:
> > > 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>
> > > ---
> > > 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(-)
> > >
> > > diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-mx2/clock_imx21.c
> > > index eede798..91901b5 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)
> > > 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?
> 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.
ping
Best regards
Uwe
> [1] http://mid.gmane.org/20091105123448.27637.97119.stgit at pc1117.cambridge.arm.com
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-11-26 10:18 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-12 21:56 [PATCH] [ARM] IMX: don't disable the uart clock if DEBUG_LL uses it Uwe Kleine-König
2009-11-13 7:52 ` Sascha Hauer
2009-11-13 9:40 ` Uwe Kleine-König
2009-11-26 10:18 ` Uwe Kleine-König
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).