Merge git://git.infradead.org/~dwmw2/rbtree-2.6

[linux-2.6] / include / asm-ppc / mpc52xx.h

diff --git a/include/asm-ppc/mpc52xx.h b/include/asm-ppc/mpc52xx.h
index 04d56301345ba71e4d3b710c1ef65c8d368a08ce..7e9842805a282628a5ec0131cfaf2d726e6889ff 100644 (file)
--- a/include/asm-ppc/mpc52xx.h
+++ b/include/asm-ppc/mpc52xx.h
@@ -29,6 +29,17 @@ struct pt_regs;
 #endif /* __ASSEMBLY__ */
 
 
+#ifdef CONFIG_PCI
+#define _IO_BASE       isa_io_base
+#define _ISA_MEM_BASE  isa_mem_base
+#define PCI_DRAM_OFFSET        pci_dram_offset
+#else
+#define _IO_BASE       0
+#define _ISA_MEM_BASE  0
+#define PCI_DRAM_OFFSET        0
+#endif
+
+
 /* ======================================================================== */
 /* PPC Sys devices definition                                               */
 /* ======================================================================== */
@@ -49,6 +60,7 @@ enum ppc_sys_devices {
        MPC52xx_ATA,
        MPC52xx_I2C1,
        MPC52xx_I2C2,
+       NUM_PPC_SYS_DEVS,
 };
 
 
@@ -343,6 +355,7 @@ struct mpc52xx_xlb {
        u32     snoop_window;           /* XLB + 0x70 */
 };
 
+#define MPC52xx_XLB_CFG_PLDIS          (1 << 31)
 #define MPC52xx_XLB_CFG_SNOOP          (1 << 15)
 
 /* Clock Distribution control */
@@ -415,6 +428,9 @@ extern void mpc52xx_calibrate_decr(void);
 
 extern void mpc52xx_find_bridges(void);
 
+extern void mpc52xx_setup_cpu(void);
+
+
 
        /* Matching of PSC function */
 struct mpc52xx_psc_func {