Merge branch 'katmai-ddr-gda'

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

diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index 1a9808325a194ae0c6a44e14b96740c22bf12e43..05aee74949422523562cf4b07ab5fd69d19b8bf3 100644 (file)
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -23,6 +23,9 @@
 
 #ifndef        __ASM_GBL_DATA_H
 #define __ASM_GBL_DATA_H
+
+#include "asm/types.h"
+
 /*
  * The following data structure is placed in some memory wich is
  * available very early after boot (like DPRAM on MPC8xx/MPC82xx, or
@@ -39,16 +42,60 @@ typedef     struct  global_data {
        unsigned long   baudrate;
        unsigned long   cpu_clk;        /* CPU clock in Hz!             */
        unsigned long   bus_clk;
-#if defined(CONFIG_8260) || defined(CONFIG_MPC8560)
+#if defined(CONFIG_CPM2)
        /* There are many clocks on the MPC8260 - see page 9-5 */
        unsigned long   vco_out;
        unsigned long   cpm_clk;
        unsigned long   scc_clk;
        unsigned long   brg_clk;
 #endif
-#if defined(CONFIG_MPC5XXX)
+#if defined(CONFIG_MPC7448HPC2)
+       unsigned long   mem_clk;
+#endif
+#if defined(CONFIG_MPC83XX)
+       /* There are other clocks in the MPC83XX */
+       u32 csb_clk;
+#if defined (CONFIG_MPC834X) || defined(CONFIG_MPC831X)
+       u32 tsec1_clk;
+       u32 tsec2_clk;
+       u32 usbdr_clk;
+#endif
+#if defined (CONFIG_MPC834X)
+       u32 usbmph_clk;
+#endif /* CONFIG_MPC834X */
+       u32 core_clk;
+       u32 i2c1_clk;
+       u32 i2c2_clk;
+       u32 enc_clk;
+       u32 lbiu_clk;
+       u32 lclk_clk;
+       u32 ddr_clk;
+       u32 pci_clk;
+#if defined(CONFIG_MPC8360)
+       u32  ddr_sec_clk;
+#endif /* CONFIG_MPC8360 */
+#endif
+#if defined(CONFIG_QE)
+       u32 qe_clk;
+       u32 brg_clk;
+       uint mp_alloc_base;
+       uint mp_alloc_top;
+#endif /* CONFIG_QE */
+#if defined(CONFIG_MPC5xxx)
        unsigned long   ipb_clk;
        unsigned long   pci_clk;
+#endif
+#if defined(CONFIG_MPC512X)
+       u32 ipb_clk;
+       u32 csb_clk;
+#endif /* CONFIG_MPC512X */
+#if defined(CONFIG_MPC8220)
+       unsigned long   bExtUart;
+       unsigned long   inp_clk;
+       unsigned long   pci_clk;
+       unsigned long   vco_clk;
+       unsigned long   pev_clk;
+       unsigned long   flb_clk;
 #endif
        unsigned long   ram_size;       /* RAM size */
        unsigned long   reloc_off;      /* Relocation Offset */
@@ -56,16 +103,20 @@ typedef    struct  global_data {
        unsigned long   env_addr;       /* Address  of Environment struct       */
        unsigned long   env_valid;      /* Checksum of Environment valid?       */
        unsigned long   have_console;   /* serial_init() was called             */
-#if defined(CFG_ALLOC_DPRAM) || defined(CONFIG_8260) || defined(CONFIG_MPC8560)
+#if defined(CFG_ALLOC_DPRAM) || defined(CONFIG_CPM2)
        unsigned int    dp_alloc_base;
        unsigned int    dp_alloc_top;
 #endif
+#if defined(CONFIG_4xx)
+       u32  uart_clk;
+#endif /* CONFIG_4xx */
 #if defined(CFG_GT_6426x)
        unsigned int    mirror_hack[16];
 #endif
-#if defined(CONFIG_SANDPOINT) ||  \
-    defined(CONFIG_MUSENKI)   ||  \
-    defined(CONFIG_A3000)
+#if defined(CONFIG_A3000)      || \
+    defined(CONFIG_HIDDEN_DRAGON)  || \
+    defined(CONFIG_MUSENKI)    ||  \
+    defined(CONFIG_SANDPOINT)
        void *          console_addr;
 #endif
 #ifdef CONFIG_AMIGAONEG3SE
@@ -85,7 +136,7 @@ typedef      struct  global_data {
        unsigned long do_mdm_init;
        unsigned long be_quiet;
 #endif
-#ifdef CONFIG_LWMON
+#if defined(CONFIG_LWMON) || defined(CONFIG_LWMON5)
        unsigned long kbd_status;
 #endif
        void            **jt;           /* jump table */