diff options
| author | Simon Glass <sjg@chromium.org> | 2012-12-13 20:48:49 +0000 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-02-04 09:05:42 -0500 |
| commit | 609e6ec3f623f3c3aa2a056654fbc5886e092897 (patch) | |
| tree | e96d7d41daca9156d94c3a289f3312b46ac74412 /arch/powerpc/include/asm/global_data.h | |
| parent | 67ac13b1b9b6ca00893714fbc8cbf556bab6fd59 (diff) | |
| download | blackbird-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/powerpc/include/asm/global_data.h')
| -rw-r--r-- | arch/powerpc/include/asm/global_data.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index d924673c18..b710f25fc2 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -80,6 +80,11 @@ struct arch_global_data { u32 lbc_clk; void *cpu; #endif /* CONFIG_MPC85xx || CONFIG_MPC86xx */ +#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || \ + defined(CONFIG_MPC86xx) + u32 i2c1_clk; + u32 i2c2_clk; +#endif }; /* @@ -102,10 +107,6 @@ typedef struct global_data { #if defined(CONFIG_FSL_ESDHC) u32 sdhc_clk; #endif -#if defined(CONFIG_MPC83xx) || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) - u32 i2c1_clk; - u32 i2c2_clk; -#endif #if defined(CONFIG_QE) u32 qe_clk; uint mp_alloc_base; |
