Merge git://git.denx.de/u-boot-sunxi

[oweals/u-boot.git] / arch / powerpc / include / asm / global_data.h

diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h
index cdf4be2c76d2c4f5120861f60ad05832c565b4ed..07d5beaf0e9e11f725160accf7b55f00eb7b6bb2 100644 (file)
--- a/arch/powerpc/include/asm/global_data.h
+++ b/arch/powerpc/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
@@ -19,6 +18,9 @@ struct arch_global_data {
        u8 sdhc_adapter;
 #endif
 #endif
+#if defined(CONFIG_MPC8xx)
+       unsigned long brg_clk;
+#endif
 #if defined(CONFIG_CPM2)
        /* There are many clocks on the MPC8260 - see page 9-5 */
        unsigned long vco_out;
@@ -81,13 +83,6 @@ struct arch_global_data {
 #if defined(CONFIG_E500)
        u32 used_tlb_cams[(CONFIG_SYS_NUM_TLBCAMS+31)/32];
 #endif
-#if defined(CONFIG_MPC5xxx)
-       unsigned long ipb_clk;
-#endif
-#if defined(CONFIG_MPC512X)
-       u32 ips_clk;
-       u32 csb_clk;
-#endif /* CONFIG_MPC512X */
        unsigned long reset_status;     /* reset status register at boot */
 #if defined(CONFIG_MPC83xx)
        unsigned long arbiter_event_attributes;
@@ -97,9 +92,6 @@ struct arch_global_data {
        unsigned int dp_alloc_base;
        unsigned int dp_alloc_top;
 #endif
-#if defined(CONFIG_4xx)
-       u32 uart_clk;
-#endif /* CONFIG_4xx */
 #ifdef CONFIG_SYS_FPGA_COUNT
        unsigned fpga_state[CONFIG_SYS_FPGA_COUNT];
 #endif