summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/global_data.h
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-13 20:48:49 +0000
committerTom Rini <trini@ti.com>2013-02-04 09:05:42 -0500
commit609e6ec3f623f3c3aa2a056654fbc5886e092897 (patch)
treee96d7d41daca9156d94c3a289f3312b46ac74412 /arch/m68k/include/asm/global_data.h
parent67ac13b1b9b6ca00893714fbc8cbf556bab6fd59 (diff)
downloadblackbird-obmc-uboot-609e6ec3f623f3c3aa2a056654fbc5886e092897.tar.gz
blackbird-obmc-uboot-609e6ec3f623f3c3aa2a056654fbc5886e092897.zip
ppc: m68k: Move i2c1_clk, i2c2_clk to arch_global_data
Move these fields into arch_global_data and tidy up. This is needed for both ppc and m68k since they share the i2c driver. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/m68k/include/asm/global_data.h')
-rw-r--r--arch/m68k/include/asm/global_data.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h
index fd8aacb5c8..d9be8b121d 100644
--- a/arch/m68k/include/asm/global_data.h
+++ b/arch/m68k/include/asm/global_data.h
@@ -26,6 +26,10 @@
/* Architecture-specific global data */
struct arch_global_data {
+#ifdef CONFIG_FSL_I2C
+ unsigned long i2c1_clk;
+ unsigned long i2c2_clk;
+#endif
};
/*
@@ -50,10 +54,6 @@ typedef struct global_data {
unsigned long vco_clk;
unsigned long flb_clk;
#endif
-#ifdef CONFIG_FSL_I2C
- unsigned long i2c1_clk;
- unsigned long i2c2_clk;
-#endif
phys_size_t ram_size; /* RAM size */
unsigned long reloc_off; /* Relocation Offset */
unsigned long reset_status; /* reset status register at boot */
OpenPOWER on IntegriCloud