Patchwork [U-Boot,01/10] am33xx: Move V_OSCK/V_SCLK to <asm/arch-am33xx/clocks_am33xx.h>

login
register
mail settings
Submitter Tom Rini
Date Aug. 2, 2013, 8:26 p.m.
Message ID <1375475175-5073-2-git-send-email-trini@ti.com>
Download mbox | patch
Permalink /patch/264331/
State Rejected
Delegated to: Tom Rini
Headers show

Comments

Tom Rini - Aug. 2, 2013, 8:26 p.m.
This detail belongs in the arch header file, given how we are structured
today at least.

Signed-off-by: Tom Rini <trini@ti.com>
---
 arch/arm/include/asm/arch-am33xx/clocks_am33xx.h |    4 ++++
 include/configs/igep0033.h                       |    4 ----
 include/configs/pcm051.h                         |    4 ----
 include/configs/ti814x_evm.h                     |    4 ----
 4 files changed, 4 insertions(+), 12 deletions(-)
Heiko Schocher - Aug. 3, 2013, 4:41 a.m.
Hello Tom,

Am 02.08.2013 22:26, schrieb Tom Rini:
> This detail belongs in the arch header file, given how we are structured
> today at least.
>
> Signed-off-by: Tom Rini<trini@ti.com>
> ---
>   arch/arm/include/asm/arch-am33xx/clocks_am33xx.h |    4 ++++
>   include/configs/igep0033.h                       |    4 ----
>   include/configs/pcm051.h                         |    4 ----
>   include/configs/ti814x_evm.h                     |    4 ----
>   4 files changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> index 80e1899..3becb98 100644
> --- a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> +++ b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> @@ -11,6 +11,10 @@
>   #ifndef _CLOCKS_AM33XX_H_
>   #define _CLOCKS_AM33XX_H_
>
> +/* Clock Defines */
> +#define V_OSCK				24000000  /* Clock output from T2 */
> +#define V_SCLK				(V_OSCK)
> +

Hmm.. look at the chunk for the pcm051 board ...

>   /* MAIN PLL Fdll = 550 MHz, by default */
>   #ifndef CONFIG_SYS_MPUCLK
>   #define CONFIG_SYS_MPUCLK	550
[...]
> diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
> index 9b16c47..7073501 100644
> --- a/include/configs/pcm051.h
> +++ b/include/configs/pcm051.h
> @@ -102,10 +102,6 @@
>   		"fi;" \
>   	"fi;" \
>
> -/* Clock Defines */
> -#define V_OSCK				25000000  /* Clock output from T2 */
> -#define V_SCLK				(V_OSCK)
> -

... this defines 25000000 not 24000000 for V_OSCK ...

>   #define CONFIG_CMD_ECHO
>
>   /* max number of command args */
> diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
> index eac5ad0..ceee43b 100644
> --- a/include/configs/ti814x_evm.h
> +++ b/include/configs/ti814x_evm.h
> @@ -100,10 +100,6 @@
>   		"fi;" \
>   	"fi;" \
>
> -/* Clock Defines */
> -#define V_OSCK			24000000	/* Clock output from T2 */
> -#define V_SCLK			(V_OSCK>>  1)
> -
>   #define CONFIG_CMD_ECHO
>
>   /* max number of command args */

bye,
Heiko
Tom Rini - Aug. 5, 2013, 3:17 p.m.
On Sat, Aug 03, 2013 at 06:41:32AM +0200, Heiko Schocher wrote:
> Hello Tom,
> 
> Am 02.08.2013 22:26, schrieb Tom Rini:
> >This detail belongs in the arch header file, given how we are structured
> >today at least.
> >
> >Signed-off-by: Tom Rini<trini@ti.com>
> >---
> >  arch/arm/include/asm/arch-am33xx/clocks_am33xx.h |    4 ++++
> >  include/configs/igep0033.h                       |    4 ----
> >  include/configs/pcm051.h                         |    4 ----
> >  include/configs/ti814x_evm.h                     |    4 ----
> >  4 files changed, 4 insertions(+), 12 deletions(-)
> >
> >diff --git a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> >index 80e1899..3becb98 100644
> >--- a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> >+++ b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> >@@ -11,6 +11,10 @@
> >  #ifndef _CLOCKS_AM33XX_H_
> >  #define _CLOCKS_AM33XX_H_
> >
> >+/* Clock Defines */
> >+#define V_OSCK				24000000  /* Clock output from T2 */
> >+#define V_SCLK				(V_OSCK)
> >+
> 
> Hmm.. look at the chunk for the pcm051 board ...
> 
> >  /* MAIN PLL Fdll = 550 MHz, by default */
> >  #ifndef CONFIG_SYS_MPUCLK
> >  #define CONFIG_SYS_MPUCLK	550
> [...]
> >diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
> >index 9b16c47..7073501 100644
> >--- a/include/configs/pcm051.h
> >+++ b/include/configs/pcm051.h
> >@@ -102,10 +102,6 @@
> >  		"fi;" \
> >  	"fi;" \
> >
> >-/* Clock Defines */
> >-#define V_OSCK				25000000  /* Clock output from T2 */
> >-#define V_SCLK				(V_OSCK)
> >-
> 
> ... this defines 25000000 not 24000000 for V_OSCK ...

Oh hell, Lars, is that right and you guys have a different clock
frequency than the reference platforms?
Lars Poeschel - Aug. 5, 2013, 3:26 p.m.
Am Montag, 5. August 2013, 17:17:32 schrieb Tom Rini:
> On Sat, Aug 03, 2013 at 06:41:32AM +0200, Heiko Schocher wrote:
> > Hello Tom,
> > 
> > Am 02.08.2013 22:26, schrieb Tom Rini:
> > >This detail belongs in the arch header file, given how we are
> > >structured today at least.
> > >
> > >Signed-off-by: Tom Rini<trini@ti.com>
> > >---
> > >
> > >  arch/arm/include/asm/arch-am33xx/clocks_am33xx.h |    4 ++++
> > >  include/configs/igep0033.h                       |    4 ----
> > >  include/configs/pcm051.h                         |    4 ----
> > >  include/configs/ti814x_evm.h                     |    4 ----
> > >  4 files changed, 4 insertions(+), 12 deletions(-)
> > >
> > >diff --git a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> > >b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h index
> > >80e1899..3becb98 100644
> > >--- a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> > >+++ b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> > >@@ -11,6 +11,10 @@
> > >
> > >  #ifndef _CLOCKS_AM33XX_H_
> > >  #define _CLOCKS_AM33XX_H_
> > >
> > >+/* Clock Defines */
> > >+#define V_OSCK				24000000  /* Clock output from T2 */
> > >+#define V_SCLK				(V_OSCK)
> > >+
> > 
> > Hmm.. look at the chunk for the pcm051 board ...
> > 
> > >  /* MAIN PLL Fdll = 550 MHz, by default */
> > >  #ifndef CONFIG_SYS_MPUCLK
> > >  #define CONFIG_SYS_MPUCLK	550
> > 
> > [...]
> > 
> > >diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
> > >index 9b16c47..7073501 100644
> > >--- a/include/configs/pcm051.h
> > >+++ b/include/configs/pcm051.h
> > >@@ -102,10 +102,6 @@
> > >
> > >  		"fi;" \
> > >  	
> > >  	"fi;" \
> > >
> > >-/* Clock Defines */
> > >-#define V_OSCK				25000000  /* Clock output from T2 */
> > >-#define V_SCLK				(V_OSCK)
> > >-
> > 
> > ... this defines 25000000 not 24000000 for V_OSCK ...
> 
> Oh hell, Lars, is that right and you guys have a different clock
> frequency than the reference platforms?

Sorry, but yes, thats right. pcm051 is delivered with 25000000hz crystal. 
Main reason was to be able to boot from ethernet right from the ROM 
bootloader.

Lars
Tom Rini - Aug. 5, 2013, 3:40 p.m.
On Mon, Aug 05, 2013 at 05:26:56PM +0200, Lars Poeschel wrote:
> Am Montag, 5. August 2013, 17:17:32 schrieb Tom Rini:
> > On Sat, Aug 03, 2013 at 06:41:32AM +0200, Heiko Schocher wrote:
> > > Hello Tom,
> > > 
> > > Am 02.08.2013 22:26, schrieb Tom Rini:
> > > >This detail belongs in the arch header file, given how we are
> > > >structured today at least.
> > > >
> > > >Signed-off-by: Tom Rini<trini@ti.com>
> > > >---
> > > >
> > > >  arch/arm/include/asm/arch-am33xx/clocks_am33xx.h |    4 ++++
> > > >  include/configs/igep0033.h                       |    4 ----
> > > >  include/configs/pcm051.h                         |    4 ----
> > > >  include/configs/ti814x_evm.h                     |    4 ----
> > > >  4 files changed, 4 insertions(+), 12 deletions(-)
> > > >
> > > >diff --git a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> > > >b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h index
> > > >80e1899..3becb98 100644
> > > >--- a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> > > >+++ b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> > > >@@ -11,6 +11,10 @@
> > > >
> > > >  #ifndef _CLOCKS_AM33XX_H_
> > > >  #define _CLOCKS_AM33XX_H_
> > > >
> > > >+/* Clock Defines */
> > > >+#define V_OSCK				24000000  /* Clock output from T2 */
> > > >+#define V_SCLK				(V_OSCK)
> > > >+
> > > 
> > > Hmm.. look at the chunk for the pcm051 board ...
> > > 
> > > >  /* MAIN PLL Fdll = 550 MHz, by default */
> > > >  #ifndef CONFIG_SYS_MPUCLK
> > > >  #define CONFIG_SYS_MPUCLK	550
> > > 
> > > [...]
> > > 
> > > >diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
> > > >index 9b16c47..7073501 100644
> > > >--- a/include/configs/pcm051.h
> > > >+++ b/include/configs/pcm051.h
> > > >@@ -102,10 +102,6 @@
> > > >
> > > >  		"fi;" \
> > > >  	
> > > >  	"fi;" \
> > > >
> > > >-/* Clock Defines */
> > > >-#define V_OSCK				25000000  /* Clock output from T2 */
> > > >-#define V_SCLK				(V_OSCK)
> > > >-
> > > 
> > > ... this defines 25000000 not 24000000 for V_OSCK ...
> > 
> > Oh hell, Lars, is that right and you guys have a different clock
> > frequency than the reference platforms?
> 
> Sorry, but yes, thats right. pcm051 is delivered with 25000000hz crystal. 
> Main reason was to be able to boot from ethernet right from the ROM 
> bootloader.

Alright thanks, I'll go re-work that part of the series.
Tom Rini - Aug. 5, 2013, 3:53 p.m.
On Mon, Aug 05, 2013 at 11:40:29AM -0400, Tom Rini wrote:
> On Mon, Aug 05, 2013 at 05:26:56PM +0200, Lars Poeschel wrote:
> > Am Montag, 5. August 2013, 17:17:32 schrieb Tom Rini:
> > > On Sat, Aug 03, 2013 at 06:41:32AM +0200, Heiko Schocher wrote:
> > > > Hello Tom,
> > > > 
> > > > Am 02.08.2013 22:26, schrieb Tom Rini:
> > > > >This detail belongs in the arch header file, given how we are
> > > > >structured today at least.
> > > > >
> > > > >Signed-off-by: Tom Rini<trini@ti.com>
> > > > >---
> > > > >
> > > > >  arch/arm/include/asm/arch-am33xx/clocks_am33xx.h |    4 ++++
> > > > >  include/configs/igep0033.h                       |    4 ----
> > > > >  include/configs/pcm051.h                         |    4 ----
> > > > >  include/configs/ti814x_evm.h                     |    4 ----
> > > > >  4 files changed, 4 insertions(+), 12 deletions(-)
> > > > >
> > > > >diff --git a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> > > > >b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h index
> > > > >80e1899..3becb98 100644
> > > > >--- a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> > > > >+++ b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
> > > > >@@ -11,6 +11,10 @@
> > > > >
> > > > >  #ifndef _CLOCKS_AM33XX_H_
> > > > >  #define _CLOCKS_AM33XX_H_
> > > > >
> > > > >+/* Clock Defines */
> > > > >+#define V_OSCK				24000000  /* Clock output from T2 */
> > > > >+#define V_SCLK				(V_OSCK)
> > > > >+
> > > > 
> > > > Hmm.. look at the chunk for the pcm051 board ...
> > > > 
> > > > >  /* MAIN PLL Fdll = 550 MHz, by default */
> > > > >  #ifndef CONFIG_SYS_MPUCLK
> > > > >  #define CONFIG_SYS_MPUCLK	550
> > > > 
> > > > [...]
> > > > 
> > > > >diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
> > > > >index 9b16c47..7073501 100644
> > > > >--- a/include/configs/pcm051.h
> > > > >+++ b/include/configs/pcm051.h
> > > > >@@ -102,10 +102,6 @@
> > > > >
> > > > >  		"fi;" \
> > > > >  	
> > > > >  	"fi;" \
> > > > >
> > > > >-/* Clock Defines */
> > > > >-#define V_OSCK				25000000  /* Clock output from T2 */
> > > > >-#define V_SCLK				(V_OSCK)
> > > > >-
> > > > 
> > > > ... this defines 25000000 not 24000000 for V_OSCK ...
> > > 
> > > Oh hell, Lars, is that right and you guys have a different clock
> > > frequency than the reference platforms?
> > 
> > Sorry, but yes, thats right. pcm051 is delivered with 25000000hz crystal. 
> > Main reason was to be able to boot from ethernet right from the ROM 
> > bootloader.
> 
> Alright thanks, I'll go re-work that part of the series.

Dropped from v2.

Patch

diff --git a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
index 80e1899..3becb98 100644
--- a/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
+++ b/arch/arm/include/asm/arch-am33xx/clocks_am33xx.h
@@ -11,6 +11,10 @@ 
 #ifndef _CLOCKS_AM33XX_H_
 #define _CLOCKS_AM33XX_H_
 
+/* Clock Defines */
+#define V_OSCK				24000000  /* Clock output from T2 */
+#define V_SCLK				(V_OSCK)
+
 /* MAIN PLL Fdll = 550 MHz, by default */
 #ifndef CONFIG_SYS_MPUCLK
 #define CONFIG_SYS_MPUCLK	550
diff --git a/include/configs/igep0033.h b/include/configs/igep0033.h
index 12f28f8..28c7ae9 100644
--- a/include/configs/igep0033.h
+++ b/include/configs/igep0033.h
@@ -23,10 +23,6 @@ 
 #define MACH_TYPE_IGEP0033		4521	/* Until the next sync */
 #define CONFIG_MACH_TYPE		MACH_TYPE_IGEP0033
 
-/* Clock defines */
-#define V_OSCK				24000000  /* Clock output from T2 */
-#define V_SCLK				(V_OSCK)
-
 /* DMA defines */
 #define CONFIG_DMA_COHERENT
 #define CONFIG_DMA_COHERENT_SIZE	(1 << 20)
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index 9b16c47..7073501 100644
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -102,10 +102,6 @@ 
 		"fi;" \
 	"fi;" \
 
-/* Clock Defines */
-#define V_OSCK				25000000  /* Clock output from T2 */
-#define V_SCLK				(V_OSCK)
-
 #define CONFIG_CMD_ECHO
 
 /* max number of command args */
diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h
index eac5ad0..ceee43b 100644
--- a/include/configs/ti814x_evm.h
+++ b/include/configs/ti814x_evm.h
@@ -100,10 +100,6 @@ 
 		"fi;" \
 	"fi;" \
 
-/* Clock Defines */
-#define V_OSCK			24000000	/* Clock output from T2 */
-#define V_SCLK			(V_OSCK >> 1)
-
 #define CONFIG_CMD_ECHO
 
 /* max number of command args */