mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] OMAP4: Use default clock source for mcbsp
@ 2013-05-28 11:51 Jan Weitzel
  2013-06-04 14:53 ` Sascha Hauer
  2013-06-08 13:13 ` Sascha Hauer
  0 siblings, 2 replies; 8+ messages in thread
From: Jan Weitzel @ 2013-05-28 11:51 UTC (permalink / raw)
  To: barebox

In omap4_enable_all_clocks we not only enable the mcbsp clocks, but also
change the source from ABE_24M_FCLK to 24M_FCLK. Revert this and default
to the reset state.

Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
---
 arch/arm/mach-omap/omap4_clock.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap/omap4_clock.c b/arch/arm/mach-omap/omap4_clock.c
index 0621fd3..889d1f9 100644
--- a/arch/arm/mach-omap/omap4_clock.c
+++ b/arch/arm/mach-omap/omap4_clock.c
@@ -253,9 +253,9 @@ void omap4_enable_all_clocks(void)
 	sr32(CM1_ABE_PDM_CLKCTRL, 0, 32, 0x2);
 	sr32(CM1_ABE_DMIC_CLKCTRL, 0, 32, 0x2);
 	sr32(CM1_ABE_MCASP_CLKCTRL, 0, 32, 0x2);
-	sr32(CM1_ABE_MCBSP1_CLKCTRL, 0, 32, 0x08000002);
-	sr32(CM1_ABE_MCBSP2_CLKCTRL, 0, 32, 0x08000002);
-	sr32(CM1_ABE_MCBSP3_CLKCTRL, 0, 32, 0x08000002);
+	sr32(CM1_ABE_MCBSP1_CLKCTRL, 0, 32, 0x2);
+	sr32(CM1_ABE_MCBSP2_CLKCTRL, 0, 32, 0x2);
+	sr32(CM1_ABE_MCBSP3_CLKCTRL, 0, 32, 0x2);
 	sr32(CM1_ABE_SLIMBUS_CLKCTRL, 0, 32, 0xf02);
 	sr32(CM1_ABE_TIMER5_CLKCTRL, 0, 32, 0x2);
 	sr32(CM1_ABE_TIMER6_CLKCTRL, 0, 32, 0x2);
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] OMAP4: Use default clock source for mcbsp
  2013-05-28 11:51 [PATCH] OMAP4: Use default clock source for mcbsp Jan Weitzel
@ 2013-06-04 14:53 ` Sascha Hauer
  2013-06-05 10:56   ` Jan Weitzel
  2013-06-08 13:13 ` Sascha Hauer
  1 sibling, 1 reply; 8+ messages in thread
From: Sascha Hauer @ 2013-06-04 14:53 UTC (permalink / raw)
  To: Jan Weitzel; +Cc: barebox

Hi Jan,

On Tue, May 28, 2013 at 01:51:40PM +0200, Jan Weitzel wrote:
> In omap4_enable_all_clocks we not only enable the mcbsp clocks, but also
> change the source from ABE_24M_FCLK to 24M_FCLK. Revert this and default
> to the reset state.

Can you add a description why this is necessary?

Sascha

> 
> Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
> ---
>  arch/arm/mach-omap/omap4_clock.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-omap/omap4_clock.c b/arch/arm/mach-omap/omap4_clock.c
> index 0621fd3..889d1f9 100644
> --- a/arch/arm/mach-omap/omap4_clock.c
> +++ b/arch/arm/mach-omap/omap4_clock.c
> @@ -253,9 +253,9 @@ void omap4_enable_all_clocks(void)
>  	sr32(CM1_ABE_PDM_CLKCTRL, 0, 32, 0x2);
>  	sr32(CM1_ABE_DMIC_CLKCTRL, 0, 32, 0x2);
>  	sr32(CM1_ABE_MCASP_CLKCTRL, 0, 32, 0x2);
> -	sr32(CM1_ABE_MCBSP1_CLKCTRL, 0, 32, 0x08000002);
> -	sr32(CM1_ABE_MCBSP2_CLKCTRL, 0, 32, 0x08000002);
> -	sr32(CM1_ABE_MCBSP3_CLKCTRL, 0, 32, 0x08000002);
> +	sr32(CM1_ABE_MCBSP1_CLKCTRL, 0, 32, 0x2);
> +	sr32(CM1_ABE_MCBSP2_CLKCTRL, 0, 32, 0x2);
> +	sr32(CM1_ABE_MCBSP3_CLKCTRL, 0, 32, 0x2);
>  	sr32(CM1_ABE_SLIMBUS_CLKCTRL, 0, 32, 0xf02);
>  	sr32(CM1_ABE_TIMER5_CLKCTRL, 0, 32, 0x2);
>  	sr32(CM1_ABE_TIMER6_CLKCTRL, 0, 32, 0x2);
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] OMAP4: Use default clock source for mcbsp
  2013-06-04 14:53 ` Sascha Hauer
@ 2013-06-05 10:56   ` Jan Weitzel
  2013-06-05 20:50     ` vj
  0 siblings, 1 reply; 8+ messages in thread
From: Jan Weitzel @ 2013-06-05 10:56 UTC (permalink / raw)
  To: Sascha Hauer, vicencb; +Cc: barebox

Am Dienstag, den 04.06.2013, 16:53 +0200 schrieb Sascha Hauer:
> Hi Jan,
> 
> On Tue, May 28, 2013 at 01:51:40PM +0200, Jan Weitzel wrote:
> > In omap4_enable_all_clocks we not only enable the mcbsp clocks, but also
> > change the source from ABE_24M_FCLK to 24M_FCLK. Revert this and default
> > to the reset state.
> 
> Can you add a description why this is necessary?
We had some trouble because the kernel takes the default clock sources
from the registers. There seams to be no reason to change them in the
boot loader. Is clean up a good enough answer?
Could someone test it on pandaboard and ArchosG9? I didn't have
(working) hardware here.

Jan
> 
> Sascha
> 
> > 
> > Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
> > ---
> >  arch/arm/mach-omap/omap4_clock.c |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/arch/arm/mach-omap/omap4_clock.c b/arch/arm/mach-omap/omap4_clock.c
> > index 0621fd3..889d1f9 100644
> > --- a/arch/arm/mach-omap/omap4_clock.c
> > +++ b/arch/arm/mach-omap/omap4_clock.c
> > @@ -253,9 +253,9 @@ void omap4_enable_all_clocks(void)
> >  	sr32(CM1_ABE_PDM_CLKCTRL, 0, 32, 0x2);
> >  	sr32(CM1_ABE_DMIC_CLKCTRL, 0, 32, 0x2);
> >  	sr32(CM1_ABE_MCASP_CLKCTRL, 0, 32, 0x2);
> > -	sr32(CM1_ABE_MCBSP1_CLKCTRL, 0, 32, 0x08000002);
> > -	sr32(CM1_ABE_MCBSP2_CLKCTRL, 0, 32, 0x08000002);
> > -	sr32(CM1_ABE_MCBSP3_CLKCTRL, 0, 32, 0x08000002);
> > +	sr32(CM1_ABE_MCBSP1_CLKCTRL, 0, 32, 0x2);
> > +	sr32(CM1_ABE_MCBSP2_CLKCTRL, 0, 32, 0x2);
> > +	sr32(CM1_ABE_MCBSP3_CLKCTRL, 0, 32, 0x2);
> >  	sr32(CM1_ABE_SLIMBUS_CLKCTRL, 0, 32, 0xf02);
> >  	sr32(CM1_ABE_TIMER5_CLKCTRL, 0, 32, 0x2);
> >  	sr32(CM1_ABE_TIMER6_CLKCTRL, 0, 32, 0x2);
> > -- 
> > 1.7.0.4
> > 
> > 
> > _______________________________________________
> > barebox mailing list
> > barebox@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/barebox
> > 
> 



_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] OMAP4: Use default clock source for mcbsp
  2013-06-05 10:56   ` Jan Weitzel
@ 2013-06-05 20:50     ` vj
  0 siblings, 0 replies; 8+ messages in thread
From: vj @ 2013-06-05 20:50 UTC (permalink / raw)
  To: J.Weitzel; +Cc: barebox

On Wed, Jun 5, 2013 at 12:56 PM, Jan Weitzel <J.Weitzel@phytec.de> wrote:
> Am Dienstag, den 04.06.2013, 16:53 +0200 schrieb Sascha Hauer:
>> Hi Jan,
>>
>> On Tue, May 28, 2013 at 01:51:40PM +0200, Jan Weitzel wrote:
>> > In omap4_enable_all_clocks we not only enable the mcbsp clocks, but also
>> > change the source from ABE_24M_FCLK to 24M_FCLK. Revert this and default
>> > to the reset state.
>>
>> Can you add a description why this is necessary?
> We had some trouble because the kernel takes the default clock sources
> from the registers. There seams to be no reason to change them in the
> boot loader. Is clean up a good enough answer?
> Could someone test it on pandaboard and ArchosG9? I didn't have
> (working) hardware here.
>
I've seen no regressions on ArchosG9.
Regards,
  Vicente.

> Jan
>>
>> Sascha
>>
>> >
>> > Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
>> > ---
>> >  arch/arm/mach-omap/omap4_clock.c |    6 +++---
>> >  1 files changed, 3 insertions(+), 3 deletions(-)
>> >
>> > diff --git a/arch/arm/mach-omap/omap4_clock.c b/arch/arm/mach-omap/omap4_clock.c
>> > index 0621fd3..889d1f9 100644
>> > --- a/arch/arm/mach-omap/omap4_clock.c
>> > +++ b/arch/arm/mach-omap/omap4_clock.c
>> > @@ -253,9 +253,9 @@ void omap4_enable_all_clocks(void)
>> >     sr32(CM1_ABE_PDM_CLKCTRL, 0, 32, 0x2);
>> >     sr32(CM1_ABE_DMIC_CLKCTRL, 0, 32, 0x2);
>> >     sr32(CM1_ABE_MCASP_CLKCTRL, 0, 32, 0x2);
>> > -   sr32(CM1_ABE_MCBSP1_CLKCTRL, 0, 32, 0x08000002);
>> > -   sr32(CM1_ABE_MCBSP2_CLKCTRL, 0, 32, 0x08000002);
>> > -   sr32(CM1_ABE_MCBSP3_CLKCTRL, 0, 32, 0x08000002);
>> > +   sr32(CM1_ABE_MCBSP1_CLKCTRL, 0, 32, 0x2);
>> > +   sr32(CM1_ABE_MCBSP2_CLKCTRL, 0, 32, 0x2);
>> > +   sr32(CM1_ABE_MCBSP3_CLKCTRL, 0, 32, 0x2);
>> >     sr32(CM1_ABE_SLIMBUS_CLKCTRL, 0, 32, 0xf02);
>> >     sr32(CM1_ABE_TIMER5_CLKCTRL, 0, 32, 0x2);
>> >     sr32(CM1_ABE_TIMER6_CLKCTRL, 0, 32, 0x2);
>> > --
>> > 1.7.0.4
>> >
>> >
>> > _______________________________________________
>> > barebox mailing list
>> > barebox@lists.infradead.org
>> > http://lists.infradead.org/mailman/listinfo/barebox
>> >
>>
>
>

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] OMAP4: Use default clock source for mcbsp
  2013-05-28 11:51 [PATCH] OMAP4: Use default clock source for mcbsp Jan Weitzel
  2013-06-04 14:53 ` Sascha Hauer
@ 2013-06-08 13:13 ` Sascha Hauer
  2013-06-12  7:14   ` Jan Weitzel
  1 sibling, 1 reply; 8+ messages in thread
From: Sascha Hauer @ 2013-06-08 13:13 UTC (permalink / raw)
  To: Jan Weitzel; +Cc: barebox

On Tue, May 28, 2013 at 01:51:40PM +0200, Jan Weitzel wrote:
> In omap4_enable_all_clocks we not only enable the mcbsp clocks, but also
> change the source from ABE_24M_FCLK to 24M_FCLK. Revert this and default
> to the reset state.
> 
> Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>

Applied, thanks

Sascha

> ---
>  arch/arm/mach-omap/omap4_clock.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-omap/omap4_clock.c b/arch/arm/mach-omap/omap4_clock.c
> index 0621fd3..889d1f9 100644
> --- a/arch/arm/mach-omap/omap4_clock.c
> +++ b/arch/arm/mach-omap/omap4_clock.c
> @@ -253,9 +253,9 @@ void omap4_enable_all_clocks(void)
>  	sr32(CM1_ABE_PDM_CLKCTRL, 0, 32, 0x2);
>  	sr32(CM1_ABE_DMIC_CLKCTRL, 0, 32, 0x2);
>  	sr32(CM1_ABE_MCASP_CLKCTRL, 0, 32, 0x2);
> -	sr32(CM1_ABE_MCBSP1_CLKCTRL, 0, 32, 0x08000002);
> -	sr32(CM1_ABE_MCBSP2_CLKCTRL, 0, 32, 0x08000002);
> -	sr32(CM1_ABE_MCBSP3_CLKCTRL, 0, 32, 0x08000002);
> +	sr32(CM1_ABE_MCBSP1_CLKCTRL, 0, 32, 0x2);
> +	sr32(CM1_ABE_MCBSP2_CLKCTRL, 0, 32, 0x2);
> +	sr32(CM1_ABE_MCBSP3_CLKCTRL, 0, 32, 0x2);
>  	sr32(CM1_ABE_SLIMBUS_CLKCTRL, 0, 32, 0xf02);
>  	sr32(CM1_ABE_TIMER5_CLKCTRL, 0, 32, 0x2);
>  	sr32(CM1_ABE_TIMER6_CLKCTRL, 0, 32, 0x2);
> -- 
> 1.7.0.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] OMAP4: Use default clock source for mcbsp
  2013-06-08 13:13 ` Sascha Hauer
@ 2013-06-12  7:14   ` Jan Weitzel
  2013-06-17  7:14     ` Sascha Hauer
  0 siblings, 1 reply; 8+ messages in thread
From: Jan Weitzel @ 2013-06-12  7:14 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

Am Samstag, den 08.06.2013, 15:13 +0200 schrieb Sascha Hauer:
> On Tue, May 28, 2013 at 01:51:40PM +0200, Jan Weitzel wrote:
> > In omap4_enable_all_clocks we not only enable the mcbsp clocks, but also
> > change the source from ABE_24M_FCLK to 24M_FCLK. Revert this and default
> > to the reset state.
> > 
> > Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
> 
> Applied, thanks
Didn't find it on next or master branch. Is rework needed?

Jan

> Sascha
> 
> > ---
> >  arch/arm/mach-omap/omap4_clock.c |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/arch/arm/mach-omap/omap4_clock.c b/arch/arm/mach-omap/omap4_clock.c
> > index 0621fd3..889d1f9 100644
> > --- a/arch/arm/mach-omap/omap4_clock.c
> > +++ b/arch/arm/mach-omap/omap4_clock.c
> > @@ -253,9 +253,9 @@ void omap4_enable_all_clocks(void)
> >  	sr32(CM1_ABE_PDM_CLKCTRL, 0, 32, 0x2);
> >  	sr32(CM1_ABE_DMIC_CLKCTRL, 0, 32, 0x2);
> >  	sr32(CM1_ABE_MCASP_CLKCTRL, 0, 32, 0x2);
> > -	sr32(CM1_ABE_MCBSP1_CLKCTRL, 0, 32, 0x08000002);
> > -	sr32(CM1_ABE_MCBSP2_CLKCTRL, 0, 32, 0x08000002);
> > -	sr32(CM1_ABE_MCBSP3_CLKCTRL, 0, 32, 0x08000002);
> > +	sr32(CM1_ABE_MCBSP1_CLKCTRL, 0, 32, 0x2);
> > +	sr32(CM1_ABE_MCBSP2_CLKCTRL, 0, 32, 0x2);
> > +	sr32(CM1_ABE_MCBSP3_CLKCTRL, 0, 32, 0x2);
> >  	sr32(CM1_ABE_SLIMBUS_CLKCTRL, 0, 32, 0xf02);
> >  	sr32(CM1_ABE_TIMER5_CLKCTRL, 0, 32, 0x2);
> >  	sr32(CM1_ABE_TIMER6_CLKCTRL, 0, 32, 0x2);
> > -- 
> > 1.7.0.4
> > 
> > 
> > _______________________________________________
> > barebox mailing list
> > barebox@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/barebox
> > 
> 



_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] OMAP4: Use default clock source for mcbsp
  2013-06-12  7:14   ` Jan Weitzel
@ 2013-06-17  7:14     ` Sascha Hauer
  2013-06-17  8:00       ` Jan Weitzel
  0 siblings, 1 reply; 8+ messages in thread
From: Sascha Hauer @ 2013-06-17  7:14 UTC (permalink / raw)
  To: Jan Weitzel; +Cc: barebox

On Wed, Jun 12, 2013 at 09:14:39AM +0200, Jan Weitzel wrote:
> Am Samstag, den 08.06.2013, 15:13 +0200 schrieb Sascha Hauer:
> > On Tue, May 28, 2013 at 01:51:40PM +0200, Jan Weitzel wrote:
> > > In omap4_enable_all_clocks we not only enable the mcbsp clocks, but also
> > > change the source from ABE_24M_FCLK to 24M_FCLK. Revert this and default
> > > to the reset state.
> > > 
> > > Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
> > 
> > Applied, thanks
> Didn't find it on next or master branch. Is rework needed?

Look again, it should be there now.

Sascha

-- 
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 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] OMAP4: Use default clock source for mcbsp
  2013-06-17  7:14     ` Sascha Hauer
@ 2013-06-17  8:00       ` Jan Weitzel
  0 siblings, 0 replies; 8+ messages in thread
From: Jan Weitzel @ 2013-06-17  8:00 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: barebox

Am Montag, den 17.06.2013, 09:14 +0200 schrieb Sascha Hauer:
> On Wed, Jun 12, 2013 at 09:14:39AM +0200, Jan Weitzel wrote:
> > Am Samstag, den 08.06.2013, 15:13 +0200 schrieb Sascha Hauer:
> > > On Tue, May 28, 2013 at 01:51:40PM +0200, Jan Weitzel wrote:
> > > > In omap4_enable_all_clocks we not only enable the mcbsp clocks, but also
> > > > change the source from ABE_24M_FCLK to 24M_FCLK. Revert this and default
> > > > to the reset state.
> > > > 
> > > > Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
> > > 
> > > Applied, thanks
> > Didn't find it on next or master branch. Is rework needed?
> 
> Look again, it should be there now.
Thanks :)
Jan

> 
> Sascha
> 



_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-06-17  8:00 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-28 11:51 [PATCH] OMAP4: Use default clock source for mcbsp Jan Weitzel
2013-06-04 14:53 ` Sascha Hauer
2013-06-05 10:56   ` Jan Weitzel
2013-06-05 20:50     ` vj
2013-06-08 13:13 ` Sascha Hauer
2013-06-12  7:14   ` Jan Weitzel
2013-06-17  7:14     ` Sascha Hauer
2013-06-17  8:00       ` Jan Weitzel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox