summaryrefslogtreecommitdiff
path: root/arch/m68k/include
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:49:07 +0000
committerTom Rini <trini@ti.com>2013-02-04 09:05:44 -0500
commit7e2592fd5ac3dce73aceb11e1526629840e52797 (patch)
treef77b0b1685c2c3a0a08234fcb184b50cc1b750ff /arch/m68k/include
parentfa25c6f0cccc3691dd3db97cef94a547d1008c73 (diff)
downloadu-boot-imx-7e2592fd5ac3dce73aceb11e1526629840e52797.zip
u-boot-imx-7e2592fd5ac3dce73aceb11e1526629840e52797.tar.gz
u-boot-imx-7e2592fd5ac3dce73aceb11e1526629840e52797.tar.bz2
m68k: Move CONFIG_EXTRA_CLOCK to arch_global_data
Move inp_clk, vco_clk and flb_clk into arch_global_data and tidy up. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/m68k/include')
-rw-r--r--arch/m68k/include/asm/global_data.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h
index d9be8b1..9f37dcc 100644
--- a/arch/m68k/include/asm/global_data.h
+++ b/arch/m68k/include/asm/global_data.h
@@ -30,6 +30,11 @@ struct arch_global_data {
unsigned long i2c1_clk;
unsigned long i2c2_clk;
#endif
+#ifdef CONFIG_EXTRA_CLOCK
+ unsigned long inp_clk;
+ unsigned long vco_clk;
+ unsigned long flb_clk;
+#endif
};
/*
@@ -49,11 +54,6 @@ typedef struct global_data {
#ifdef CONFIG_PCI
unsigned long pci_clk;
#endif
-#ifdef CONFIG_EXTRA_CLOCK
- unsigned long inp_clk;
- unsigned long vco_clk;
- unsigned long flb_clk;
-#endif
phys_size_t ram_size; /* RAM size */
unsigned long reloc_off; /* Relocation Offset */
unsigned long reset_status; /* reset status register at boot */