Skip to contentSkip to conversation

Change IPS freq to 66MHz

PATCH New John Rigby 3 participants 5 messages Jan 30, 2008 – Feb 7, 2008

lore
Share & tools
lore

John Rigby

author
#0 lore raw

PATCH 1/1 Change IPS freq to 66MHz

Recommended frequency is 66MHz
Change divider from 4 to 3.

Signed-off-by John Rigby <[email protected]>
---
 include/mpc512x.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
include/mpc512x.h +1 -1
index d1c6fb2..b51cf78 100644
@@ -185,7 +185,7 @@
 
 /* SCFR1 System Clock Frequency Register 1
  */
-#define SCFR1_IPS_DIV			0x4
+#define SCFR1_IPS_DIV			0x3
 #define SCFR1_IPS_DIV_MASK		0x03800000
 #define SCFR1_IPS_DIV_SHIFT		23
Signature · 1 line
1.5.4.rc4.23.gcab31
author
#1 lore raw

PATCH 1/1 Device tree updates

Changes to match 5121 device tree going mainline in 2.6.25.

Change OF_SOC from "soc5121" to plain "soc". Remove unneeded "ref-frequency" fixups. Remove "address" enetaddr fixup.

Add bus-frequency fixup for old OF_SOC so old kernels with old device trees will work with new u-boot with 66MHz IPS clock

Signed-off-by John Rigby <[email protected]>
---
 cpu/mpc512x/cpu.c         |    6 +++---
 include/configs/ads5121.h |    5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)
cpu/mpc512x/cpu.c +3 -3
index 6421a51..bed77ac 100644
@@ -138,11 +138,11 @@ void ft_cpu_setup(void *blob, bd_t *bd)
 
 	do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1);
 	do_fixup_by_path_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1);
-	do_fixup_by_path_u32(blob, cpu_path, "ref-frequency", CFG_MPC512X_CLKIN, 1);
 	do_fixup_by_path_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1);
 	do_fixup_by_path_u32(blob, "/" OF_SOC, "bus-frequency", bd->bi_ipsfreq, 1);
-	do_fixup_by_path_u32(blob, "/" OF_SOC, "ref-frequency", CFG_MPC512X_CLKIN, 1);
-	do_fixup_by_path(blob, eth_path, "address", bd->bi_enetaddr, 6, 0);
 	do_fixup_by_path(blob, eth_path, "local-mac-address", bd->bi_enetaddr, 6, 0);
+
+	/* this is so old kernels with old device trees will boot */
+	do_fixup_by_path_u32(blob, "/" OF_SOC_OLD, "bus-frequency", bd->bi_ipsfreq, 0);
 }
 #endif
include/configs/ads5121.h +3 -2
index ce458ae..973f348 100644
@@ -415,8 +415,9 @@
 #define CONFIG_OF_BOARD_SETUP	1
 
 #define OF_CPU			"PowerPC,5121 at 0"
-#define OF_SOC			"soc5121 at 80000000"
+#define OF_SOC			"soc at 80000000"
+#define OF_SOC_OLD		"soc5121 at 80000000"
 #define OF_TBCLK		(bd->bi_busfreq / 4)
-#define OF_STDOUT_PATH		"/soc5121 at 80000000/serial at 11300"
+#define OF_STDOUT_PATH		"/soc at 80000000/serial at 11300"
 
 #endif	/* __CONFIG_H */
Signature · 1 line
1.5.4.rc4.23.gcab31
#2 lore raw

PATCH 1/1 Device tree updates

include/configs/ads5121.h line 419

Quoted 11 lines · John Rigby
include/configs/ads5121.h +2 -1
index ce458ae..973f348 100644
@@ -415,8 +415,9 @@
 #define CONFIG_OF_BOARD_SETUP	1
 
 #define OF_CPU			"PowerPC,5121 at 0"
-#define OF_SOC			"soc5121 at 80000000"
+#define OF_SOC			"soc at 80000000"
+#define OF_SOC_OLD		"soc5121 at 80000000"

This should be looked up by compatible, not by path.

include/configs/ads5121.h line 421

Quoted 3 lines
include/configs/ads5121.h +1 -1
 #define OF_TBCLK		(bd->bi_busfreq / 4)
-#define OF_STDOUT_PATH		"/soc5121 at 80000000/serial at 11300"
+#define OF_STDOUT_PATH		"/soc at 80000000/serial at 11300"

This should be done with aliases.

-Scott

Applied
#3 lore raw

PATCH 1/1 Device tree updates

In reply to John Rigby
Quoted 11 lines · In message <[email protected]> you wrote:

Changes to match 5121 device tree going mainline in 2.6.25.

Change OF_SOC from "soc5121" to plain "soc". Remove unneeded "ref-frequency" fixups. Remove "address" enetaddr fixup.

Add bus-frequency fixup for old OF_SOC so old kernels with old device trees will work with new u-boot with 66MHz IPS clock

Signed-off-by John Rigby <[email protected]>

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Wisdom is one of the few things that looks bigger the further away it
is.                               - Terry Pratchett, _Witches Abroad_
Applied
#4 lore raw

PATCH 1/1 Change IPS freq to 66MHz

In reply to John Rigby
Quoted 4 lines · In message <[email protected]> you wrote:

Recommended frequency is 66MHz
Change divider from 4 to 3.

Signed-off-by John Rigby <[email protected]>

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"There is no statute of limitations on stupidity."
- Randomly produced by a computer program called Markov3.