[U-Boot-Users] [PATCH] [MPC52xx] Use IPB bus frequency for SOC peripherals
The soc node of the mpc52xx needs to be loaded with the IPB bus frequency, not the XLB frequency.
This patch depends on the previous patches for MPC52xx device tree support
Signed-off-by: Grant Likely grant.likely@secretlab.ca --- cpu/mpc5xxx/cpu.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/cpu/mpc5xxx/cpu.c b/cpu/mpc5xxx/cpu.c index 20e6735..813aa79 100644 --- a/cpu/mpc5xxx/cpu.c +++ b/cpu/mpc5xxx/cpu.c @@ -112,21 +112,20 @@ void ft_cpu_setup(void *blob, bd_t *bd) { u32 *p; - ulong clock; int len;
- clock = bd->bi_busfreq; + /* Core XLB bus frequency */ p = ft_get_prop(blob, "/cpus/" OF_CPU "/bus-frequency", &len); if (p != NULL) - *p = cpu_to_be32(clock); + *p = cpu_to_be32(bd->bi_busfreq);
+ /* SOC peripherals use the IPB bus frequency */ p = ft_get_prop(blob, "/" OF_SOC "/bus-frequency", &len); if (p != NULL) - *p = cpu_to_be32(clock); + *p = cpu_to_be32(bd->bi_ipbfreq);
p = ft_get_prop(blob, "/" OF_SOC "/ethernet@3000/mac-address", &len); if (p != NULL) memcpy(p, bd->bi_enetaddr, 6); - } #endif
In message 1162846858442-git-send-email-grant.likely@secretlab.ca you wrote:
The soc node of the mpc52xx needs to be loaded with the IPB bus frequency, not the XLB frequency.
...
p = ft_get_prop(blob, "/cpus/" OF_CPU "/bus-frequency", &len); if (p != NULL)
*p = cpu_to_be32(clock);
*p = cpu_to_be32(bd->bi_busfreq);
"/bus-frequency" ==> bi_busfreq. OK.
p = ft_get_prop(blob, "/" OF_SOC "/bus-frequency", &len); if (p != NULL)
*p = cpu_to_be32(clock);
*p = cpu_to_be32(bd->bi_ipbfreq);
"/bus-frequency" ==> bi_ipbfreq. ???
Best regards,
Wolfgang Denk
On 11/6/06, Wolfgang Denk wd@denx.de wrote:
In message 1162846858442-git-send-email-grant.likely@secretlab.ca you wrote:
The soc node of the mpc52xx needs to be loaded with the IPB bus frequency, not the XLB frequency.
...
p = ft_get_prop(blob, "/cpus/" OF_CPU "/bus-frequency", &len); if (p != NULL)
*p = cpu_to_be32(clock);
*p = cpu_to_be32(bd->bi_busfreq);"/bus-frequency" ==> bi_busfreq. OK.
/cpus/mpc5200@0/bus-frequency ==> bi_busfreq
p = ft_get_prop(blob, "/" OF_SOC "/bus-frequency", &len); if (p != NULL)
*p = cpu_to_be32(clock);
*p = cpu_to_be32(bd->bi_ipbfreq);"/bus-frequency" ==> bi_ipbfreq. ???
/soc5200@f0000000/bus-frequency ==> bi_ipbfreq
They are different busses, but 'bus-frequency' is kind of a standard name
BTW, I've got ACKs from jdl on two of the previous patches. Are you cool to commit them?
Thanks, g.
In message 528646bc0611061336g15e977e9qc585555751671d00@mail.gmail.com you wrote:
/cpus/mpc5200@0/bus-frequency ==> bi_busfreq
...
/soc5200@f0000000/bus-frequency ==> bi_ipbfreq
They are different busses, but 'bus-frequency' is kind of a standard name
I see. Sorry, by brain has been a bit dried up from all this bss discussion.
BTW, I've got ACKs from jdl on two of the previous patches. Are you cool to commit them?
As soon as I find a little time.
Best regards,
Wolfgang Denk
On 11/6/06, Wolfgang Denk wd@denx.de wrote:
I see. Sorry, by brain has been a bit dried up from all this bss discussion.
:)
BTW, I've got ACKs from jdl on two of the previous patches. Are you cool to commit them?
As soon as I find a little time.
Cool, thx
g.
Grant Likely wrote:
On 11/6/06, Wolfgang Denk wd@denx.de wrote:
I see. Sorry, by brain has been a bit dried up from all this bss discussion.
:)
BTW, I've got ACKs from jdl on two of the previous patches. Are you cool to commit them?
As soon as I find a little time.
Cool, thx
g.
Word of Warning: I pulled Grant's changes into my working branch and had a conflict on cmd_bootm.c because I removed two commented out lines (the commented out lines were debug calls to ft_dump_blob), but Grant reworked that area. Those two deleted lines were the only changes I made to cmd_bootm.c so my changes to cmd_bootm.c can be discarded.
I have not gotten around to regenerating my oftdump command patch to remove my changes to cmd_bootm.c, I presume that is the best approach.
gvb
Wolfgang Denk wrote:
In message 1162846858442-git-send-email-grant.likely@secretlab.ca you wrote:
The soc node of the mpc52xx needs to be loaded with the IPB bus frequency, not the XLB frequency.
...
p = ft_get_prop(blob, "/cpus/" OF_CPU "/bus-frequency", &len); if (p != NULL)
*p = cpu_to_be32(clock);
*p = cpu_to_be32(bd->bi_busfreq);"/bus-frequency" ==> bi_busfreq. OK.
p = ft_get_prop(blob, "/" OF_SOC "/bus-frequency", &len); if (p != NULL)
*p = cpu_to_be32(clock);
*p = cpu_to_be32(bd->bi_ipbfreq);"/bus-frequency" ==> bi_ipbfreq. ???
FWIW, Looks good to me and it's a requirement for the new arch/powerpc that's coming soon.
Signed-off-by: Sylvain Munaut tnt@246tNt.com
Sylvain
participants (5)
-
Grant Likely -
Jerry Van Baren -
Stefan Roese -
Sylvain Munaut -
Wolfgang Denk