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>

diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h
index 99949e1d16d9fb8a63db6230cdf499f5b7737d3b..fdd099e6f6e3d0878164ab578f1e2d8d2fe1948b 100644 (file)
--- 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;