[U-Boot-Users] [PATCH] [ADS5121] Change IPS freq to 66MHz
Recommended frequency is 66MHz Change divider from 4 to 3.
Signed-off-by: John Rigby jrigby@freescale.com --- include/mpc512x.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/mpc512x.h b/include/mpc512x.h index d1c6fb2..b51cf78 100644 --- a/include/mpc512x.h +++ b/include/mpc512x.h @@ -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
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 jrigby@freescale.com --- cpu/mpc512x/cpu.c | 6 +++--- include/configs/ads5121.h | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c index 6421a51..bed77ac 100644 --- a/cpu/mpc512x/cpu.c +++ b/cpu/mpc512x/cpu.c @@ -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 diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h index ce458ae..973f348 100644 --- a/include/configs/ads5121.h +++ b/include/configs/ads5121.h @@ -415,8 +415,9 @@ #define CONFIG_OF_BOARD_SETUP 1
#define OF_CPU "PowerPC,5121@0" -#define OF_SOC "soc5121@80000000" +#define OF_SOC "soc@80000000" +#define OF_SOC_OLD "soc5121@80000000" #define OF_TBCLK (bd->bi_busfreq / 4) -#define OF_STDOUT_PATH "/soc5121@80000000/serial@11300" +#define OF_STDOUT_PATH "/soc@80000000/serial@11300"
#endif /* __CONFIG_H */
On Wed, Jan 30, 2008 at 01:36:57PM -0700, John Rigby wrote:
diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h index ce458ae..973f348 100644 --- a/include/configs/ads5121.h +++ b/include/configs/ads5121.h @@ -415,8 +415,9 @@ #define CONFIG_OF_BOARD_SETUP 1
#define OF_CPU "PowerPC,5121@0" -#define OF_SOC "soc5121@80000000" +#define OF_SOC "soc@80000000" +#define OF_SOC_OLD "soc5121@80000000"
This should be looked up by compatible, not by path.
#define OF_TBCLK (bd->bi_busfreq / 4) -#define OF_STDOUT_PATH "/soc5121@80000000/serial@11300" +#define OF_STDOUT_PATH "/soc@80000000/serial@11300"
This should be done with aliases.
-Scott
In message 1201725417-5521-2-git-send-email-jrigby@freescale.com 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 jrigby@freescale.com
Applied, thanks.
Best regards,
Wolfgang Denk
In message 1201725417-5521-1-git-send-email-jrigby@freescale.com you wrote:
Recommended frequency is 66MHz Change divider from 4 to 3.
Signed-off-by: John Rigby jrigby@freescale.com
Applied, thanks.
Best regards,
Wolfgang Denk
participants (3)
-
John Rigby -
Scott Wood -
Wolfgang Denk