diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:49:08 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-04 09:05:44 -0500 |
| commit | 035cbe99cd2fd4adf9d7fd95aeebb5f814e37eb9 (patch) | |
| tree | 2ad61a52bd249ce6fa508025710331fb00e8671e /arch/mips | |
| parent | 7e2592fd5ac3dce73aceb11e1526629840e52797 (diff) | |
| download | talos-obmc-uboot-035cbe99cd2fd4adf9d7fd95aeebb5f814e37eb9.tar.gz talos-obmc-uboot-035cbe99cd2fd4adf9d7fd95aeebb5f814e37eb9.zip | |
mips: Move per_clk and dev_clk to arch_global_data
Move these field into arch_global_data and tidy up. The other
CONFIG_JZSOC fields are used by various architectures, so just remove
the #ifdef bracketing for these.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/include/asm/global_data.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h index 99949e1d16..fdd099e6f6 100644 --- a/arch/mips/include/asm/global_data.h +++ b/arch/mips/include/asm/global_data.h @@ -28,6 +28,11 @@ /* Architecture-specific global data */ struct arch_global_data { +#ifdef CONFIG_JZSOC + /* There are other clocks in the jz4740 */ + unsigned long per_clk; /* Peripheral bus clock */ + unsigned long dev_clk; /* Device clock */ +#endif }; /* @@ -41,13 +46,9 @@ struct arch_global_data { typedef struct global_data { bd_t *bd; unsigned long flags; -#ifdef CONFIG_JZSOC - /* There are other clocks in the jz4740 */ unsigned long cpu_clk; /* CPU core clock */ unsigned long sys_clk; /* System bus clock */ - unsigned long per_clk; /* Peripheral bus clock */ unsigned long mem_clk; /* Memory bus clock */ - unsigned long dev_clk; /* Device clock */ /* "static data" needed by most of timer.c */ unsigned long tbl; unsigned long lastinc; |
