Skip to contentSkip to conversation

ppc/85xx: Fix LCRR_CLKDIV defines

PATCH New Kumar Gala 3 participants 5 messages Sep 16, 2009

lore
Share & tools
lore

Kumar Gala

author
#0 lore raw

PATCH 1/1 ppc/85xx: Fix LCRR_CLKDIV defines

For some reason the CLKDIV field varies between SoC in how it interprets the bit values.

All 83xx and early (e500v1) PQ3 devices support:
clk/2: CLKDIV = 2
clk/4: CLKDIV = 4
clk/8: CLKDIV = 8

Newer PQ3 (e500v2) and MPC86xx support:
clk/4: CLKDIV = 2
clk/8: CLKDIV = 4
clk/16: CLKDIV = 8

Ensure that the MPC86xx and MPC85xx still get the same behavior and make the the defines reflect their logical view (not the value of the field).

---
 include/asm-ppc/fsl_lbc.h     |    8 ++++++++
 include/configs/XPEDITE5170.h |    2 +-
 include/configs/XPEDITE5200.h |    2 +-
 include/configs/XPEDITE5370.h |    2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)
include/asm-ppc/fsl_lbc.h +8 -0
index a28082e..08d31e1 100644
@@ -311,9 +311,17 @@
  */
 #define LCRR_CLKDIV			0x0000001F
 #define LCRR_CLKDIV_SHIFT		0
+#if defined(CONFIG_MPC83xx) || defined (CONFIG_MPC8540) || \
+    defined(CONFIG_MPC8541) || defined (CONFIG_MPC8555) || \
+    defined(CONFIG_MPC8560)
 #define LCRR_CLKDIV_2			0x00000002
 #define LCRR_CLKDIV_4			0x00000004
 #define LCRR_CLKDIV_8			0x00000008
+#else
+#define LCRR_CLKDIV_4			0x00000002
+#define LCRR_CLKDIV_8			0x00000004
+#define LCRR_CLKDIV_16			0x00000008
+#endif
 
 /* LTEDR - Transfer Error Check Disable Register
  */
include/configs/XPEDITE5170.h +1 -1
index 242466a..30642cd 100644
@@ -122,7 +122,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
  * 0xf800_0000	0xffff_ffff	NOR Flash 1		128M non-cacheable
  */
 
-#define CONFIG_SYS_LBC_LCRR		(LCRR_CLKDIV_2 | LCRR_EADC_3)
+#define CONFIG_SYS_LBC_LCRR		(LCRR_CLKDIV_4 | LCRR_EADC_3)
 
 /*
  * NAND flash configuration
include/configs/XPEDITE5200.h +1 -1
index deda208..d79231b 100644
@@ -103,7 +103,7 @@
  * 0xfc00_0000	0xffff_ffff	NOR Flash 1		64M non-cacheable
  */
 
-#define CONFIG_SYS_LBC_LCRR	(LCRR_CLKDIV_4 | LCRR_EADC_3)
+#define CONFIG_SYS_LBC_LCRR	(LCRR_CLKDIV_8 | LCRR_EADC_3)
 
 /*
  * NAND flash configuration
include/configs/XPEDITE5370.h +1 -1
index 3c58ebe..65e1afd 100644
@@ -116,7 +116,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
  * 0xf800_0000	0xffff_ffff	NOR Flash 1		128M non-cacheable
  */
 
-#define CONFIG_SYS_LBC_LCRR	(LCRR_CLKDIV_4 | LCRR_EADC_3)
+#define CONFIG_SYS_LBC_LCRR	(LCRR_CLKDIV_8 | LCRR_EADC_3)
 
 /*
  * NAND flash configuration
Signature · 1 line
1.6.0.6
#1 lore raw

PATCH 1/1 ppc/85xx: Fix LCRR_CLKDIV defines

Quoted 13 lines · Kumar Gala

For some reason the CLKDIV field varies between SoC in how it interprets the bit values.

All 83xx and early (e500v1) PQ3 devices support:
clk/2: CLKDIV = 2
clk/4: CLKDIV = 4
clk/8: CLKDIV = 8

Newer PQ3 (e500v2) and MPC86xx support:
clk/4: CLKDIV = 2
clk/8: CLKDIV = 4
clk/16: CLKDIV = 8

Quoted 4 lines

Ensure that the MPC86xx and MPC85xx still get the same behavior and make the the defines reflect their logical view (not the value of the field).

Thanks

author
#2 lore raw

PATCH 1/1 ppc/85xx: Fix LCRR_CLKDIV defines

Quoted 15 lines · Peter Tyser
Quoted 14 lines · Kumar Gala

For some reason the CLKDIV field varies between SoC in how it interprets
the bit values.

All 83xx and early (e500v1) PQ3 devices support:
clk/2: CLKDIV = 2
clk/4: CLKDIV = 4
clk/8: CLKDIV = 8

Newer PQ3 (e500v2) and MPC86xx support:
clk/4: CLKDIV = 2
clk/8: CLKDIV = 4
clk/16: CLKDIV = 8

Quoted 8 lines
Quoted 6 lines

Ensure that the MPC86xx and MPC85xx still get the same behavior and make
the the defines reflect their logical view (not the value of the field).

Peter,

I did notice that we dont actually set LCRR anywhere :)

- k

#3 lore raw

PATCH 1/1 ppc/85xx: Fix LCRR_CLKDIV defines

Quoted 22 lines · Kumar Gala
Quoted 20 lines · Peter Tyser
Quoted 19 lines · Kumar Gala

For some reason the CLKDIV field varies between SoC in how it interprets
the bit values.

All 83xx and early (e500v1) PQ3 devices support:
clk/2: CLKDIV = 2
clk/4: CLKDIV = 4
clk/8: CLKDIV = 8

Newer PQ3 (e500v2) and MPC86xx support:
clk/4: CLKDIV = 2
clk/8: CLKDIV = 4
clk/16: CLKDIV = 8

Ensure that the MPC86xx and MPC85xx still get the same behavior and make
the the defines reflect their logical view (not the value of the field).

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Peter,

I did notice that we dont actually set LCRR anywhere :)

Lol, that's great:) CONFIG_SYS_LBC_LCRR does affect the value of sysinfo.freqLocalBus and thus gd->lbc_clk. And sysinfo.freqLocalBus is used to print the LBC frequency on bootup which added to the delusion that I was speeding it up:)

A few other boards seem to define CONFIG_SYS_LBC_LCRR, but don't implement a board-specific modification of the LBCC register, so they should have the same "bug".

I'll take a closer look tomorrow.

Peter

#4 lore raw

PATCH 1/1 ppc/85xx: Fix LCRR_CLKDIV defines

In reply to Peter Tyser

Peter Tyser a ?crit :

Quoted 6 lines · Kumar Gala
Quoted 5 lines

For some reason the CLKDIV field varies between SoC in how it interprets the bit values.

[snip]

Quoted 5 lines
Quoted 5 lines

Ensure that the MPC86xx and MPC85xx still get the same behavior and make the the defines reflect their logical view (not the value of the field).

Nit picking:
I just noticed that there is a duplicate "the" here. Also I prefer "behaviour" but this is a US/UK issue :-( <troll>Why can't Americans write English ;-) ?</troll>