diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:48:44 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-01 15:42:45 -0500 |
| commit | 1206c18403ff25814673a4dbfa071ae06bbefaef (patch) | |
| tree | a4a38c741e9b7a2cb98566785093c3984ec15454 /arch/powerpc/include/asm/global_data.h | |
| parent | 6cb49c13f687fb8c1e2936466edf154f4132abb1 (diff) | |
| download | blackbird-obmc-uboot-1206c18403ff25814673a4dbfa071ae06bbefaef.tar.gz blackbird-obmc-uboot-1206c18403ff25814673a4dbfa071ae06bbefaef.zip | |
ppc: Move brg_clk to arch_global_data
Move this field into arch_global_data and tidy up.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/powerpc/include/asm/global_data.h')
| -rw-r--r-- | arch/powerpc/include/asm/global_data.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index df621da701..ac348c6f19 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -29,6 +29,15 @@ /* Architecture-specific global data */ struct arch_global_data { +#if defined(CONFIG_8xx) + unsigned long brg_clk; +#endif +#if defined(CONFIG_CPM2) + unsigned long brg_clk; +#endif +#if defined(CONFIG_QE) + u32 brg_clk; +#endif }; /* @@ -45,15 +54,11 @@ typedef struct global_data { unsigned int baudrate; unsigned long cpu_clk; /* CPU clock in Hz! */ unsigned long bus_clk; -#if defined(CONFIG_8xx) - unsigned long brg_clk; -#endif #if defined(CONFIG_CPM2) /* There are many clocks on the MPC8260 - see page 9-5 */ unsigned long vco_out; unsigned long cpm_clk; unsigned long scc_clk; - unsigned long brg_clk; #ifdef CONFIG_PCI unsigned long pci_clk; #endif @@ -106,7 +111,6 @@ typedef struct global_data { #endif #if defined(CONFIG_QE) u32 qe_clk; - u32 brg_clk; uint mp_alloc_base; uint mp_alloc_top; #endif /* CONFIG_QE */ |
