11 files changed, 91 insertions, 129 deletions

diff --git a/include/asm-ppc/bseip.h b/include/asm-ppc/bseip.h
deleted file mode 100644
index 691f4a52b0a5..000000000000
--- a/include/asm-ppc/bseip.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * A collection of structures, addresses, and values associated with
- * the Bright Star Engineering ip-Engine board.  Copied from the MBX stuff.
- *
- * Copyright (c) 1998 Dan Malek (dmalek@jlc.net)
- */
-#ifndef __MACH_BSEIP_DEFS
-#define __MACH_BSEIP_DEFS
-
-#ifndef __ASSEMBLY__
-/* A Board Information structure that is given to a program when
- * prom starts it up.
- */
-typedef struct bd_info {
-        unsigned int    bi_memstart;    /* Memory start address */
-        unsigned int    bi_memsize;     /* Memory (end) size in bytes */
-        unsigned int    bi_intfreq;     /* Internal Freq, in Hz */
-        unsigned int    bi_busfreq;     /* Bus Freq, in Hz */
-        unsigned char   bi_enetaddr[6];
-        unsigned int    bi_baudrate;
-} bd_t;
-
-extern bd_t m8xx_board_info;
-
-/* Memory map is configured by the PROM startup.
- * All we need to get started is the IMMR.
- */
-#define IMAP_ADDR               ((uint)0xff000000)
-#define IMAP_SIZE               ((uint)(64 * 1024))
-#define PCMCIA_MEM_ADDR         ((uint)0x04000000)
-#define PCMCIA_MEM_SIZE         ((uint)(64 * 1024))
-#endif  /* !__ASSEMBLY__ */
-
-/* We don't use the 8259.
-*/
-#define NR_8259_INTS    0
-
-#endif
diff --git a/include/asm-ppc/btext.h b/include/asm-ppc/btext.h
index ccaefabe0bf5..ed3630251b3b 100644
--- a/include/asm-ppc/btext.h
+++ b/include/asm-ppc/btext.h
@@ -17,7 +17,7 @@ extern unsigned long disp_BAT[2];
 extern boot_infos_t disp_bi;
 extern int boot_text_mapped;
 
-extern void init_boot_display(void);
+extern void btext_init(boot_infos_t *bi);
 extern void btext_welcome(void);
 extern void btext_prepare_BAT(void);
 extern void btext_setup_display(int width, int height, int depth, int pitch,
diff --git a/include/asm-ppc/ibm_ocp.h b/include/asm-ppc/ibm_ocp.h
index 9c21de1ff4ed..ddce616f765a 100644
--- a/include/asm-ppc/ibm_ocp.h
+++ b/include/asm-ppc/ibm_ocp.h
@@ -63,7 +63,6 @@ struct ocp_func_emac_data {
         int     wol_irq;        /* WOL interrupt */
         int     mdio_idx;       /* EMAC idx of MDIO master or -1 */
         int     tah_idx;        /* TAH device index or -1 */
-        int     jumbo;          /* Jumbo frames capable flag */
         int     phy_mode;       /* PHY type or configurable mode */
         u8      mac_addr[6];    /* EMAC mac address */
         u32     phy_map;        /* EMAC phy map */
diff --git a/include/asm-ppc/io.h b/include/asm-ppc/io.h
index 84ac6e258eef..df9cf6ed189d 100644
--- a/include/asm-ppc/io.h
+++ b/include/asm-ppc/io.h
@@ -27,6 +27,8 @@
 
 #if defined(CONFIG_4xx)
 #include <asm/ibm4xx.h>
+#elif defined(CONFIG_PPC_MPC52xx)
+#include <asm/mpc52xx.h>
 #elif defined(CONFIG_8xx)
 #include <asm/mpc8xx.h>
 #elif defined(CONFIG_8260)
diff --git a/include/asm-ppc/ipic.h b/include/asm-ppc/ipic.h
deleted file mode 100644
index 0fe396a2b666..000000000000
--- a/include/asm-ppc/ipic.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * include/asm-ppc/ipic.h
- *
- * IPIC external definitions and structure.
- *
- * Maintainer: Kumar Gala <galak@kernel.crashing.org>
- *
- * Copyright 2005 Freescale Semiconductor, Inc
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-#ifdef __KERNEL__
-#ifndef __ASM_IPIC_H__
-#define __ASM_IPIC_H__
-
-#include <linux/irq.h>
-
-/* Flags when we init the IPIC */
-#define IPIC_SPREADMODE_GRP_A   0x00000001
-#define IPIC_SPREADMODE_GRP_D   0x00000002
-#define IPIC_SPREADMODE_MIX_A   0x00000004
-#define IPIC_SPREADMODE_MIX_B   0x00000008
-#define IPIC_DISABLE_MCP_OUT    0x00000010
-#define IPIC_IRQ0_MCP           0x00000020
-
-/* IPIC registers offsets */
-#define IPIC_SICFR      0x00    /* System Global Interrupt Configuration Register */
-#define IPIC_SIVCR      0x04    /* System Global Interrupt Vector Register */
-#define IPIC_SIPNR_H    0x08    /* System Internal Interrupt Pending Register (HIGH) */
-#define IPIC_SIPNR_L    0x0C    /* System Internal Interrupt Pending Register (LOW) */
-#define IPIC_SIPRR_A    0x10    /* System Internal Interrupt group A Priority Register */
-#define IPIC_SIPRR_B    0x14    /* System Internal Interrupt group B Priority Register */
-#define IPIC_SIPRR_C    0x18    /* System Internal Interrupt group C Priority Register */
-#define IPIC_SIPRR_D    0x1C    /* System Internal Interrupt group D Priority Register */
-#define IPIC_SIMSR_H    0x20    /* System Internal Interrupt Mask Register (HIGH) */
-#define IPIC_SIMSR_L    0x24    /* System Internal Interrupt Mask Register (LOW) */
-#define IPIC_SICNR      0x28    /* System Internal Interrupt Control Register */
-#define IPIC_SEPNR      0x2C    /* System External Interrupt Pending Register */
-#define IPIC_SMPRR_A    0x30    /* System Mixed Interrupt group A Priority Register */
-#define IPIC_SMPRR_B    0x34    /* System Mixed Interrupt group B Priority Register */
-#define IPIC_SEMSR      0x38    /* System External Interrupt Mask Register */
-#define IPIC_SECNR      0x3C    /* System External Interrupt Control Register */
-#define IPIC_SERSR      0x40    /* System Error Status Register */
-#define IPIC_SERMR      0x44    /* System Error Mask Register */
-#define IPIC_SERCR      0x48    /* System Error Control Register */
-#define IPIC_SIFCR_H    0x50    /* System Internal Interrupt Force Register (HIGH) */
-#define IPIC_SIFCR_L    0x54    /* System Internal Interrupt Force Register (LOW) */
-#define IPIC_SEFCR      0x58    /* System External Interrupt Force Register */
-#define IPIC_SERFR      0x5C    /* System Error Force Register */
-#define IPIC_SCVCR      0x60    /* System Critical Interrupt Vector Register */
-#define IPIC_SMVCR      0x64    /* System Management Interrupt Vector Register */
-
-enum ipic_prio_grp {
-        IPIC_INT_GRP_A = IPIC_SIPRR_A,
-        IPIC_INT_GRP_D = IPIC_SIPRR_D,
-        IPIC_MIX_GRP_A = IPIC_SMPRR_A,
-        IPIC_MIX_GRP_B = IPIC_SMPRR_B,
-};
-
-enum ipic_mcp_irq {
-        IPIC_MCP_IRQ0 = 0,
-        IPIC_MCP_WDT  = 1,
-        IPIC_MCP_SBA  = 2,
-        IPIC_MCP_PCI1 = 5,
-        IPIC_MCP_PCI2 = 6,
-        IPIC_MCP_MU   = 7,
-};
-
-extern void ipic_init(phys_addr_t phys_addr, unsigned int flags,
-                unsigned int irq_offset,
-                unsigned char *senses, unsigned int senses_count);
-extern int ipic_set_priority(unsigned int irq, unsigned int priority);
-extern void ipic_set_highest_priority(unsigned int irq);
-extern void ipic_set_default_priority(void);
-extern void ipic_enable_mcp(enum ipic_mcp_irq mcp_irq);
-extern void ipic_disable_mcp(enum ipic_mcp_irq mcp_irq);
-extern u32 ipic_get_mcp_status(void);
-extern void ipic_clear_mcp_status(u32 mask);
-extern int ipic_get_irq(struct pt_regs *regs);
-
-#endif /* __ASM_IPIC_H__ */
-#endif /* __KERNEL__ */
diff --git a/include/asm-ppc/machdep.h b/include/asm-ppc/machdep.h
index f01255bd1dc3..39200def8d11 100644
--- a/include/asm-ppc/machdep.h
+++ b/include/asm-ppc/machdep.h
@@ -35,8 +35,10 @@ struct machdep_calls {
         int             (*get_irq)(struct pt_regs *);
         
         /* A general init function, called by ppc_init in init/main.c.
-           May be NULL. */
+           May be NULL. DEPRECATED ! */
         void            (*init)(void);
+        /* For compatibility with merged platforms */
+        void            (*init_early)(void);
 
         void            (*restart)(char *cmd);
         void            (*power_off)(void);
diff --git a/include/asm-ppc/mpc52xx.h b/include/asm-ppc/mpc52xx.h
index e5f80c22fbfc..a055e0756b9d 100644
--- 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                                               */
 /* ======================================================================== */
@@ -107,7 +118,7 @@ enum ppc_sys_devices {
 #define MPC52xx_SDMA_IRQ_NUM    17
 #define MPC52xx_PERP_IRQ_NUM    23
 
-#define MPC52xx_CRIT_IRQ_BASE   0
+#define MPC52xx_CRIT_IRQ_BASE   1
 #define MPC52xx_MAIN_IRQ_BASE   (MPC52xx_CRIT_IRQ_BASE + MPC52xx_CRIT_IRQ_NUM)
 #define MPC52xx_SDMA_IRQ_BASE   (MPC52xx_MAIN_IRQ_BASE + MPC52xx_MAIN_IRQ_NUM)
 #define MPC52xx_PERP_IRQ_BASE   (MPC52xx_SDMA_IRQ_BASE + MPC52xx_SDMA_IRQ_NUM)
diff --git a/include/asm-ppc/mpc85xx.h b/include/asm-ppc/mpc85xx.h
index 9d14baea3d71..c8a96aa44fb7 100644
--- a/include/asm-ppc/mpc85xx.h
+++ b/include/asm-ppc/mpc85xx.h
@@ -37,6 +37,10 @@
 #ifdef CONFIG_STX_GP3
 #include <platforms/85xx/stx_gp3.h>
 #endif
+#if defined(CONFIG_TQM8540) || defined(CONFIG_TQM8541) || \
+        defined(CONFIG_TQM8555) || defined(CONFIG_TQM8560)
+#include <platforms/85xx/tqm85xx.h>
+#endif
 
 #define _IO_BASE        isa_io_base
 #define _ISA_MEM_BASE   isa_mem_base
diff --git a/include/asm-ppc/pci-bridge.h b/include/asm-ppc/pci-bridge.h
index e58c78f90a5a..9d5230689b31 100644
--- a/include/asm-ppc/pci-bridge.h
+++ b/include/asm-ppc/pci-bridge.h
@@ -137,5 +137,14 @@ static inline unsigned char bridge_swizzle(unsigned char pin,
  */
 extern int pciauto_bus_scan(struct pci_controller *, int);
 
+#ifdef CONFIG_PCI
+extern unsigned long pci_address_to_pio(phys_addr_t address);
+#else
+static inline unsigned long pci_address_to_pio(phys_addr_t address)
+{
+        return (unsigned long)-1;
+}
+#endif
+
 #endif
 #endif /* __KERNEL__ */
diff --git a/include/asm-ppc/prom.h b/include/asm-ppc/prom.h
index 3e39827ed566..6d431d6fb022 100644
--- a/include/asm-ppc/prom.h
+++ b/include/asm-ppc/prom.h
@@ -136,5 +136,45 @@ extern unsigned long sub_reloc_offset(unsigned long);
 #define PTRRELOC(x)     ((typeof(x))add_reloc_offset((unsigned long)(x)))
 #define PTRUNRELOC(x)   ((typeof(x))sub_reloc_offset((unsigned long)(x)))
 
+
+/*
+ * OF address retreival & translation
+ */
+
+
+/* Translate an OF address block into a CPU physical address
+ */
+#define OF_BAD_ADDR     ((u64)-1)
+extern u64 of_translate_address(struct device_node *np, u32 *addr);
+
+/* Extract an address from a device, returns the region size and
+ * the address space flags too. The PCI version uses a BAR number
+ * instead of an absolute index
+ */
+extern u32 *of_get_address(struct device_node *dev, int index,
+                           u64 *size, unsigned int *flags);
+extern u32 *of_get_pci_address(struct device_node *dev, int bar_no,
+                               u64 *size, unsigned int *flags);
+
+/* Get an address as a resource. Note that if your address is
+ * a PIO address, the conversion will fail if the physical address
+ * can't be internally converted to an IO token with
+ * pci_address_to_pio(), that is because it's either called to early
+ * or it can't be matched to any host bridge IO space
+ */
+extern int of_address_to_resource(struct device_node *dev, int index,
+                                  struct resource *r);
+extern int of_pci_address_to_resource(struct device_node *dev, int bar,
+                                      struct resource *r);
+
+#ifndef CONFIG_PPC_OF
+/*
+ * Fallback definitions for builds where we don't have prom.c included.
+ */
+#define machine_is_compatible(x)                0
+#define of_find_compatible_node(f, t, c)        NULL
+#define get_property(p, n, l)                   NULL
+#endif
+
 #endif /* _PPC_PROM_H */
 #endif /* __KERNEL__ */
diff --git a/include/asm-ppc/system.h b/include/asm-ppc/system.h
index bd99cb53a19f..fb49c0c49ea1 100644
--- a/include/asm-ppc/system.h
+++ b/include/asm-ppc/system.h
@@ -4,7 +4,6 @@
 #ifndef __PPC_SYSTEM_H
 #define __PPC_SYSTEM_H
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 
 #include <asm/atomic.h>
@@ -39,7 +38,7 @@
 #ifdef CONFIG_SMP
 #define smp_mb()        mb()
 #define smp_rmb()       rmb()
-#define smp_wmb()       wmb()
+#define smp_wmb()       __asm__ __volatile__ ("eieio" : : : "memory")
 #define smp_read_barrier_depends()      read_barrier_depends()
 #else
 #define smp_mb()        barrier()
@@ -74,6 +73,7 @@ extern void chrp_nvram_init(void);
 extern void read_rtc_time(void);
 extern void pmac_find_display(void);
 extern void giveup_fpu(struct task_struct *);
+extern void disable_kernel_fp(void);
 extern void enable_kernel_fp(void);
 extern void flush_fp_to_thread(struct task_struct *);
 extern void enable_kernel_altivec(void);
@@ -86,6 +86,14 @@ extern int fix_alignment(struct pt_regs *);
 extern void cvt_fd(float *from, double *to, struct thread_struct *thread);
 extern void cvt_df(double *from, float *to, struct thread_struct *thread);
 
+#ifndef CONFIG_SMP
+extern void discard_lazy_cpu_state(void);
+#else
+static inline void discard_lazy_cpu_state(void)
+{
+}
+#endif
+
 #ifdef CONFIG_ALTIVEC
 extern void flush_altivec_to_thread(struct task_struct *);
 #else
@@ -123,6 +131,16 @@ extern struct task_struct *__switch_to(struct task_struct *,
         struct task_struct *);
 #define switch_to(prev, next, last)     ((last) = __switch_to((prev), (next)))
 
+/*
+ * On SMP systems, when the scheduler does migration-cost autodetection,
+ * it needs a way to flush as much of the CPU's caches as possible.
+ *
+ * TODO: fill this in!
+ */
+static inline void sched_cacheflush(void)
+{
+}
+
 struct thread_struct;
 extern struct task_struct *_switch(struct thread_struct *prev,
                                    struct thread_struct *next);