Merge tag 'xilinx-for-v2020.07-rc2' of https://gitlab.denx.de/u-boot/custodians/u...

[platform/kernel/u-boot.git] / arch / mips / include / asm / global_data.h

diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h
index 3f230b0..4c30fab 100644 (file)
--- a/arch/mips/include/asm/global_data.h
+++ b/arch/mips/include/asm/global_data.h
@@ -1,8 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * (C) Copyright 2002-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef        __ASM_GBL_DATA_H
@@ -15,20 +14,22 @@ struct arch_global_data {
 #ifdef CONFIG_DYNAMIC_IO_PORT_BASE
        unsigned long io_port_base;
 #endif
-#ifdef CONFIG_JZSOC
-       /* There are other clocks in the jz4740 */
-       unsigned long per_clk;  /* Peripheral bus clock */
-       unsigned long dev_clk;  /* Device clock */
-       unsigned long sys_clk;
-       unsigned long tbl;
-       unsigned long lastinc;
-#endif
 #ifdef CONFIG_ARCH_ATH79
        unsigned long id;
        unsigned long soc;
        unsigned long rev;
        unsigned long ver;
 #endif
+#ifdef CONFIG_SYS_CACHE_SIZE_AUTO
+       unsigned short l1i_line_size;
+       unsigned short l1d_line_size;
+#endif
+#ifdef CONFIG_MIPS_L2_CACHE
+       unsigned short l2_line_size;
+#endif
+#ifdef CONFIG_ARCH_MTMIPS
+       unsigned long timer_freq;
+#endif
 };
 
 #include <asm-generic/global_data.h>