[U-Boot] [PATCH 38/57] mips: Move per_clk and dev_clk to arch_global_data
Simon Glass
sjg at chromium.org
Fri Nov 16 22:20:23 CET 2012
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 at chromium.org>
---
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 99949e1..fdd099e 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;
--
1.7.7.3
More information about the U-Boot
mailing list