Merge branch 'master' into hpc2

[platform/kernel/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 9681a74..5f0f0b4 100644 (file)
--- a/include/asm-ppc/global_data.h
+++ b/include/asm-ppc/global_data.h
@@ -49,19 +49,35 @@ typedef     struct  global_data {
        unsigned long   scc_clk;
        unsigned long   brg_clk;
 #endif
+#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_MPC8349)
        u32 tsec1_clk;
        u32 tsec2_clk;
-       u32 core_clk;
        u32 usbmph_clk;
        u32 usbdr_clk;
-       u32 i2c_clk;
+#endif /* CONFIG_MPC8349 */
+       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_QE)
+       u32 qe_clk;
+       u32 brg_clk;
+       uint mp_alloc_base;
+       uint mp_alloc_top;
+#endif /* CONFIG_QE */
+#if defined (CONFIG_MPC8360)
+       u32  ddr_sec_clk;
+#endif /* CONFIG_MPC8360 */
 #endif
 #if defined(CONFIG_MPC5xxx)
        unsigned long   ipb_clk;