diff options
author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:48:48 +0000 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2013-02-04 09:04:57 -0500 |
commit | 67ac13b1b9b6ca00893714fbc8cbf556bab6fd59 (patch) | |
tree | 465b1934f005865689bffc75469160894bf1c361 /arch/powerpc/cpu/mpc86xx | |
parent | c6731fe22ab1cc2f5c2b8be9b1db276d777f12c3 (diff) |
ppc: Move lbc_clk and cpu to arch_global_data
Move these fields into arch_global_data and tidy up.
Signed-off-by: Simon Glass <sjg@chromium.org>
[trini: Update for bsc9132qds.c, b4860qds.c]
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'arch/powerpc/cpu/mpc86xx')
-rw-r--r-- | arch/powerpc/cpu/mpc86xx/cpu.c | 2 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc86xx/fdt.c | 4 | ||||
-rw-r--r-- | arch/powerpc/cpu/mpc86xx/speed.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/cpu/mpc86xx/cpu.c b/arch/powerpc/cpu/mpc86xx/cpu.c index d2c8c78e864..c553415b555 100644 --- a/arch/powerpc/cpu/mpc86xx/cpu.c +++ b/arch/powerpc/cpu/mpc86xx/cpu.c @@ -67,7 +67,7 @@ checkcpu(void) } puts("CPU: "); - cpu = gd->cpu; + cpu = gd->arch.cpu; puts(cpu->name); diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c index 2f955fe9309..26a65c586d5 100644 --- a/arch/powerpc/cpu/mpc86xx/fdt.c +++ b/arch/powerpc/cpu/mpc86xx/fdt.c @@ -34,10 +34,10 @@ void ft_cpu_setup(void *blob, bd_t *bd) #if defined(CONFIG_MPC8641) do_fixup_by_compat_u32(blob, "fsl,mpc8641-localbus", - "bus-frequency", gd->lbc_clk, 1); + "bus-frequency", gd->arch.lbc_clk, 1); #endif do_fixup_by_compat_u32(blob, "fsl,elbc", - "bus-frequency", gd->lbc_clk, 1); + "bus-frequency", gd->arch.lbc_clk, 1); fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); diff --git a/arch/powerpc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c index a2d0a8ac6eb..e5798eebec6 100644 --- a/arch/powerpc/cpu/mpc86xx/speed.c +++ b/arch/powerpc/cpu/mpc86xx/speed.c @@ -120,7 +120,7 @@ int get_clocks(void) get_sys_info(&sys_info); gd->cpu_clk = sys_info.freqProcessor; gd->bus_clk = sys_info.freqSystemBus; - gd->lbc_clk = sys_info.freqLocalBus; + gd->arch.lbc_clk = sys_info.freqLocalBus; /* * The base clock for I2C depends on the actual SOC. Unfortunately, |