Merge /spare/repo/linux-2.6/

79 files changed, 2913 insertions, 1443 deletions

diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 600f23d7fd..a7835cd3f5 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -88,6 +88,9 @@ config 8xx
         depends on BROKEN
         bool "8xx"
 
+config E200
+        bool "e200"
+
 config E500
         bool "e500"
 
@@ -98,12 +101,12 @@ config PPC_FPU
 
 config BOOKE
         bool
-        depends on E500
+        depends on E200 || E500
         default y
 
 config FSL_BOOKE
         bool
-        depends on E500
+        depends on E200 || E500
         default y
 
 config PTE_64BIT
@@ -141,16 +144,16 @@ config ALTIVEC
 
 config SPE
         bool "SPE Support"
-        depends on E500
+        depends on E200 || E500
         ---help---
           This option enables kernel support for the Signal Processing
           Extensions (SPE) to the PowerPC processor. The kernel currently
           supports saving and restoring SPE registers, and turning on the
           'spe enable' bit so user processes can execute SPE instructions.
 
-          This option is only usefully if you have a processor that supports
+          This option is only useful if you have a processor that supports
           SPE (e500, otherwise known as 85xx series), but does not have any
-          affect on a non-spe cpu (it does, however add code to the kernel).
+          effect on a non-spe cpu (it does, however add code to the kernel).
 
           If in doubt, say Y here.
 
@@ -200,7 +203,7 @@ config TAU_AVERAGE
 
 config MATH_EMULATION
         bool "Math emulation"
-        depends on 4xx || 8xx || E500
+        depends on 4xx || 8xx || E200 || E500
         ---help---
           Some PowerPC chips designed for embedded applications do not have
           a floating-point unit and therefore do not implement the
@@ -214,6 +217,26 @@ config MATH_EMULATION
           here.  Saying Y here will not hurt performance (on any machine) but
           will increase the size of the kernel.
 
+config KEXEC
+        bool "kexec system call (EXPERIMENTAL)"
+        depends on EXPERIMENTAL
+        help
+          kexec is a system call that implements the ability to shutdown your
+          current kernel, and to start another kernel.  It is like a reboot
+          but it is indepedent of the system firmware.   And like a reboot
+          you can start any kernel with it, not just Linux.
+
+          The name comes from the similiarity to the exec system call.
+
+          It is an ongoing process to be certain the hardware in a machine
+          is properly shutdown, so do not be surprised if this code does not
+          initially work for you.  It may help to enable device hotplugging
+          support.  As of this writing the exact hardware interface is
+          strongly in flux, so no good recommendation can be made.
+
+          In the GameCube implementation, kexec allows you to load and
+          run DOL files, including kernel and homebrew DOLs.
+
 source "drivers/cpufreq/Kconfig"
 
 config CPU_FREQ_PMAC
@@ -254,7 +277,7 @@ config PPC_STD_MMU
 
 config NOT_COHERENT_CACHE
         bool
-        depends on 4xx || 8xx
+        depends on 4xx || 8xx || E200
         default y
 
 endmenu
@@ -826,11 +849,6 @@ config MPC10X_BRIDGE
         depends on PCORE || POWERPMC250 || LOPEC || SANDPOINT
         default y
 
-config FSL_OCP
-        bool
-        depends on MPC10X_BRIDGE
-        default y
-
 config MPC10X_OPENPIC
         bool
         depends on POWERPMC250 || LOPEC || SANDPOINT
@@ -910,6 +928,8 @@ config PREEMPT
 config HIGHMEM
         bool "High memory support"
 
+source "mm/Kconfig"
+
 source "fs/Kconfig.binfmt"
 
 config PROC_DEVICETREE
@@ -1083,6 +1103,23 @@ source "drivers/zorro/Kconfig"
 
 source kernel/power/Kconfig
 
+config SECCOMP
+        bool "Enable seccomp to safely compute untrusted bytecode"
+        depends on PROC_FS
+        default y
+        help
+          This kernel feature is useful for number crunching applications
+          that may need to compute untrusted bytecode during their
+          execution. By using pipes or other transports made available to
+          the process as file descriptors supporting the read/write
+          syscalls, it's possible to isolate those applications in
+          their own address space using seccomp. Once seccomp is
+          enabled via /proc/<pid>/seccomp, it cannot be disabled
+          and the task is only allowed to execute a few safe syscalls
+          defined by each seccomp mode.
+
+          If unsure, say Y. Only embedded should say N here.
+
 endmenu
 
 config ISA_DMA_API
@@ -1143,12 +1180,12 @@ config PCI_QSPAN
 
 config PCI_8260
         bool
-        depends on PCI && 8260 && !8272
+        depends on PCI && 8260
         default y
 
 config 8260_PCI9
         bool "  Enable workaround for MPC826x erratum PCI 9"
-        depends on PCI_8260
+        depends on PCI_8260 && !ADS8272
         default y
 
 choice
diff --git a/arch/ppc/Kconfig.debug b/arch/ppc/Kconfig.debug
index d2e1eea8e8..e16c7710d4 100644
--- a/arch/ppc/Kconfig.debug
+++ b/arch/ppc/Kconfig.debug
@@ -66,7 +66,7 @@ config SERIAL_TEXT_DEBUG
 
 config PPC_OCP
         bool
-        depends on IBM_OCP || FSL_OCP || XILINX_OCP
+        depends on IBM_OCP || XILINX_OCP
         default y
 
 endmenu
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index 0432a25b47..f9b0d778dd 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -29,7 +29,7 @@ CPP		= $(CC) -E $(CFLAGS)
 
 CHECKFLAGS      += -D__powerpc__
 
-ifndef CONFIG_E500
+ifndef CONFIG_FSL_BOOKE
 CFLAGS          += -mstring
 endif
 
@@ -38,6 +38,7 @@ cpu-as-$(CONFIG_4xx)		+= -Wa,-m405
 cpu-as-$(CONFIG_6xx)            += -Wa,-maltivec
 cpu-as-$(CONFIG_POWER4)         += -Wa,-maltivec
 cpu-as-$(CONFIG_E500)           += -Wa,-me500
+cpu-as-$(CONFIG_E200)           += -Wa,-me200
 
 AFLAGS += $(cpu-as-y)
 CFLAGS += $(cpu-as-y)
diff --git a/arch/ppc/boot/images/Makefile b/arch/ppc/boot/images/Makefile
index f850fb0fb5..c9ac5f5fa9 100644
--- a/arch/ppc/boot/images/Makefile
+++ b/arch/ppc/boot/images/Makefile
@@ -22,7 +22,8 @@ targets += uImage
 $(obj)/uImage: $(obj)/vmlinux.gz
         $(Q)rm -f $@
         $(call if_changed,uimage)
-        @echo '  Image: $@' $(if $(wildcard $@),'is ready','not made')
+        @echo -n '  Image: $@ '
+        @if [ -f $@ ]; then echo 'is ready' ; else echo 'not made'; fi
 
 # Files generated that shall be removed upon make clean
 clean-files     := sImage vmapus vmlinux* miboot* zImage* uImage
diff --git a/arch/ppc/boot/ld.script b/arch/ppc/boot/ld.script
index 6ee602d8b6..9362193742 100644
--- a/arch/ppc/boot/ld.script
+++ b/arch/ppc/boot/ld.script
@@ -58,9 +58,6 @@ SECTIONS
     *(.ramdisk)
     __ramdisk_end = .;
     . = ALIGN(4096);
-    __sysmap_begin = .;
-    *(.sysmap)
-    __sysmap_end = .;
     CONSTRUCTORS
   }
   _edata  =  .;
diff --git a/arch/ppc/boot/openfirmware/Makefile b/arch/ppc/boot/openfirmware/Makefile
index 4eacbd8c77..03415238fa 100644
--- a/arch/ppc/boot/openfirmware/Makefile
+++ b/arch/ppc/boot/openfirmware/Makefile
@@ -54,13 +54,10 @@ $(images)/ramdisk.image.gz:
         @echo '          RAM disk image must be provided separately'
         @/bin/false
 
-objcpxmon-$(CONFIG_XMON) := --add-section=.sysmap=System.map \
-        --set-section-flags=.sysmap=contents,alloc,load,readonly,data
 quiet_cmd_genimage = GEN     $@
       cmd_genimage = $(OBJCOPY) -R .comment       \
         --add-section=.image=$(images)/vmlinux.gz \
-        --set-section-flags=.image=contents,alloc,load,readonly,data \
-        $(objcpxmon-y) $< $@
+        --set-section-flags=.image=contents,alloc,load,readonly,data $< $@
 
 targets += image.o
 $(obj)/image.o: $(obj)/dummy.o $(images)/vmlinux.gz FORCE
diff --git a/arch/ppc/boot/openfirmware/chrpmain.c b/arch/ppc/boot/openfirmware/chrpmain.c
index 6fb4f73872..effe4a0624 100644
--- a/arch/ppc/boot/openfirmware/chrpmain.c
+++ b/arch/ppc/boot/openfirmware/chrpmain.c
@@ -39,7 +39,7 @@ char *avail_high;
 
 #define SCRATCH_SIZE    (128 << 10)
 
-static char scratch[SCRATCH_SIZE];      /* 1MB of scratch space for gunzip */
+static char scratch[SCRATCH_SIZE];      /* 128k of scratch space for gunzip */
 
 typedef void (*kernel_start_t)(int, int, void *, unsigned int, unsigned int);
 
diff --git a/arch/ppc/boot/openfirmware/common.c b/arch/ppc/boot/openfirmware/common.c
index 9e6952781f..0f46756a90 100644
--- a/arch/ppc/boot/openfirmware/common.c
+++ b/arch/ppc/boot/openfirmware/common.c
@@ -15,7 +15,6 @@
 #include <asm/page.h>
 
 /* Information from the linker */
-extern char __sysmap_begin, __sysmap_end;
 
 extern int strcmp(const char *s1, const char *s2);
 extern char *avail_ram, *avail_high;
@@ -116,14 +115,8 @@ void gunzip(void *dst, int dstlen, unsigned char *src, int *lenp)
 void make_bi_recs(unsigned long addr, char *name, unsigned int mach,
                 unsigned long progend)
 {
-        unsigned long sysmap_size;
         struct bi_record *rec;
 
-        /* Figure out the size of a possible System.map we're going to
-         * pass along.
-         * */
-        sysmap_size = (unsigned long)(&__sysmap_end) -
-                (unsigned long)(&__sysmap_begin);
 
         /* leave a 1MB gap then align to the next 1MB boundary */
         addr = _ALIGN(addr+ (1<<20) - 1, (1<<20));
@@ -147,15 +140,6 @@ void make_bi_recs(unsigned long addr, char *name, unsigned int mach,
         rec->size = sizeof(struct bi_record) + 2 * sizeof(unsigned long);
         rec = (struct bi_record *)((unsigned long)rec + rec->size);
 
-        if (sysmap_size) {
-                rec->tag = BI_SYSMAP;
-                rec->data[0] = (unsigned long)(&__sysmap_begin);
-                rec->data[1] = sysmap_size;
-                rec->size = sizeof(struct bi_record) + 2 *
-                        sizeof(unsigned long);
-                rec = (struct bi_record *)((unsigned long)rec + rec->size);
-        }
-
         rec->tag = BI_LAST;
         rec->size = sizeof(struct bi_record);
         rec = (struct bi_record *)((unsigned long)rec + rec->size);
diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
index c28061ad59..991b4cbb83 100644
--- a/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile
@@ -203,7 +203,7 @@ $(obj)/zvmlinux: $(OBJS) $(LIBS) $(srctree)/$(boot)/ld.script \
                 $(obj)/dummy.o $(obj)/image.o
         $(LD) $(LD_ARGS) -o $@ $(OBJS) $(obj)/image.o $(LIBS)
         $(OBJCOPY) $(OBJCOPY_ARGS) $@ $@ -R .comment -R .stab \
-                -R .stabstr -R .ramdisk -R .sysmap
+                -R .stabstr -R .ramdisk
 
 $(obj)/zvmlinux.initrd: $(OBJS) $(LIBS) $(srctree)/$(boot)/ld.script \
                 $(images)/vmlinux.gz $(obj)/dummy.o
@@ -215,7 +215,7 @@ $(obj)/zvmlinux.initrd: $(OBJS) $(LIBS) $(srctree)/$(boot)/ld.script \
                 $(obj)/dummy.o $(obj)/image.o
         $(LD) $(LD_ARGS) -o $@ $(OBJS) $(obj)/image.o $(LIBS)
         $(OBJCOPY) $(OBJCOPY_ARGS) $@ $@ -R .comment -R .stab \
-                -R .stabstr -R .sysmap
+                -R .stabstr
 
 # Sort-of dummy rules, that let us format the image we want.
 zImage: $(images)/$(zimage-y) $(obj)/zvmlinux
diff --git a/arch/ppc/boot/simple/misc.c b/arch/ppc/boot/simple/misc.c
index ab0f9902cb..e02de5b467 100644
--- a/arch/ppc/boot/simple/misc.c
+++ b/arch/ppc/boot/simple/misc.c
@@ -222,7 +222,7 @@ decompress_kernel(unsigned long load_addr, int num_words, unsigned long cksum)
         puts("\n");
 
         puts("Uncompressing Linux...");
-        gunzip(0x0, 0x400000, zimage_start, &zimage_size);
+        gunzip(NULL, 0x400000, zimage_start, &zimage_size);
         puts("done.\n");
 
         /* get the bi_rec address */
diff --git a/arch/ppc/boot/simple/mpc10x_memory.c b/arch/ppc/boot/simple/mpc10x_memory.c
index 977daedc14..20d92a34ce 100644
--- a/arch/ppc/boot/simple/mpc10x_memory.c
+++ b/arch/ppc/boot/simple/mpc10x_memory.c
@@ -33,7 +33,7 @@
 
 #define MPC10X_PCI_OP(rw, size, type, op, mask)                         \
 static void                                                             \
-mpc10x_##rw##_config_##size(unsigned int *cfg_addr,                     \
+mpc10x_##rw##_config_##size(unsigned int __iomem *cfg_addr,                     \
                 unsigned int *cfg_data, int devfn, int offset,          \
                 type val)                                               \
 {                                                                       \
diff --git a/arch/ppc/boot/utils/addSystemMap.c b/arch/ppc/boot/utils/addSystemMap.c
deleted file mode 100644
index 4654f891b2..0000000000
--- a/arch/ppc/boot/utils/addSystemMap.c
+++ /dev/null
@@ -1,186 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <byteswap.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-void xlate( char * inb, char * trb, unsigned len )
-{
-    unsigned i;
-    for (  i=0; i<len; ++i ) {
-        char c = *inb++;
-        char c1 = c >> 4;
-        char c2 = c & 0xf;
-        if ( c1 > 9 )
-            c1 = c1 + 'A' - 10;
-        else
-            c1 = c1 + '0';
-        if ( c2 > 9 )
-            c2 = c2 + 'A' - 10;
-        else
-            c2 = c2 + '0';
-        *trb++ = c1;
-        *trb++ = c2;
-    }
-    *trb = 0;
-}
-
-#define ElfHeaderSize  (64 * 1024)
-#define ElfPages  (ElfHeaderSize / 4096)
-#define KERNELBASE (0xc0000000)
-
-void get4k( /*istream *inf*/FILE *file, char *buf )
-{
-    unsigned j;
-    unsigned num = fread(buf, 1, 4096, file);
-    for (  j=num; j<4096; ++j )
-        buf[j] = 0;
-}
-
-void put4k( /*ostream *outf*/FILE *file, char *buf )
-{
-    fwrite(buf, 1, 4096, file);
-}
-
-int main(int argc, char **argv)
-{
-    char inbuf[4096];
-    FILE *ramDisk = NULL;
-    FILE *inputVmlinux = NULL;
-    FILE *outputVmlinux = NULL;
-    unsigned i = 0;
-    unsigned long ramFileLen = 0;
-    unsigned long ramLen = 0;
-    unsigned long roundR = 0;
-    unsigned long kernelLen = 0;
-    unsigned long actualKernelLen = 0;
-    unsigned long round = 0;
-    unsigned long roundedKernelLen = 0;
-    unsigned long ramStartOffs = 0;
-    unsigned long ramPages = 0;
-    unsigned long roundedKernelPages = 0;
-    if ( argc < 2 ) {
-        printf("Name of System Map file missing.\n");
-        exit(1);
-    }
-
-    if ( argc < 3 ) {
-        printf("Name of vmlinux file missing.\n");
-        exit(1);
-    }
-
-    if ( argc < 4 ) {
-        printf("Name of vmlinux output file missing.\n");
-        exit(1);
-    }
-
-    ramDisk = fopen(argv[1], "r");
-    if ( ! ramDisk ) {
-        printf("System Map file \"%s\" failed to open.\n", argv[1]);
-        exit(1);
-    }
-    inputVmlinux = fopen(argv[2], "r");
-    if ( ! inputVmlinux ) {
-        printf("vmlinux file \"%s\" failed to open.\n", argv[2]);
-        exit(1);
-    }
-    outputVmlinux = fopen(argv[3], "w");
-    if ( ! outputVmlinux ) {
-        printf("output vmlinux file \"%s\" failed to open.\n", argv[3]);
-        exit(1);
-    }
-    fseek(ramDisk, 0, SEEK_END);
-    ramFileLen = ftell(ramDisk);
-    fseek(ramDisk, 0, SEEK_SET);
-    printf("%s file size = %ld\n", argv[1], ramFileLen);
-
-    ramLen = ramFileLen;
-
-    roundR = 4096 - (ramLen % 4096);
-    if ( roundR ) {
-        printf("Rounding System Map file up to a multiple of 4096, adding %ld\n", roundR);
-        ramLen += roundR;
-    }
-
-    printf("Rounded System Map size is %ld\n", ramLen);
-    fseek(inputVmlinux, 0, SEEK_END);
-    kernelLen = ftell(inputVmlinux);
-    fseek(inputVmlinux, 0, SEEK_SET);
-    printf("kernel file size = %ld\n", kernelLen);
-    if ( kernelLen == 0 ) {
-        printf("You must have a linux kernel specified as argv[2]\n");
-        exit(1);
-    }
-
-    actualKernelLen = kernelLen - ElfHeaderSize;
-
-    printf("actual kernel length (minus ELF header) = %ld\n", actualKernelLen);
-
-    round = actualKernelLen % 4096;
-    roundedKernelLen = actualKernelLen;
-    if ( round )
-        roundedKernelLen += (4096 - round);
-
-    printf("actual kernel length rounded up to a 4k multiple = %ld\n", roundedKernelLen);
-
-    ramStartOffs = roundedKernelLen;
-    ramPages = ramLen / 4096;
-
-    printf("System map pages to copy = %ld\n", ramPages);
-
-    // Copy 64K ELF header
-      for (i=0; i<(ElfPages); ++i) {
-          get4k( inputVmlinux, inbuf );
-          put4k( outputVmlinux, inbuf );
-      }
-
-
-
-    roundedKernelPages = roundedKernelLen / 4096;
-
-    fseek(inputVmlinux, ElfHeaderSize, SEEK_SET);
-
-    {
-        for ( i=0; i<roundedKernelPages; ++i ) {
-            get4k( inputVmlinux, inbuf );
-            if ( i == 0 ) {
-                unsigned long * p;
-                printf("Storing embedded_sysmap_start at 0x3c\n");
-                p = (unsigned long *)(inbuf + 0x3c);
-
-#if (BYTE_ORDER == __BIG_ENDIAN)
-                *p = ramStartOffs;
-#else
-                *p = bswap_32(ramStartOffs);
-#endif
-
-                printf("Storing embedded_sysmap_end at 0x44\n");
-                p = (unsigned long *)(inbuf + 0x44);
-#if (BYTE_ORDER == __BIG_ENDIAN)
-                *p = ramStartOffs + ramFileLen;
-#else
-                *p = bswap_32(ramStartOffs + ramFileLen);
-#endif
-            }
-            put4k( outputVmlinux, inbuf );
-        }
-    }
-
-    {
-        for ( i=0; i<ramPages; ++i ) {
-            get4k( ramDisk, inbuf );
-            put4k( outputVmlinux, inbuf );
-        }
-    }
-
-
-    fclose(ramDisk);
-    fclose(inputVmlinux);
-    fclose(outputVmlinux);
-    /* Set permission to executable */
-    chmod(argv[3], S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH);
-
-    return 0;
-
-}
-
diff --git a/arch/ppc/configs/mpc8548_cds_defconfig b/arch/ppc/configs/mpc8548_cds_defconfig
new file mode 100644
index 0000000000..abe034f24b
--- /dev/null
+++ b/arch/ppc/configs/mpc8548_cds_defconfig
@@ -0,0 +1,659 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.12-rc4
+# Tue May 24 22:36:27 2005
+#
+CONFIG_MMU=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_HAVE_DEC_LOCK=y
+CONFIG_PPC=y
+CONFIG_PPC32=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+# CONFIG_HOTPLUG is not set
+CONFIG_KOBJECT_UEVENT=y
+# CONFIG_IKCONFIG is not set
+CONFIG_EMBEDDED=y
+# CONFIG_KALLSYMS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+# CONFIG_EPOLL is not set
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+
+#
+# Loadable module support
+#
+# CONFIG_MODULES is not set
+
+#
+# Processor
+#
+# CONFIG_6xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_POWER3 is not set
+# CONFIG_POWER4 is not set
+# CONFIG_8xx is not set
+CONFIG_E500=y
+CONFIG_BOOKE=y
+CONFIG_FSL_BOOKE=y
+# CONFIG_PHYS_64BIT is not set
+CONFIG_SPE=y
+CONFIG_MATH_EMULATION=y
+# CONFIG_CPU_FREQ is not set
+# CONFIG_PM is not set
+CONFIG_85xx=y
+CONFIG_PPC_INDIRECT_PCI_BE=y
+
+#
+# Freescale 85xx options
+#
+# CONFIG_MPC8540_ADS is not set
+CONFIG_MPC8548_CDS=y
+# CONFIG_MPC8555_CDS is not set
+# CONFIG_MPC8560_ADS is not set
+# CONFIG_SBC8560 is not set
+# CONFIG_STX_GP3 is not set
+CONFIG_MPC8548=y
+
+#
+# Platform options
+#
+# CONFIG_SMP is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+# CONFIG_PCI is not set
+# CONFIG_PCI_DOMAINS is not set
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_TASK_SIZE=0x80000000
+CONFIG_BOOT_LOAD=0x00800000
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=32768
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_LBD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_SCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# I2O device support
+#
+
+#
+# Macintosh device drivers
+#
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_IP_TCPDIAG=y
+# CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETFILTER is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+
+#
+# Ethernet (1000 Mbit)
+#
+CONFIG_GIANFAR=y
+CONFIG_GFAR_NAPI=y
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_NVRAM is not set
+CONFIG_GEN_RTC=y
+# CONFIG_GEN_RTC_X is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+# CONFIG_I2C_ALGOBIT is not set
+# CONFIG_I2C_ALGOPCF is not set
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ISA is not set
+CONFIG_I2C_MPC=y
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Hardware Sensors Chip support
+#
+# CONFIG_I2C_SENSOR is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+
+#
+# Other I2C Chip support
+#
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_M41T00 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+
+#
+# XFS support
+#
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+# CONFIG_DEVFS_FS is not set
+# CONFIG_DEVPTS_FS_XATTR is not set
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_XATTR is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+# CONFIG_NFS_V3 is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+# CONFIG_MSDOS_PARTITION is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Hardware crypto devices
+#
diff --git a/arch/ppc/configs/mpc8555_cds_defconfig b/arch/ppc/configs/mpc8555_cds_defconfig
index 728bd9e1a8..15abebf46b 100644
--- a/arch/ppc/configs/mpc8555_cds_defconfig
+++ b/arch/ppc/configs/mpc8555_cds_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.11-rc1
-# Thu Jan 20 01:25:35 2005
+# Linux kernel version: 2.6.12-rc4
+# Tue May 17 11:56:01 2005
 #
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -11,6 +11,7 @@ CONFIG_HAVE_DEC_LOCK=y
 CONFIG_PPC=y
 CONFIG_PPC32=y
 CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 
 #
 # Code maturity level options
@@ -18,6 +19,7 @@ CONFIG_GENERIC_NVRAM=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_CLEAN_COMPILE=y
 CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
 
 #
 # General setup
@@ -29,12 +31,14 @@ CONFIG_SYSVIPC=y
 # CONFIG_BSD_PROCESS_ACCT is not set
 CONFIG_SYSCTL=y
 # CONFIG_AUDIT is not set
-CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_HOTPLUG is not set
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
 CONFIG_EMBEDDED=y
 # CONFIG_KALLSYMS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_BASE_FULL=y
 CONFIG_FUTEX=y
 # CONFIG_EPOLL is not set
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
@@ -44,6 +48,7 @@ CONFIG_CC_ALIGN_LABELS=0
 CONFIG_CC_ALIGN_LOOPS=0
 CONFIG_CC_ALIGN_JUMPS=0
 # CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
 
 #
 # Loadable module support
@@ -62,10 +67,12 @@ CONFIG_CC_ALIGN_JUMPS=0
 CONFIG_E500=y
 CONFIG_BOOKE=y
 CONFIG_FSL_BOOKE=y
+# CONFIG_PHYS_64BIT is not set
 CONFIG_SPE=y
 CONFIG_MATH_EMULATION=y
 # CONFIG_CPU_FREQ is not set
 CONFIG_PPC_GEN550=y
+# CONFIG_PM is not set
 CONFIG_85xx=y
 CONFIG_PPC_INDIRECT_PCI_BE=y
 
@@ -76,6 +83,7 @@ CONFIG_PPC_INDIRECT_PCI_BE=y
 CONFIG_MPC8555_CDS=y
 # CONFIG_MPC8560_ADS is not set
 # CONFIG_SBC8560 is not set
+# CONFIG_STX_GP3 is not set
 CONFIG_MPC8555=y
 CONFIG_85xx_PCI2=y
 
@@ -90,6 +98,7 @@ CONFIG_CPM2=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 # CONFIG_CMDLINE_BOOL is not set
+CONFIG_ISA_DMA_API=y
 
 #
 # Bus options
@@ -105,10 +114,6 @@ CONFIG_PCI_NAMES=y
 # CONFIG_PCCARD is not set
 
 #
-# PC-card bridges
-#
-
-#
 # Advanced setup
 #
 # CONFIG_ADVANCED_OPTIONS is not set
@@ -180,7 +185,59 @@ CONFIG_IOSCHED_CFQ=y
 #
 # ATA/ATAPI/MFM/RLL support
 #
-# CONFIG_IDE is not set
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_BLK_DEV_HD is not set
 
 #
 # SCSI device support
@@ -220,7 +277,6 @@ CONFIG_NET=y
 #
 CONFIG_PACKET=y
 # CONFIG_PACKET_MMAP is not set
-# CONFIG_NETLINK_DEV is not set
 CONFIG_UNIX=y
 # CONFIG_NET_KEY is not set
 CONFIG_INET=y
@@ -370,14 +426,6 @@ CONFIG_INPUT=y
 # CONFIG_INPUT_EVBUG is not set
 
 #
-# Input I/O drivers
-#
-# CONFIG_GAMEPORT is not set
-CONFIG_SOUND_GAMEPORT=y
-# CONFIG_SERIO is not set
-# CONFIG_SERIO_I8042 is not set
-
-#
 # Input Device Drivers
 #
 # CONFIG_INPUT_KEYBOARD is not set
@@ -387,6 +435,13 @@ CONFIG_SOUND_GAMEPORT=y
 # CONFIG_INPUT_MISC is not set
 
 #
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+
+#
 # Character devices
 #
 # CONFIG_VT is not set
@@ -406,6 +461,7 @@ CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 # CONFIG_SERIAL_CPM is not set
+# CONFIG_SERIAL_JSM is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
@@ -434,6 +490,11 @@ CONFIG_GEN_RTC=y
 # CONFIG_RAW_DRIVER is not set
 
 #
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
 # I2C support
 #
 CONFIG_I2C=y
@@ -456,11 +517,11 @@ CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_AMD8111 is not set
 # CONFIG_I2C_I801 is not set
 # CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_ISA is not set
 CONFIG_I2C_MPC=y
 # CONFIG_I2C_NFORCE2 is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
 # CONFIG_SCx200_ACB is not set
@@ -483,7 +544,9 @@ CONFIG_I2C_MPC=y
 # CONFIG_SENSORS_ASB100 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
 # CONFIG_SENSORS_IT87 is not set
 # CONFIG_SENSORS_LM63 is not set
 # CONFIG_SENSORS_LM75 is not set
@@ -494,9 +557,11 @@ CONFIG_I2C_MPC=y
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
 # CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SIS5595 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
 # CONFIG_SENSORS_VIA686A is not set
 # CONFIG_SENSORS_W83781D is not set
@@ -506,10 +571,12 @@ CONFIG_I2C_MPC=y
 #
 # Other I2C Chip support
 #
+# CONFIG_SENSORS_DS1337 is not set
 # CONFIG_SENSORS_EEPROM is not set
 # CONFIG_SENSORS_PCF8574 is not set
 # CONFIG_SENSORS_PCF8591 is not set
 # CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_M41T00 is not set
 # CONFIG_I2C_DEBUG_CORE is not set
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
@@ -538,7 +605,6 @@ CONFIG_I2C_MPC=y
 # Graphics support
 #
 # CONFIG_FB is not set
-# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
 
 #
 # Sound
@@ -548,13 +614,9 @@ CONFIG_I2C_MPC=y
 #
 # USB support
 #
-# CONFIG_USB is not set
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
-
-#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
-#
+# CONFIG_USB is not set
 
 #
 # USB Gadget Support
@@ -585,6 +647,10 @@ CONFIG_JBD=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
+
+#
+# XFS support
+#
 # CONFIG_XFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -646,7 +712,6 @@ CONFIG_NFS_FS=y
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
-# CONFIG_EXPORTFS is not set
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -698,7 +763,9 @@ CONFIG_CRC32=y
 #
 # Kernel hacking
 #
+# CONFIG_PRINTK_TIME is not set
 # CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_KGDB_CONSOLE is not set
 # CONFIG_SERIAL_TEXT_DEBUG is not set
 
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index b284451802..b1457a8a9c 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -26,7 +26,10 @@ obj-$(CONFIG_KGDB)		+= ppc-stub.o
 obj-$(CONFIG_SMP)               += smp.o smp-tbsync.o
 obj-$(CONFIG_TAU)               += temp.o
 obj-$(CONFIG_ALTIVEC)           += vecemu.o vector.o
+ifndef CONFIG_E200
 obj-$(CONFIG_FSL_BOOKE)         += perfmon_fsl_booke.o
+endif
+obj-$(CONFIG_KEXEC)             += machine_kexec.o relocate_kernel.o
 
 ifndef CONFIG_MATH_EMULATION
 obj-$(CONFIG_8xx)               += softemu8xx.o
diff --git a/arch/ppc/kernel/cputable.c b/arch/ppc/kernel/cputable.c
index 8aa5e8c690..50936cda0a 100644
--- a/arch/ppc/kernel/cputable.c
+++ b/arch/ppc/kernel/cputable.c
@@ -838,6 +838,17 @@ struct cpu_spec	cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
         },
+        {       /* 405EP */
+                .pvr_mask               = 0xffff0000,
+                .pvr_value              = 0x51210000,
+                .cpu_name               = "405EP",
+                .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
+                        CPU_FTR_USE_TB,
+                .cpu_user_features      = PPC_FEATURE_32 |
+                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+        },
 
 #endif /* CONFIG_40x */
 #ifdef CONFIG_44x
@@ -892,7 +903,30 @@ struct cpu_spec	cpu_specs[] = {
                 .dcache_bsize           = 32,
         },
 #endif /* CONFIG_44x */
-#ifdef CONFIG_E500
+#ifdef CONFIG_FSL_BOOKE
+        {       /* e200z5 */
+                .pvr_mask               = 0xfff00000,
+                .pvr_value              = 0x81000000,
+                .cpu_name               = "e200z5",
+                /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
+                .cpu_features           = CPU_FTR_USE_TB,
+                .cpu_user_features      = PPC_FEATURE_32 |
+                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_EFP_SINGLE |
+                        PPC_FEATURE_UNIFIED_CACHE,
+                .dcache_bsize           = 32,
+        },
+        {       /* e200z6 */
+                .pvr_mask               = 0xfff00000,
+                .pvr_value              = 0x81100000,
+                .cpu_name               = "e200z6",
+                /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
+                .cpu_features           = CPU_FTR_USE_TB,
+                .cpu_user_features      = PPC_FEATURE_32 |
+                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_SPE_COMP |
+                        PPC_FEATURE_HAS_EFP_SINGLE |
+                        PPC_FEATURE_UNIFIED_CACHE,
+                .dcache_bsize           = 32,
+        },
         {       /* e500 */
                 .pvr_mask               = 0xffff0000,
                 .pvr_value              = 0x80200000,
@@ -907,6 +941,20 @@ struct cpu_spec	cpu_specs[] = {
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
         },
+        {       /* e500v2 */
+                .pvr_mask               = 0xffff0000,
+                .pvr_value              = 0x80210000,
+                .cpu_name               = "e500v2",
+                /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
+                .cpu_features           = CPU_FTR_SPLIT_ID_CACHE |
+                        CPU_FTR_USE_TB | CPU_FTR_BIG_PHYS,
+                .cpu_user_features      = PPC_FEATURE_32 |
+                        PPC_FEATURE_HAS_MMU | PPC_FEATURE_SPE_COMP |
+                        PPC_FEATURE_HAS_EFP_SINGLE | PPC_FEATURE_HAS_EFP_DOUBLE,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+                .num_pmcs               = 4,
+        },
 #endif
 #if !CLASSIC_PPC
         {       /* default match */
diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S
index 5f075dbc4e..d4df68629c 100644
--- a/arch/ppc/kernel/entry.S
+++ b/arch/ppc/kernel/entry.S
@@ -46,26 +46,28 @@
 
 #ifdef CONFIG_BOOKE
 #include "head_booke.h"
+#define TRANSFER_TO_HANDLER_EXC_LEVEL(exc_level)        \
+        mtspr   exc_level##_SPRG,r8;                    \
+        BOOKE_LOAD_EXC_LEVEL_STACK(exc_level);          \
+        lwz     r0,GPR10-INT_FRAME_SIZE(r8);            \
+        stw     r0,GPR10(r11);                          \
+        lwz     r0,GPR11-INT_FRAME_SIZE(r8);            \
+        stw     r0,GPR11(r11);                          \
+        mfspr   r8,exc_level##_SPRG
+
         .globl  mcheck_transfer_to_handler
 mcheck_transfer_to_handler:
-        mtspr   MCHECK_SPRG,r8
-        BOOKE_LOAD_MCHECK_STACK
-        lwz     r0,GPR10-INT_FRAME_SIZE(r8)
-        stw     r0,GPR10(r11)
-        lwz     r0,GPR11-INT_FRAME_SIZE(r8)
-        stw     r0,GPR11(r11)
-        mfspr   r8,MCHECK_SPRG
+        TRANSFER_TO_HANDLER_EXC_LEVEL(MCHECK)
+        b       transfer_to_handler_full
+
+        .globl  debug_transfer_to_handler
+debug_transfer_to_handler:
+        TRANSFER_TO_HANDLER_EXC_LEVEL(DEBUG)
         b       transfer_to_handler_full
 
         .globl  crit_transfer_to_handler
 crit_transfer_to_handler:
-        mtspr   CRIT_SPRG,r8
-        BOOKE_LOAD_CRIT_STACK
-        lwz     r0,GPR10-INT_FRAME_SIZE(r8)
-        stw     r0,GPR10(r11)
-        lwz     r0,GPR11-INT_FRAME_SIZE(r8)
-        stw     r0,GPR11(r11)
-        mfspr   r8,CRIT_SPRG
+        TRANSFER_TO_HANDLER_EXC_LEVEL(CRIT)
         /* fall through */
 #endif
 
@@ -202,7 +204,7 @@ _GLOBAL(DoSyscall)
         rlwinm  r11,r11,0,~_TIFL_FORCE_NOERROR
         stw     r11,TI_LOCAL_FLAGS(r10)
         lwz     r11,TI_FLAGS(r10)
-        andi.   r11,r11,_TIF_SYSCALL_TRACE
+        andi.   r11,r11,_TIF_SYSCALL_T_OR_A
         bne-    syscall_dotrace
 syscall_dotrace_cont:
         cmplwi  0,r0,NR_syscalls
@@ -237,7 +239,7 @@ ret_from_syscall:
         SYNC
         MTMSRD(r10)
         lwz     r9,TI_FLAGS(r12)
-        andi.   r0,r9,(_TIF_SYSCALL_TRACE|_TIF_SIGPENDING|_TIF_NEED_RESCHED)
+        andi.   r0,r9,(_TIF_SYSCALL_T_OR_A|_TIF_SIGPENDING|_TIF_NEED_RESCHED)
         bne-    syscall_exit_work
 syscall_exit_cont:
 #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
@@ -277,7 +279,8 @@ syscall_dotrace:
         SAVE_NVGPRS(r1)
         li      r0,0xc00
         stw     r0,TRAP(r1)
-        bl      do_syscall_trace
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      do_syscall_trace_enter
         lwz     r0,GPR0(r1)     /* Restore original registers */
         lwz     r3,GPR3(r1)
         lwz     r4,GPR4(r1)
@@ -291,7 +294,7 @@ syscall_dotrace:
 syscall_exit_work:
         stw     r6,RESULT(r1)   /* Save result */
         stw     r3,GPR3(r1)     /* Update return value */
-        andi.   r0,r9,_TIF_SYSCALL_TRACE
+        andi.   r0,r9,_TIF_SYSCALL_T_OR_A
         beq     5f
         ori     r10,r10,MSR_EE
         SYNC
@@ -303,7 +306,8 @@ syscall_exit_work:
         li      r4,0xc00
         stw     r4,TRAP(r1)
 4:
-        bl      do_syscall_trace
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      do_syscall_trace_leave
         REST_NVGPRS(r1)
 2:
         lwz     r3,GPR3(r1)
@@ -627,8 +631,8 @@ sigreturn_exit:
         subi    r1,r3,STACK_FRAME_OVERHEAD
         rlwinm  r12,r1,0,0,18   /* current_thread_info() */
         lwz     r9,TI_FLAGS(r12)
-        andi.   r0,r9,_TIF_SYSCALL_TRACE
-        bnel-   do_syscall_trace
+        andi.   r0,r9,_TIF_SYSCALL_T_OR_A
+        bnel-   do_syscall_trace_leave
         /* fall through */
 
         .globl  ret_from_except_full
@@ -781,99 +785,68 @@ exc_exit_restart_end:
  * time of the critical interrupt.
  *
  */
-        .globl  ret_from_crit_exc
-ret_from_crit_exc:
-        REST_NVGPRS(r1)
-        lwz     r3,_MSR(r1)
-        andi.   r3,r3,MSR_PR
-        LOAD_MSR_KERNEL(r10,MSR_KERNEL)
-        bne     user_exc_return
-
-        lwz     r0,GPR0(r1)
-        lwz     r2,GPR2(r1)
-        REST_4GPRS(3, r1)
-        REST_2GPRS(7, r1)
-
-        lwz     r10,_XER(r1)
-        lwz     r11,_CTR(r1)
-        mtspr   SPRN_XER,r10
-        mtctr   r11
-
-        PPC405_ERR77(0,r1)
-        stwcx.  r0,0,r1                 /* to clear the reservation */
-
-        lwz     r11,_LINK(r1)
-        mtlr    r11
-        lwz     r10,_CCR(r1)
-        mtcrf   0xff,r10
 #ifdef CONFIG_40x
-        /* avoid any possible TLB misses here by turning off MSR.DR, we
-         * assume the instructions here are mapped by a pinned TLB entry */
-        li      r10,MSR_IR
-        mtmsr   r10
-        isync
-        tophys(r1, r1)
+#define PPC_40x_TURN_OFF_MSR_DR                                             \
+        /* avoid any possible TLB misses here by turning off MSR.DR, we     \
+         * assume the instructions here are mapped by a pinned TLB entry */ \
+        li      r10,MSR_IR;                                                 \
+        mtmsr   r10;                                                        \
+        isync;                                                              \
+        tophys(r1, r1);
+#else
+#define PPC_40x_TURN_OFF_MSR_DR
 #endif
-        lwz     r9,_DEAR(r1)
-        lwz     r10,_ESR(r1)
-        mtspr   SPRN_DEAR,r9
-        mtspr   SPRN_ESR,r10
-        lwz     r11,_NIP(r1)
-        lwz     r12,_MSR(r1)
-        mtspr   SPRN_CSRR0,r11
-        mtspr   SPRN_CSRR1,r12
-        lwz     r9,GPR9(r1)
-        lwz     r12,GPR12(r1)
-        lwz     r10,GPR10(r1)
-        lwz     r11,GPR11(r1)
-        lwz     r1,GPR1(r1)
-        PPC405_ERR77_SYNC
-        rfci
-        b       .               /* prevent prefetch past rfci */
 
-#ifdef CONFIG_BOOKE
-/*
- * Return from a machine check interrupt, similar to a critical
- * interrupt.
- */
-        .globl  ret_from_mcheck_exc
-ret_from_mcheck_exc:
-        REST_NVGPRS(r1)
-        lwz     r3,_MSR(r1)
-        andi.   r3,r3,MSR_PR
-        LOAD_MSR_KERNEL(r10,MSR_KERNEL)
-        bne     user_exc_return
-
-        lwz     r0,GPR0(r1)
-        lwz     r2,GPR2(r1)
-        REST_4GPRS(3, r1)
-        REST_2GPRS(7, r1)
+#define RET_FROM_EXC_LEVEL(exc_lvl_srr0, exc_lvl_srr1, exc_lvl_rfi)     \
+        REST_NVGPRS(r1);                                                \
+        lwz     r3,_MSR(r1);                                            \
+        andi.   r3,r3,MSR_PR;                                           \
+        LOAD_MSR_KERNEL(r10,MSR_KERNEL);                                \
+        bne     user_exc_return;                                        \
+        lwz     r0,GPR0(r1);                                            \
+        lwz     r2,GPR2(r1);                                            \
+        REST_4GPRS(3, r1);                                              \
+        REST_2GPRS(7, r1);                                              \
+        lwz     r10,_XER(r1);                                           \
+        lwz     r11,_CTR(r1);                                           \
+        mtspr   SPRN_XER,r10;                                           \
+        mtctr   r11;                                                    \
+        PPC405_ERR77(0,r1);                                             \
+        stwcx.  r0,0,r1;                /* to clear the reservation */  \
+        lwz     r11,_LINK(r1);                                          \
+        mtlr    r11;                                                    \
+        lwz     r10,_CCR(r1);                                           \
+        mtcrf   0xff,r10;                                               \
+        PPC_40x_TURN_OFF_MSR_DR;                                        \
+        lwz     r9,_DEAR(r1);                                           \
+        lwz     r10,_ESR(r1);                                           \
+        mtspr   SPRN_DEAR,r9;                                           \
+        mtspr   SPRN_ESR,r10;                                           \
+        lwz     r11,_NIP(r1);                                           \
+        lwz     r12,_MSR(r1);                                           \
+        mtspr   exc_lvl_srr0,r11;                                       \
+        mtspr   exc_lvl_srr1,r12;                                       \
+        lwz     r9,GPR9(r1);                                            \
+        lwz     r12,GPR12(r1);                                          \
+        lwz     r10,GPR10(r1);                                          \
+        lwz     r11,GPR11(r1);                                          \
+        lwz     r1,GPR1(r1);                                            \
+        PPC405_ERR77_SYNC;                                              \
+        exc_lvl_rfi;                                                    \
+        b       .;              /* prevent prefetch past exc_lvl_rfi */
 
-        lwz     r10,_XER(r1)
-        lwz     r11,_CTR(r1)
-        mtspr   SPRN_XER,r10
-        mtctr   r11
+        .globl  ret_from_crit_exc
+ret_from_crit_exc:
+        RET_FROM_EXC_LEVEL(SPRN_CSRR0, SPRN_CSRR1, RFCI)
 
-        stwcx.  r0,0,r1                 /* to clear the reservation */
+#ifdef CONFIG_BOOKE
+        .globl  ret_from_debug_exc
+ret_from_debug_exc:
+        RET_FROM_EXC_LEVEL(SPRN_DSRR0, SPRN_DSRR1, RFDI)
 
-        lwz     r11,_LINK(r1)
-        mtlr    r11
-        lwz     r10,_CCR(r1)
-        mtcrf   0xff,r10
-        lwz     r9,_DEAR(r1)
-        lwz     r10,_ESR(r1)
-        mtspr   SPRN_DEAR,r9
-        mtspr   SPRN_ESR,r10
-        lwz     r11,_NIP(r1)
-        lwz     r12,_MSR(r1)
-        mtspr   SPRN_MCSRR0,r11
-        mtspr   SPRN_MCSRR1,r12
-        lwz     r9,GPR9(r1)
-        lwz     r12,GPR12(r1)
-        lwz     r10,GPR10(r1)
-        lwz     r11,GPR11(r1)
-        lwz     r1,GPR1(r1)
-        RFMCI
+        .globl  ret_from_mcheck_exc
+ret_from_mcheck_exc:
+        RET_FROM_EXC_LEVEL(SPRN_MCSRR0, SPRN_MCSRR1, RFMCI)
 #endif /* CONFIG_BOOKE */
 
 /*
diff --git a/arch/ppc/kernel/head_4xx.S b/arch/ppc/kernel/head_4xx.S
index 6f5d380e23..23fb51819b 100644
--- a/arch/ppc/kernel/head_4xx.S
+++ b/arch/ppc/kernel/head_4xx.S
@@ -291,8 +291,9 @@ label:
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
          */
-        andis.  r11, r10, 0x8000
-        beq     3f
+        lis     r11, TASK_SIZE@h
+        cmplw   r10, r11
+        blt+    3f
         lis     r11, swapper_pg_dir@h
         ori     r11, r11, swapper_pg_dir@l
         li      r9, 0
@@ -479,8 +480,9 @@ label:
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
          */
-        andis.  r11, r10, 0x8000
-        beq     3f
+        lis     r11, TASK_SIZE@h
+        cmplw   r10, r11
+        blt+    3f
         lis     r11, swapper_pg_dir@h
         ori     r11, r11, swapper_pg_dir@l
         li      r9, 0
@@ -578,8 +580,9 @@ label:
         /* If we are faulting a kernel address, we have to use the
          * kernel page tables.
          */
-        andis.  r11, r10, 0x8000
-        beq     3f
+        lis     r11, TASK_SIZE@h
+        cmplw   r10, r11
+        blt+    3f
         lis     r11, swapper_pg_dir@h
         ori     r11, r11, swapper_pg_dir@l
         li      r9, 0
diff --git a/arch/ppc/kernel/head_booke.h b/arch/ppc/kernel/head_booke.h
index f213d12eec..9342acf12e 100644
--- a/arch/ppc/kernel/head_booke.h
+++ b/arch/ppc/kernel/head_booke.h
@@ -49,6 +49,7 @@
  *
  * On 40x critical is the only additional level
  * On 44x/e500 we have critical and machine check
+ * On e200 we have critical and debug (machine check occurs via critical)
  *
  * Additionally we reserve a SPRG for each priority level so we can free up a
  * GPR to use as the base for indirect access to the exception stacks.  This
@@ -60,53 +61,47 @@
 
 /* CRIT_SPRG only used in critical exception handling */
 #define CRIT_SPRG       SPRN_SPRG2
-/* MCHECK_SPRG only used in critical exception handling */
+/* MCHECK_SPRG only used in machine check exception handling */
 #define MCHECK_SPRG     SPRN_SPRG6W
 
 #define MCHECK_STACK_TOP        (exception_stack_top - 4096)
 #define CRIT_STACK_TOP          (exception_stack_top)
 
+/* only on e200 for now */
+#define DEBUG_STACK_TOP         (exception_stack_top - 4096)
+#define DEBUG_SPRG              SPRN_SPRG6W
+
 #ifdef CONFIG_SMP
-#define BOOKE_LOAD_CRIT_STACK                           \
+#define BOOKE_LOAD_EXC_LEVEL_STACK(level)               \
         mfspr   r8,SPRN_PIR;                            \
         mulli   r8,r8,BOOKE_EXCEPTION_STACK_SIZE;       \
         neg     r8,r8;                                  \
-        addis   r8,r8,CRIT_STACK_TOP@ha;                \
-        addi    r8,r8,CRIT_STACK_TOP@l
-#define BOOKE_LOAD_MCHECK_STACK                         \
-        mfspr   r8,SPRN_PIR;                            \
-        mulli   r8,r8,BOOKE_EXCEPTION_STACK_SIZE;       \
-        neg     r8,r8;                                  \
-        addis   r8,r8,MCHECK_STACK_TOP@ha;              \
-        addi    r8,r8,MCHECK_STACK_TOP@l
+        addis   r8,r8,level##_STACK_TOP@ha;             \
+        addi    r8,r8,level##_STACK_TOP@l
 #else
-#define BOOKE_LOAD_CRIT_STACK                           \
-        lis     r8,CRIT_STACK_TOP@h;                    \
-        ori     r8,r8,CRIT_STACK_TOP@l
-#define BOOKE_LOAD_MCHECK_STACK                         \
-        lis     r8,MCHECK_STACK_TOP@h;                  \
-        ori     r8,r8,MCHECK_STACK_TOP@l
+#define BOOKE_LOAD_EXC_LEVEL_STACK(level)               \
+        lis     r8,level##_STACK_TOP@h;                 \
+        ori     r8,r8,level##_STACK_TOP@l
 #endif
 
 /*
- * Exception prolog for critical exceptions.  This is a little different
- * from the normal exception prolog above since a critical exception
- * can potentially occur at any point during normal exception processing.
- * Thus we cannot use the same SPRG registers as the normal prolog above.
- * Instead we use a portion of the critical exception stack at low physical
- * addresses.
+ * Exception prolog for critical/machine check exceptions.  This is a
+ * little different from the normal exception prolog above since a
+ * critical/machine check exception can potentially occur at any point
+ * during normal exception processing. Thus we cannot use the same SPRG
+ * registers as the normal prolog above. Instead we use a portion of the
+ * critical/machine check exception stack at low physical addresses.
  */
-
-#define CRITICAL_EXCEPTION_PROLOG                                            \
-        mtspr   CRIT_SPRG,r8;                                                \
-        BOOKE_LOAD_CRIT_STACK;          /* r8 points to the crit stack */    \
+#define EXC_LEVEL_EXCEPTION_PROLOG(exc_level, exc_level_srr0, exc_level_srr1) \
+        mtspr   exc_level##_SPRG,r8;                                         \
+        BOOKE_LOAD_EXC_LEVEL_STACK(exc_level);/* r8 points to the exc_level stack*/ \
         stw     r10,GPR10-INT_FRAME_SIZE(r8);                                \
         stw     r11,GPR11-INT_FRAME_SIZE(r8);                                \
         mfcr    r10;                    /* save CR in r10 for now          */\
-        mfspr   r11,SPRN_CSRR1;         /* check whether user or kernel    */\
+        mfspr   r11,exc_level_srr1;     /* check whether user or kernel    */\
         andi.   r11,r11,MSR_PR;                                              \
         mr      r11,r8;                                                      \
-        mfspr   r8,CRIT_SPRG;                                                \
+        mfspr   r8,exc_level##_SPRG;                                         \
         beq     1f;                                                          \
         /* COMING FROM USER MODE */                                          \
         mfspr   r11,SPRN_SPRG3;         /* if from user, start at top of   */\
@@ -122,9 +117,9 @@
         stw     r12,_DEAR(r11);         /* since they may have had stuff   */\
         mfspr   r9,SPRN_ESR;            /* in them at the point where the  */\
         stw     r9,_ESR(r11);           /* exception was taken             */\
-        mfspr   r12,SPRN_CSRR0;                                              \
+        mfspr   r12,exc_level_srr0;                                          \
         stw     r1,GPR1(r11);                                                \
-        mfspr   r9,SPRN_CSRR1;                                               \
+        mfspr   r9,exc_level_srr1;                                           \
         stw     r1,0(r11);                                                   \
         mr      r1,r11;                                                      \
         rlwinm  r9,r9,0,14,12;          /* clear MSR_WE (necessary?)       */\
@@ -132,45 +127,12 @@
         SAVE_4GPRS(3, r11);                                                  \
         SAVE_2GPRS(7, r11)
 
-/*
- * Exception prolog for machine check exceptions.  This is similar to
- * the critical exception prolog, except that machine check exceptions
- * have their stack.
- */
-#define MCHECK_EXCEPTION_PROLOG                                      \
-        mtspr   MCHECK_SPRG,r8;                                              \
-        BOOKE_LOAD_MCHECK_STACK;        /* r8 points to the mcheck stack   */\
-        stw     r10,GPR10-INT_FRAME_SIZE(r8);                                \
-        stw     r11,GPR11-INT_FRAME_SIZE(r8);                                \
-        mfcr    r10;                    /* save CR in r10 for now          */\
-        mfspr   r11,SPRN_MCSRR1;        /* check whether user or kernel    */\
-        andi.   r11,r11,MSR_PR;                                              \
-        mr      r11,r8;                                                      \
-        mfspr   r8,MCHECK_SPRG;                                              \
-        beq     1f;                                                          \
-        /* COMING FROM USER MODE */                                          \
-        mfspr   r11,SPRN_SPRG3;         /* if from user, start at top of   */\
-        lwz     r11,THREAD_INFO-THREAD(r11); /* this thread's kernel stack */\
-        addi    r11,r11,THREAD_SIZE;                                         \
-1:      subi    r11,r11,INT_FRAME_SIZE; /* Allocate an exception frame     */\
-        stw     r10,_CCR(r11);          /* save various registers          */\
-        stw     r12,GPR12(r11);                                              \
-        stw     r9,GPR9(r11);                                                \
-        mflr    r10;                                                         \
-        stw     r10,_LINK(r11);                                              \
-        mfspr   r12,SPRN_DEAR;          /* save DEAR and ESR in the frame  */\
-        stw     r12,_DEAR(r11);         /* since they may have had stuff   */\
-        mfspr   r9,SPRN_ESR;            /* in them at the point where the  */\
-        stw     r9,_ESR(r11);           /* exception was taken             */\
-        mfspr   r12,SPRN_MCSRR0;                                             \
-        stw     r1,GPR1(r11);                                                \
-        mfspr   r9,SPRN_MCSRR1;                                              \
-        stw     r1,0(r11);                                                   \
-        mr      r1,r11;                                                      \
-        rlwinm  r9,r9,0,14,12;          /* clear MSR_WE (necessary?)       */\
-        stw     r0,GPR0(r11);                                                \
-        SAVE_4GPRS(3, r11);                                                  \
-        SAVE_2GPRS(7, r11)
+#define CRITICAL_EXCEPTION_PROLOG \
+                EXC_LEVEL_EXCEPTION_PROLOG(CRIT, SPRN_CSRR0, SPRN_CSRR1)
+#define DEBUG_EXCEPTION_PROLOG \
+                EXC_LEVEL_EXCEPTION_PROLOG(DEBUG, SPRN_DSRR0, SPRN_DSRR1)
+#define MCHECK_EXCEPTION_PROLOG \
+                EXC_LEVEL_EXCEPTION_PROLOG(MCHECK, SPRN_MCSRR0, SPRN_MCSRR1)
 
 /*
  * Exception vectors.
@@ -237,7 +199,6 @@ label:
         EXC_XFER_TEMPLATE(hdlr, n+1, MSR_KERNEL, COPY_EE, transfer_to_handler, \
                           ret_from_except)
 
-
 /* Check for a single step debug exception while in an exception
  * handler before state has been saved.  This is to catch the case
  * where an instruction that we are trying to single step causes
@@ -251,6 +212,60 @@ label:
  * save (and later restore) the MSR via SPRN_CSRR1, which will still have
  * the MSR_DE bit set.
  */
+#ifdef CONFIG_E200
+#define DEBUG_EXCEPTION                                                       \
+        START_EXCEPTION(Debug);                                               \
+        DEBUG_EXCEPTION_PROLOG;                                               \
+                                                                              \
+        /*                                                                    \
+         * If there is a single step or branch-taken exception in an          \
+         * exception entry sequence, it was probably meant to apply to        \
+         * the code where the exception occurred (since exception entry       \
+         * doesn't turn off DE automatically).  We simulate the effect        \
+         * of turning off DE on entry to an exception handler by turning      \
+         * off DE in the CSRR1 value and clearing the debug status.           \
+         */                                                                   \
+        mfspr   r10,SPRN_DBSR;          /* check single-step/branch taken */  \
+        andis.  r10,r10,DBSR_IC@h;                                            \
+        beq+    2f;                                                           \
+                                                                              \
+        lis     r10,KERNELBASE@h;       /* check if exception in vectors */   \
+        ori     r10,r10,KERNELBASE@l;                                         \
+        cmplw   r12,r10;                                                      \
+        blt+    2f;                     /* addr below exception vectors */    \
+                                                                              \
+        lis     r10,Debug@h;                                                  \
+        ori     r10,r10,Debug@l;                                              \
+        cmplw   r12,r10;                                                      \
+        bgt+    2f;                     /* addr above exception vectors */    \
+                                                                              \
+        /* here it looks like we got an inappropriate debug exception. */     \
+1:      rlwinm  r9,r9,0,~MSR_DE;        /* clear DE in the CDRR1 value */     \
+        lis     r10,DBSR_IC@h;          /* clear the IC event */              \
+        mtspr   SPRN_DBSR,r10;                                                \
+        /* restore state and get out */                                       \
+        lwz     r10,_CCR(r11);                                                \
+        lwz     r0,GPR0(r11);                                                 \
+        lwz     r1,GPR1(r11);                                                 \
+        mtcrf   0x80,r10;                                                     \
+        mtspr   SPRN_DSRR0,r12;                                               \
+        mtspr   SPRN_DSRR1,r9;                                                \
+        lwz     r9,GPR9(r11);                                                 \
+        lwz     r12,GPR12(r11);                                               \
+        mtspr   DEBUG_SPRG,r8;                                                \
+        BOOKE_LOAD_EXC_LEVEL_STACK(DEBUG); /* r8 points to the debug stack */ \
+        lwz     r10,GPR10-INT_FRAME_SIZE(r8);                                 \
+        lwz     r11,GPR11-INT_FRAME_SIZE(r8);                                 \
+        mfspr   r8,DEBUG_SPRG;                                                \
+                                                                              \
+        RFDI;                                                                 \
+        b       .;                                                            \
+                                                                              \
+        /* continue normal handling for a critical exception... */            \
+2:      mfspr   r4,SPRN_DBSR;                                                 \
+        addi    r3,r1,STACK_FRAME_OVERHEAD;                                   \
+        EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, debug_transfer_to_handler, ret_from_debug_exc)
+#else
 #define DEBUG_EXCEPTION                                                       \
         START_EXCEPTION(Debug);                                               \
         CRITICAL_EXCEPTION_PROLOG;                                            \
@@ -291,7 +306,7 @@ label:
         lwz     r9,GPR9(r11);                                                 \
         lwz     r12,GPR12(r11);                                               \
         mtspr   CRIT_SPRG,r8;                                                 \
-        BOOKE_LOAD_CRIT_STACK;          /* r8 points to the crit stack */     \
+        BOOKE_LOAD_EXC_LEVEL_STACK(CRIT); /* r8 points to the debug stack */  \
         lwz     r10,GPR10-INT_FRAME_SIZE(r8);                                 \
         lwz     r11,GPR11-INT_FRAME_SIZE(r8);                                 \
         mfspr   r8,CRIT_SPRG;                                                 \
@@ -303,6 +318,7 @@ label:
 2:      mfspr   r4,SPRN_DBSR;                                                 \
         addi    r3,r1,STACK_FRAME_OVERHEAD;                                   \
         EXC_XFER_TEMPLATE(DebugException, 0x2002, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, crit_transfer_to_handler, ret_from_crit_exc)
+#endif
 
 #define INSTRUCTION_STORAGE_EXCEPTION                                         \
         START_EXCEPTION(InstructionStorage)                                   \
diff --git a/arch/ppc/kernel/head_fsl_booke.S b/arch/ppc/kernel/head_fsl_booke.S
index f22ddce361..eb804b7a3c 100644
--- a/arch/ppc/kernel/head_fsl_booke.S
+++ b/arch/ppc/kernel/head_fsl_booke.S
@@ -102,6 +102,7 @@ invstr:	mflr	r6				/* Make it accessible */
         or      r7,r7,r4
         mtspr   SPRN_MAS6,r7
         tlbsx   0,r6                            /* search MSR[IS], SPID=PID0 */
+#ifndef CONFIG_E200
         mfspr   r7,SPRN_MAS1
         andis.  r7,r7,MAS1_VALID@h
         bne     match_TLB
@@ -118,6 +119,7 @@ invstr:	mflr	r6				/* Make it accessible */
         or      r7,r7,r4
         mtspr   SPRN_MAS6,r7
         tlbsx   0,r6                            /* Fall through, we had to match */
+#endif
 match_TLB:
         mfspr   r7,SPRN_MAS0
         rlwinm  r3,r7,16,20,31                  /* Extract MAS0(Entry) */
@@ -196,8 +198,10 @@ skpinv:	addi	r6,r6,1				/* Increment */
 /* 4. Clear out PIDs & Search info */
         li      r6,0
         mtspr   SPRN_PID0,r6
+#ifndef CONFIG_E200
         mtspr   SPRN_PID1,r6
         mtspr   SPRN_PID2,r6
+#endif
         mtspr   SPRN_MAS6,r6
 
 /* 5. Invalidate mapping we started in */
@@ -232,7 +236,8 @@ skpinv:	addi	r6,r6,1				/* Increment */
         tlbwe
 
 /* 7. Jump to KERNELBASE mapping */
-        li      r7,0
+        lis     r7,MSR_KERNEL@h
+        ori     r7,r7,MSR_KERNEL@l
         bl      1f                      /* Find our address */
 1:      mflr    r9
         rlwimi  r6,r9,0,20,31
@@ -276,7 +281,9 @@ skpinv:	addi	r6,r6,1				/* Increment */
         SET_IVOR(32, SPEUnavailable);
         SET_IVOR(33, SPEFloatingPointData);
         SET_IVOR(34, SPEFloatingPointRound);
+#ifndef CONFIG_E200
         SET_IVOR(35, PerformanceMonitor);
+#endif
 
         /* Establish the interrupt vector base */
         lis     r4,interrupt_base@h     /* IVPR only uses the high 16-bits */
@@ -284,6 +291,9 @@ skpinv:	addi	r6,r6,1				/* Increment */
 
         /* Setup the defaults for TLB entries */
         li      r2,(MAS4_TSIZED(BOOKE_PAGESZ_4K))@l
+#ifdef CONFIG_E200
+        oris    r2,r2,MAS4_TLBSELD(1)@h
+#endif
         mtspr   SPRN_MAS4, r2
 
 #if 0
@@ -292,6 +302,24 @@ skpinv:	addi	r6,r6,1				/* Increment */
         oris    r2,r2,HID0_DOZE@h
         mtspr   SPRN_HID0, r2
 #endif
+#ifdef CONFIG_E200
+        /* enable dedicated debug exception handling resources (Debug APU) */
+        mfspr   r2,SPRN_HID0
+        ori     r2,r2,HID0_DAPUEN@l
+        mtspr   SPRN_HID0,r2
+#endif
+
+#if !defined(CONFIG_BDI_SWITCH)
+        /*
+         * The Abatron BDI JTAG debugger does not tolerate others
+         * mucking with the debug registers.
+         */
+        lis     r2,DBCR0_IDM@h
+        mtspr   SPRN_DBCR0,r2
+        /* clear any residual debug events */
+        li      r2,-1
+        mtspr   SPRN_DBSR,r2
+#endif
 
         /*
          * This is where the main kernel code starts.
@@ -401,7 +429,12 @@ interrupt_base:
         CRITICAL_EXCEPTION(0x0100, CriticalInput, UnknownException)
 
         /* Machine Check Interrupt */
+#ifdef CONFIG_E200
+        /* no RFMCI, MCSRRs on E200 */
+        CRITICAL_EXCEPTION(0x0200, MachineCheck, MachineCheckException)
+#else
         MCHECK_EXCEPTION(0x0200, MachineCheck, MachineCheckException)
+#endif
 
         /* Data Storage Interrupt */
         START_EXCEPTION(DataStorage)
@@ -507,8 +540,13 @@ interrupt_base:
 #ifdef CONFIG_PPC_FPU
         FP_UNAVAILABLE_EXCEPTION
 #else
+#ifdef CONFIG_E200
+        /* E200 treats 'normal' floating point instructions as FP Unavail exception */
+        EXCEPTION(0x0800, FloatingPointUnavailable, ProgramCheckException, EXC_XFER_EE)
+#else
         EXCEPTION(0x0800, FloatingPointUnavailable, UnknownException, EXC_XFER_EE)
 #endif
+#endif
 
         /* System Call Interrupt */
         START_EXCEPTION(SystemCall)
@@ -678,6 +716,7 @@ interrupt_base:
 /*
  * Local functions
  */
+
         /*
          * Data TLB exceptions will bail out to this point
          * if they can't resolve the lightweight TLB fault.
@@ -748,6 +787,31 @@ END_FTR_SECTION_IFSET(CPU_FTR_BIG_PHYS)
 2:      rlwimi  r11, r12, 0, 20, 31     /* Extract RPN from PTE and merge with perms */
         mtspr   SPRN_MAS3, r11
 #endif
+#ifdef CONFIG_E200
+        /* Round robin TLB1 entries assignment */
+        mfspr   r12, SPRN_MAS0
+
+        /* Extract TLB1CFG(NENTRY) */
+        mfspr   r11, SPRN_TLB1CFG
+        andi.   r11, r11, 0xfff
+
+        /* Extract MAS0(NV) */
+        andi.   r13, r12, 0xfff
+        addi    r13, r13, 1
+        cmpw    0, r13, r11
+        addi    r12, r12, 1
+
+        /* check if we need to wrap */
+        blt     7f
+
+        /* wrap back to first free tlbcam entry */
+        lis     r13, tlbcam_index@ha
+        lwz     r13, tlbcam_index@l(r13)
+        rlwimi  r12, r13, 0, 20, 31
+7:
+        mtspr   SPRN_MAS0,r12
+#endif /* CONFIG_E200 */
+
         tlbwe
 
         /* Done...restore registers and get out of here.  */
diff --git a/arch/ppc/kernel/machine_kexec.c b/arch/ppc/kernel/machine_kexec.c
new file mode 100644
index 0000000000..84d65a8719
--- /dev/null
+++ b/arch/ppc/kernel/machine_kexec.c
@@ -0,0 +1,118 @@
+/*
+ * machine_kexec.c - handle transition of Linux booting another kernel
+ * Copyright (C) 2002-2003 Eric Biederman  <ebiederm@xmission.com>
+ *
+ * GameCube/ppc32 port Copyright (C) 2004 Albert Herranz
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+#include <linux/mm.h>
+#include <linux/kexec.h>
+#include <linux/delay.h>
+#include <linux/reboot.h>
+#include <asm/pgtable.h>
+#include <asm/pgalloc.h>
+#include <asm/mmu_context.h>
+#include <asm/io.h>
+#include <asm/hw_irq.h>
+#include <asm/cacheflush.h>
+#include <asm/machdep.h>
+
+typedef NORET_TYPE void (*relocate_new_kernel_t)(
+                                unsigned long indirection_page,
+                                unsigned long reboot_code_buffer,
+                                unsigned long start_address) ATTRIB_NORET;
+
+const extern unsigned char relocate_new_kernel[];
+const extern unsigned int relocate_new_kernel_size;
+
+void machine_shutdown(void)
+{
+        if (ppc_md.machine_shutdown)
+                ppc_md.machine_shutdown();
+}
+
+void machine_crash_shutdown(struct pt_regs *regs)
+{
+        if (ppc_md.machine_crash_shutdown)
+                ppc_md.machine_crash_shutdown();
+}
+
+/*
+ * Do what every setup is needed on image and the
+ * reboot code buffer to allow us to avoid allocations
+ * later.
+ */
+int machine_kexec_prepare(struct kimage *image)
+{
+        if (ppc_md.machine_kexec_prepare)
+                return ppc_md.machine_kexec_prepare(image);
+        /*
+         * Fail if platform doesn't provide its own machine_kexec_prepare
+         * implementation.
+         */
+        return -ENOSYS;
+}
+
+void machine_kexec_cleanup(struct kimage *image)
+{
+        if (ppc_md.machine_kexec_cleanup)
+                ppc_md.machine_kexec_cleanup(image);
+}
+
+/*
+ * Do not allocate memory (or fail in any way) in machine_kexec().
+ * We are past the point of no return, committed to rebooting now.
+ */
+NORET_TYPE void machine_kexec(struct kimage *image)
+{
+        if (ppc_md.machine_kexec)
+                ppc_md.machine_kexec(image);
+        else {
+                /*
+                 * Fall back to normal restart if platform doesn't provide
+                 * its own kexec function, and user insist to kexec...
+                 */
+                machine_restart(NULL);
+        }
+        for(;;);
+}
+
+/*
+ * This is a generic machine_kexec function suitable at least for
+ * non-OpenFirmware embedded platforms.
+ * It merely copies the image relocation code to the control page and
+ * jumps to it.
+ * A platform specific function may just call this one.
+ */
+void machine_kexec_simple(struct kimage *image)
+{
+        unsigned long page_list;
+        unsigned long reboot_code_buffer, reboot_code_buffer_phys;
+        relocate_new_kernel_t rnk;
+
+        /* Interrupts aren't acceptable while we reboot */
+        local_irq_disable();
+
+        page_list = image->head;
+
+        /* we need both effective and real address here */
+        reboot_code_buffer =
+                        (unsigned long)page_address(image->control_code_page);
+        reboot_code_buffer_phys = virt_to_phys((void *)reboot_code_buffer);
+
+        /* copy our kernel relocation code to the control code page */
+        memcpy((void *)reboot_code_buffer, relocate_new_kernel,
+                                                relocate_new_kernel_size);
+
+        flush_icache_range(reboot_code_buffer,
+                                reboot_code_buffer + KEXEC_CONTROL_CODE_SIZE);
+        printk(KERN_INFO "Bye!\n");
+
+        /* now call it */
+        rnk = (relocate_new_kernel_t) reboot_code_buffer;
+        (*rnk)(page_list, reboot_code_buffer_phys, image->start);
+}
+
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index e4f1615ec1..b6a63a49a2 100644
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -593,6 +593,14 @@ _GLOBAL(flush_instruction_cache)
         iccci   0,r3
 #endif
 #elif CONFIG_FSL_BOOKE
+BEGIN_FTR_SECTION
+        mfspr   r3,SPRN_L1CSR0
+        ori     r3,r3,L1CSR0_CFI|L1CSR0_CLFC
+        /* msync; isync recommended here */
+        mtspr   SPRN_L1CSR0,r3
+        isync
+        blr
+END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
         mfspr   r3,SPRN_L1CSR1
         ori     r3,r3,L1CSR1_ICFI|L1CSR1_ICLFR
         mtspr   SPRN_L1CSR1,r3
@@ -619,7 +627,7 @@ _GLOBAL(flush_instruction_cache)
 _GLOBAL(flush_icache_range)
 BEGIN_FTR_SECTION
         blr                             /* for 601, do nothing */
-END_FTR_SECTION_IFSET(PPC_FEATURE_UNIFIED_CACHE)
+END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
         li      r5,L1_CACHE_LINE_SIZE-1
         andc    r3,r3,r5
         subf    r4,r3,r4
@@ -736,7 +744,7 @@ _GLOBAL(flush_dcache_all)
 _GLOBAL(__flush_dcache_icache)
 BEGIN_FTR_SECTION
         blr                                     /* for 601, do nothing */
-END_FTR_SECTION_IFSET(PPC_FEATURE_UNIFIED_CACHE)
+END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
         rlwinm  r3,r3,0,0,19                    /* Get page base address */
         li      r4,4096/L1_CACHE_LINE_SIZE      /* Number of lines in a page */
         mtctr   r4
@@ -764,7 +772,7 @@ END_FTR_SECTION_IFSET(PPC_FEATURE_UNIFIED_CACHE)
 _GLOBAL(__flush_dcache_icache_phys)
 BEGIN_FTR_SECTION
         blr                                     /* for 601, do nothing */
-END_FTR_SECTION_IFSET(PPC_FEATURE_UNIFIED_CACHE)
+END_FTR_SECTION_IFCLR(CPU_FTR_SPLIT_ID_CACHE)
         mfmsr   r10
         rlwinm  r0,r10,0,28,26                  /* clear DR */
         mtmsr   r0
@@ -1436,7 +1444,7 @@ _GLOBAL(sys_call_table)
         .long sys_mq_timedreceive       /* 265 */
         .long sys_mq_notify
         .long sys_mq_getsetattr
-        .long sys_ni_syscall            /* 268 reserved for sys_kexec_load */
+        .long sys_kexec_load
         .long sys_add_key
         .long sys_request_key           /* 270 */
         .long sys_keyctl
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 47a1530682..6d7b92d724 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -1003,7 +1003,7 @@ pci_create_OF_bus_map(void)
         }
 }
 
-static ssize_t pci_show_devspec(struct device *dev, char *buf)
+static ssize_t pci_show_devspec(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct pci_dev *pdev;
         struct device_node *np;
diff --git a/arch/ppc/kernel/perfmon.c b/arch/ppc/kernel/perfmon.c
index 918f6b252e..fa1dad96b8 100644
--- a/arch/ppc/kernel/perfmon.c
+++ b/arch/ppc/kernel/perfmon.c
@@ -36,7 +36,7 @@
 /* A lock to regulate grabbing the interrupt */
 DEFINE_SPINLOCK(perfmon_lock);
 
-#ifdef CONFIG_FSL_BOOKE
+#if defined (CONFIG_FSL_BOOKE) && !defined (CONFIG_E200)
 static void dummy_perf(struct pt_regs *regs)
 {
         unsigned int pmgc0 = mfpmr(PMRN_PMGC0);
diff --git a/arch/ppc/kernel/ppc_ksyms.c b/arch/ppc/kernel/ppc_ksyms.c
index 2ccb58fe4f..d59ad07de8 100644
--- a/arch/ppc/kernel/ppc_ksyms.c
+++ b/arch/ppc/kernel/ppc_ksyms.c
@@ -55,7 +55,6 @@
 #define EXPORT_SYMTAB_STROPS
 
 extern void transfer_to_handler(void);
-extern void do_syscall_trace(void);
 extern void do_IRQ(struct pt_regs *regs);
 extern void MachineCheckException(struct pt_regs *regs);
 extern void AlignmentException(struct pt_regs *regs);
@@ -74,7 +73,6 @@ extern unsigned long mm_ptov (unsigned long paddr);
 EXPORT_SYMBOL(clear_pages);
 EXPORT_SYMBOL(clear_user_page);
 EXPORT_SYMBOL(do_signal);
-EXPORT_SYMBOL(do_syscall_trace);
 EXPORT_SYMBOL(transfer_to_handler);
 EXPORT_SYMBOL(do_IRQ);
 EXPORT_SYMBOL(MachineCheckException);
diff --git a/arch/ppc/kernel/ptrace.c b/arch/ppc/kernel/ptrace.c
index 59d59a8dc2..e7aee4108d 100644
--- a/arch/ppc/kernel/ptrace.c
+++ b/arch/ppc/kernel/ptrace.c
@@ -27,6 +27,9 @@
 #include <linux/user.h>
 #include <linux/security.h>
 #include <linux/signal.h>
+#include <linux/seccomp.h>
+#include <linux/audit.h>
+#include <linux/module.h>
 
 #include <asm/uaccess.h>
 #include <asm/page.h>
@@ -455,11 +458,10 @@ out:
         return ret;
 }
 
-void do_syscall_trace(void)
+static void do_syscall_trace(void)
 {
-        if (!test_thread_flag(TIF_SYSCALL_TRACE)
-            || !(current->ptrace & PT_PTRACED))
-                return;
+        /* the 0x80 provides a way for the tracing parent to distinguish
+           between a syscall stop and SIGTRAP delivery */
         ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD)
                                  ? 0x80 : 0));
 
@@ -473,3 +475,33 @@ void do_syscall_trace(void)
                 current->exit_code = 0;
         }
 }
+
+void do_syscall_trace_enter(struct pt_regs *regs)
+{
+        if (test_thread_flag(TIF_SYSCALL_TRACE)
+            && (current->ptrace & PT_PTRACED))
+                do_syscall_trace();
+
+        if (unlikely(current->audit_context))
+                audit_syscall_entry(current, AUDIT_ARCH_PPC,
+                                    regs->gpr[0],
+                                    regs->gpr[3], regs->gpr[4],
+                                    regs->gpr[5], regs->gpr[6]);
+}
+
+void do_syscall_trace_leave(struct pt_regs *regs)
+{
+        secure_computing(regs->gpr[0]);
+
+        if (unlikely(current->audit_context))
+                audit_syscall_exit(current,
+                                   (regs->ccr&0x1000)?AUDITSC_FAILURE:AUDITSC_SUCCESS,
+                                   regs->result);
+
+        if ((test_thread_flag(TIF_SYSCALL_TRACE))
+            && (current->ptrace & PT_PTRACED))
+                do_syscall_trace();
+}
+
+EXPORT_SYMBOL(do_syscall_trace_enter);
+EXPORT_SYMBOL(do_syscall_trace_leave);
diff --git a/arch/ppc/kernel/relocate_kernel.S b/arch/ppc/kernel/relocate_kernel.S
new file mode 100644
index 0000000000..7ff69c4af9
--- /dev/null
+++ b/arch/ppc/kernel/relocate_kernel.S
@@ -0,0 +1,123 @@
+/*
+ * relocate_kernel.S - put the kernel image in place to boot
+ * Copyright (C) 2002-2003 Eric Biederman  <ebiederm@xmission.com>
+ *
+ * GameCube/ppc32 port Copyright (C) 2004 Albert Herranz
+ *
+ * This source code is licensed under the GNU General Public License,
+ * Version 2.  See the file COPYING for more details.
+ */
+
+#include <asm/reg.h>
+#include <asm/ppc_asm.h>
+#include <asm/processor.h>
+
+#include <asm/kexec.h>
+
+#define PAGE_SIZE      4096 /* must be same value as in <asm/page.h> */
+
+        /*
+         * Must be relocatable PIC code callable as a C function.
+         */
+        .globl relocate_new_kernel
+relocate_new_kernel:
+        /* r3 = page_list   */
+        /* r4 = reboot_code_buffer */
+        /* r5 = start_address      */
+
+        li      r0, 0
+
+        /*
+         * Set Machine Status Register to a known status,
+         * switch the MMU off and jump to 1: in a single step.
+         */
+
+        mr      r8, r0
+        ori     r8, r8, MSR_RI|MSR_ME
+        mtspr   SRR1, r8
+        addi    r8, r4, 1f - relocate_new_kernel
+        mtspr   SRR0, r8
+        sync
+        rfi
+
+1:
+        /* from this point address translation is turned off */
+        /* and interrupts are disabled */
+
+        /* set a new stack at the bottom of our page... */
+        /* (not really needed now) */
+        addi    r1, r4, KEXEC_CONTROL_CODE_SIZE - 8 /* for LR Save+Back Chain */
+        stw     r0, 0(r1)
+
+        /* Do the copies */
+        li      r6, 0 /* checksum */
+        mr      r0, r3
+        b       1f
+
+0:      /* top, read another word for the indirection page */
+        lwzu    r0, 4(r3)
+
+1:
+        /* is it a destination page? (r8) */
+        rlwinm. r7, r0, 0, 31, 31 /* IND_DESTINATION (1<<0) */
+        beq     2f
+
+        rlwinm  r8, r0, 0, 0, 19 /* clear kexec flags, page align */
+        b       0b
+
+2:      /* is it an indirection page? (r3) */
+        rlwinm. r7, r0, 0, 30, 30 /* IND_INDIRECTION (1<<1) */
+        beq     2f
+
+        rlwinm  r3, r0, 0, 0, 19 /* clear kexec flags, page align */
+        subi    r3, r3, 4
+        b       0b
+
+2:      /* are we done? */
+        rlwinm. r7, r0, 0, 29, 29 /* IND_DONE (1<<2) */
+        beq     2f
+        b       3f
+
+2:      /* is it a source page? (r9) */
+        rlwinm. r7, r0, 0, 28, 28 /* IND_SOURCE (1<<3) */
+        beq     0b
+
+        rlwinm  r9, r0, 0, 0, 19 /* clear kexec flags, page align */
+
+        li      r7, PAGE_SIZE / 4
+        mtctr   r7
+        subi    r9, r9, 4
+        subi    r8, r8, 4
+9:
+        lwzu    r0, 4(r9)  /* do the copy */
+        xor     r6, r6, r0
+        stwu    r0, 4(r8)
+        dcbst   0, r8
+        sync
+        icbi    0, r8
+        bdnz    9b
+
+        addi    r9, r9, 4
+        addi    r8, r8, 4
+        b       0b
+
+3:
+
+        /* To be certain of avoiding problems with self-modifying code
+         * execute a serializing instruction here.
+         */
+        isync
+        sync
+
+        /* jump to the entry point, usually the setup routine */
+        mtlr    r5
+        blrl
+
+1:      b       1b
+
+relocate_new_kernel_end:
+
+        .globl relocate_new_kernel_size
+relocate_new_kernel_size:
+        .long relocate_new_kernel_end - relocate_new_kernel
+
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c
index 5c20266e3b..c42f753269 100644
--- a/arch/ppc/kernel/setup.c
+++ b/arch/ppc/kernel/setup.c
@@ -41,7 +41,7 @@
 #include <asm/xmon.h>
 #include <asm/ocp.h>
 
-#if defined(CONFIG_85xx) || defined(CONFIG_83xx)
+#if defined(CONFIG_85xx) || defined(CONFIG_83xx) || defined(CONFIG_MPC10X_BRIDGE)
 #include <asm/ppc_sys.h>
 #endif
 
@@ -61,8 +61,6 @@ extern void power4_idle(void);
 
 extern boot_infos_t *boot_infos;
 struct ide_machdep_calls ppc_ide_md;
-char *sysmap;
-unsigned long sysmap_size;
 
 /* Used with the BI_MEMSIZE bootinfo parameter to store the memory
    size value reported by the boot loader. */
@@ -249,7 +247,7 @@ int show_cpuinfo(struct seq_file *m, void *v)
         seq_printf(m, "bogomips\t: %lu.%02lu\n",
                    lpj / (500000/HZ), (lpj / (5000/HZ)) % 100);
 
-#if defined(CONFIG_85xx) || defined(CONFIG_83xx)
+#if defined(CONFIG_85xx) || defined(CONFIG_83xx) || defined(CONFIG_MPC10X_BRIDGE)
         if (cur_ppc_sys_spec->ppc_sys_name)
                 seq_printf(m, "chipset\t\t: %s\n",
                         cur_ppc_sys_spec->ppc_sys_name);
@@ -578,11 +576,6 @@ void parse_bootinfo(struct bi_record *rec)
                 case BI_CMD_LINE:
                         strlcpy(cmd_line, (void *)data, sizeof(cmd_line));
                         break;
-                case BI_SYSMAP:
-                        sysmap = (char *)((data[0] >= (KERNELBASE)) ? data[0] :
-                                          (data[0]+KERNELBASE));
-                        sysmap_size = data[1];
-                        break;
 #ifdef CONFIG_BLK_DEV_INITRD
                 case BI_INITRD:
                         initrd_start = data[0] + KERNELBASE;
diff --git a/arch/ppc/kernel/signal.c b/arch/ppc/kernel/signal.c
index 7c8437da09..8aaeb6f4e7 100644
--- a/arch/ppc/kernel/signal.c
+++ b/arch/ppc/kernel/signal.c
@@ -705,8 +705,7 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
         unsigned long frame, newsp;
         int signr, ret;
 
-        if (current->flags & PF_FREEZE) {
-                refrigerator(PF_FREEZE);
+        if (try_to_freeze()) {
                 signr = 0;
                 if (!signal_pending(current))
                         goto no_signal;
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index f8e7e324a1..9e6ae56966 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -81,8 +81,10 @@ void die(const char * str, struct pt_regs * fp, long err)
         console_verbose();
         spin_lock_irq(&die_lock);
 #ifdef CONFIG_PMAC_BACKLIGHT
-        set_backlight_enable(1);
-        set_backlight_level(BACKLIGHT_MAX);
+        if (_machine == _MACH_Pmac) {
+                set_backlight_enable(1);
+                set_backlight_level(BACKLIGHT_MAX);
+        }
 #endif
         printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter);
 #ifdef CONFIG_PREEMPT
@@ -171,13 +173,13 @@ static inline int check_io_access(struct pt_regs *regs)
 /* On 4xx, the reason for the machine check or program exception
    is in the ESR. */
 #define get_reason(regs)        ((regs)->dsisr)
-#ifndef CONFIG_E500
+#ifndef CONFIG_FSL_BOOKE
 #define get_mc_reason(regs)     ((regs)->dsisr)
 #else
 #define get_mc_reason(regs)     (mfspr(SPRN_MCSR))
 #endif
 #define REASON_FP               ESR_FP
-#define REASON_ILLEGAL          ESR_PIL
+#define REASON_ILLEGAL          (ESR_PIL | ESR_PUO)
 #define REASON_PRIVILEGED       ESR_PPR
 #define REASON_TRAP             ESR_PTR
 
@@ -300,7 +302,25 @@ void MachineCheckException(struct pt_regs *regs)
                 printk("Bus - Instruction Parity Error\n");
         if (reason & MCSR_BUS_RPERR)
                 printk("Bus - Read Parity Error\n");
-#else /* !CONFIG_4xx && !CONFIG_E500 */
+#elif defined (CONFIG_E200)
+        printk("Machine check in kernel mode.\n");
+        printk("Caused by (from MCSR=%lx): ", reason);
+
+        if (reason & MCSR_MCP)
+                printk("Machine Check Signal\n");
+        if (reason & MCSR_CP_PERR)
+                printk("Cache Push Parity Error\n");
+        if (reason & MCSR_CPERR)
+                printk("Cache Parity Error\n");
+        if (reason & MCSR_EXCP_ERR)
+                printk("ISI, ITLB, or Bus Error on first instruction fetch for an exception handler\n");
+        if (reason & MCSR_BUS_IRERR)
+                printk("Bus - Read Bus Error on instruction fetch\n");
+        if (reason & MCSR_BUS_DRERR)
+                printk("Bus - Read Bus Error on data load\n");
+        if (reason & MCSR_BUS_WRERR)
+                printk("Bus - Write Bus Error on buffered store or cache line push\n");
+#else /* !CONFIG_4xx && !CONFIG_E500 && !CONFIG_E200 */
         printk("Machine check in kernel mode.\n");
         printk("Caused by (from SRR1=%lx): ", reason);
         switch (reason & 0x601F0000) {
@@ -408,12 +428,7 @@ static int emulate_string_inst(struct pt_regs *regs, u32 instword)
 
         /* Early out if we are an invalid form of lswx */
         if ((instword & INST_STRING_MASK) == INST_LSWX)
-                if ((rA >= rT) || (NB_RB >= rT) || (rT == rA) || (rT == NB_RB))
-                        return -EINVAL;
-
-        /* Early out if we are an invalid form of lswi */
-        if ((instword & INST_STRING_MASK) == INST_LSWI)
-                if ((rA >= rT) || (rT == rA))
+                if ((rT == rA) || (rT == NB_RB))
                         return -EINVAL;
 
         EA = (rA == 0) ? 0 : regs->gpr[rA];
diff --git a/arch/ppc/lib/locks.c b/arch/ppc/lib/locks.c
index 694163d696..c450dc4b76 100644
--- a/arch/ppc/lib/locks.c
+++ b/arch/ppc/lib/locks.c
@@ -130,7 +130,7 @@ void _raw_read_lock(rwlock_t *rw)
                 while (!read_can_lock(rw)) {
                         if (--stuck == 0) {
                                 printk("_read_lock(%p) CPU#%d lock %d\n",
-                                       rw, _smp_processor_id(), rw->lock);
+                                       rw, raw_smp_processor_id(), rw->lock);
                                 stuck = INIT_STUCK;
                         }
                 }
@@ -158,7 +158,7 @@ void _raw_write_lock(rwlock_t *rw)
                 while (!write_can_lock(rw)) {
                         if (--stuck == 0) {
                                 printk("write_lock(%p) CPU#%d lock %d)\n",
-                                       rw, _smp_processor_id(), rw->lock);
+                                       rw, raw_smp_processor_id(), rw->lock);
                                 stuck = INIT_STUCK;
                         }
                 }
diff --git a/arch/ppc/mm/44x_mmu.c b/arch/ppc/mm/44x_mmu.c
index 72f7c0d1c0..3d79ce281b 100644
--- a/arch/ppc/mm/44x_mmu.c
+++ b/arch/ppc/mm/44x_mmu.c
@@ -39,7 +39,6 @@
 #include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/bootmem.h>
 #include <linux/highmem.h>
 
 #include <asm/pgalloc.h>
diff --git a/arch/ppc/mm/4xx_mmu.c b/arch/ppc/mm/4xx_mmu.c
index a7f6161403..b7bcbc232f 100644
--- a/arch/ppc/mm/4xx_mmu.c
+++ b/arch/ppc/mm/4xx_mmu.c
@@ -36,7 +36,6 @@
 #include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/bootmem.h>
 #include <linux/highmem.h>
 
 #include <asm/pgalloc.h>
diff --git a/arch/ppc/mm/fsl_booke_mmu.c b/arch/ppc/mm/fsl_booke_mmu.c
index 36233bdcdf..af9ca0eb6d 100644
--- a/arch/ppc/mm/fsl_booke_mmu.c
+++ b/arch/ppc/mm/fsl_booke_mmu.c
@@ -41,7 +41,6 @@
 #include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/delay.h>
-#include <linux/bootmem.h>
 #include <linux/highmem.h>
 
 #include <asm/pgalloc.h>
@@ -64,6 +63,8 @@ extern unsigned long total_lowmem;
 extern unsigned long __max_low_memory;
 #define MAX_LOW_MEM     CONFIG_LOWMEM_SIZE
 
+#define NUM_TLBCAMS     (16)
+
 struct tlbcam {
         u32     MAS0;
         u32     MAS1;
@@ -124,7 +125,7 @@ void settlbcam(int index, unsigned long virt, phys_addr_t phys,
                 flags |= _PAGE_COHERENT;
 #endif
 
-        TLBCAM[index].MAS0 = MAS0_TLBSEL(1) | MAS0_ESEL(index);
+        TLBCAM[index].MAS0 = MAS0_TLBSEL(1) | MAS0_ESEL(index) | MAS0_NV(index+1);
         TLBCAM[index].MAS1 = MAS1_VALID | MAS1_IPROT | MAS1_TSIZE(tsize) | MAS1_TID(pid);
         TLBCAM[index].MAS2 = virt & PAGE_MASK;
 
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index 363c157e36..334ef4150d 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -96,9 +96,6 @@ extern struct task_struct *current_set[NR_CPUS];
 char *klimit = _end;
 struct mem_pieces phys_avail;
 
-extern char *sysmap;
-extern unsigned long sysmap_size;
-
 /*
  * this tells the system to map all of ram with the segregs
  * (i.e. page tables) instead of the bats.
@@ -442,12 +439,6 @@ void __init mem_init(void)
         if (agp_special_page)
                 SetPageReserved(virt_to_page(agp_special_page));
 #endif
-        if ( sysmap )
-                for (addr = (unsigned long)sysmap;
-                     addr < PAGE_ALIGN((unsigned long)sysmap+sysmap_size) ;
-                     addr += PAGE_SIZE)
-                        SetPageReserved(virt_to_page(addr));
-
         for (addr = PAGE_OFFSET; addr < (unsigned long)high_memory;
              addr += PAGE_SIZE) {
                 if (!PageReserved(virt_to_page(addr)))
@@ -469,7 +460,6 @@ void __init mem_init(void)
                         struct page *page = mem_map + pfn;
 
                         ClearPageReserved(page);
-                        set_bit(PG_highmem, &page->flags);
                         set_page_count(page, 1);
                         __free_page(page);
                         totalhigh_pages++;
@@ -483,9 +473,7 @@ void __init mem_init(void)
                codepages<< (PAGE_SHIFT-10), datapages<< (PAGE_SHIFT-10),
                initpages<< (PAGE_SHIFT-10),
                (unsigned long) (totalhigh_pages << (PAGE_SHIFT-10)));
-        if (sysmap)
-                printk("System.map loaded at 0x%08x for debugger, size: %ld bytes\n",
-                        (unsigned int)sysmap, sysmap_size);
+
 #ifdef CONFIG_PPC_PMAC
         if (agp_special_page)
                 printk(KERN_INFO "AGP special page: 0x%08lx\n", agp_special_page);
@@ -535,9 +523,6 @@ set_phys_avail(unsigned long total_memory)
         if (rtas_data)
                 mem_pieces_remove(&phys_avail, rtas_data, rtas_size, 1);
 #endif
-        /* remove the sysmap pages from the available memory */
-        if (sysmap)
-                mem_pieces_remove(&phys_avail, __pa(sysmap), sysmap_size, 1);
 #ifdef CONFIG_PPC_PMAC
         /* Because of some uninorth weirdness, we need a page of
          * memory as high as possible (it must be outside of the
diff --git a/arch/ppc/mm/mmu_decl.h b/arch/ppc/mm/mmu_decl.h
index ffcdb46997..540f3292b2 100644
--- a/arch/ppc/mm/mmu_decl.h
+++ b/arch/ppc/mm/mmu_decl.h
@@ -43,6 +43,8 @@ extern int mem_init_done;
 extern PTE *Hash, *Hash_end;
 extern unsigned long Hash_size, Hash_mask;
 
+extern unsigned int num_tlbcam_entries;
+
 /* ...and now those things that may be slightly different between processor
  * architectures.  -- Dan
  */
diff --git a/arch/ppc/mm/pgtable.c b/arch/ppc/mm/pgtable.c
index 5d2f3f66ae..81a3d7446d 100644
--- a/arch/ppc/mm/pgtable.c
+++ b/arch/ppc/mm/pgtable.c
@@ -66,7 +66,6 @@ void setbat(int index, unsigned long virt, unsigned long phys,
 
 #ifdef HAVE_TLBCAM
 extern unsigned int tlbcam_index;
-extern unsigned int num_tlbcam_entries;
 extern unsigned long v_mapped_by_tlbcam(unsigned long va);
 extern unsigned long p_mapped_by_tlbcam(unsigned long pa);
 #else /* !HAVE_TLBCAM */
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.c b/arch/ppc/platforms/83xx/mpc834x_sys.c
index b3b0f51979..ddd04d4c1e 100644
--- a/arch/ppc/platforms/83xx/mpc834x_sys.c
+++ b/arch/ppc/platforms/83xx/mpc834x_sys.c
@@ -41,7 +41,6 @@
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/prom.h>
 #include <asm/ipic.h>
 #include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
@@ -95,20 +94,24 @@ mpc834x_sys_setup_arch(void)
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC83xx_TSEC1);
-        pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-        pdata->interruptPHY = MPC83xx_IRQ_EXT1;
-        pdata->phyid = 0;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC83xx_IRQ_EXT1;
+                pdata->phyid = 0;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        }
 
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC83xx_TSEC2);
-        pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-        pdata->interruptPHY = MPC83xx_IRQ_EXT2;
-        pdata->phyid = 1;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC83xx_IRQ_EXT2;
+                pdata->phyid = 1;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        }
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start)
@@ -127,7 +130,6 @@ mpc834x_sys_map_io(void)
 {
         /* we steal the lowest ioremap addr for virt space */
         io_block_mapping(VIRT_IMMRBAR, immrbar, 1024*1024, _PAGE_IO);
-        io_block_mapping(BCSR_VIRT_ADDR, BCSR_PHYS_ADDR, BCSR_SIZE, _PAGE_IO);
 }
 
 int
@@ -187,6 +189,26 @@ mpc834x_sys_init_IRQ(void)
         ipic_set_default_priority();
 }
 
+#if defined(CONFIG_I2C_MPC) && defined(CONFIG_SENSORS_DS1374)
+extern ulong    ds1374_get_rtc_time(void);
+extern int      ds1374_set_rtc_time(ulong);
+
+static int __init
+mpc834x_rtc_hookup(void)
+{
+        struct timespec tv;
+
+        ppc_md.get_rtc_time = ds1374_get_rtc_time;
+        ppc_md.set_rtc_time = ds1374_set_rtc_time;
+
+        tv.tv_nsec = 0;
+        tv.tv_sec = (ppc_md.get_rtc_time)();
+        do_settimeofday(&tv);
+
+        return 0;
+}
+late_initcall(mpc834x_rtc_hookup);
+#endif
 static __inline__ void
 mpc834x_sys_set_bat(void)
 {
diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.h b/arch/ppc/platforms/83xx/mpc834x_sys.h
index f4d055ae19..a2f6e49d71 100644
--- a/arch/ppc/platforms/83xx/mpc834x_sys.h
+++ b/arch/ppc/platforms/83xx/mpc834x_sys.h
@@ -26,9 +26,14 @@
 #define VIRT_IMMRBAR            ((uint)0xfe000000)
 
 #define BCSR_PHYS_ADDR          ((uint)0xf8000000)
-#define BCSR_VIRT_ADDR          ((uint)0xfe100000)
 #define BCSR_SIZE               ((uint)(32 * 1024))
 
+#define BCSR_MISC_REG2_OFF      0x07
+#define BCSR_MISC_REG2_PORESET  0x01
+
+#define BCSR_MISC_REG3_OFF      0x08
+#define BCSR_MISC_REG3_CNFLOCK  0x80
+
 #ifdef CONFIG_PCI
 /* PCI interrupt controller */
 #define PIRQA        MPC83xx_IRQ_IRQ4
diff --git a/arch/ppc/platforms/85xx/Kconfig b/arch/ppc/platforms/85xx/Kconfig
index ff92e38e7d..c5bc2821d9 100644
--- a/arch/ppc/platforms/85xx/Kconfig
+++ b/arch/ppc/platforms/85xx/Kconfig
@@ -21,6 +21,11 @@ config MPC8540_ADS
         help
           This option enables support for the MPC 8540 ADS evaluation board.
 
+config MPC8548_CDS
+        bool "Freescale MPC8548 CDS"
+        help
+          This option enablese support for the MPC8548 CDS evaluation board.
+
 config MPC8555_CDS
         bool "Freescale MPC8555 CDS"
         help
@@ -53,6 +58,11 @@ config MPC8540
         depends on MPC8540_ADS
         default y
 
+config MPC8548
+        bool
+        depends on MPC8548_CDS
+        default y
+
 config MPC8555
         bool
         depends on MPC8555_CDS
diff --git a/arch/ppc/platforms/85xx/Makefile b/arch/ppc/platforms/85xx/Makefile
index 854fbd298b..efdf813108 100644
--- a/arch/ppc/platforms/85xx/Makefile
+++ b/arch/ppc/platforms/85xx/Makefile
@@ -2,6 +2,7 @@
 # Makefile for the PowerPC 85xx linux kernel.
 #
 obj-$(CONFIG_MPC8540_ADS)       += mpc85xx_ads_common.o mpc8540_ads.o
+obj-$(CONFIG_MPC8548_CDS)       += mpc85xx_cds_common.o
 obj-$(CONFIG_MPC8555_CDS)       += mpc85xx_cds_common.o
 obj-$(CONFIG_MPC8560_ADS)       += mpc85xx_ads_common.o mpc8560_ads.o
 obj-$(CONFIG_SBC8560)           += sbc85xx.o sbc8560.o
diff --git a/arch/ppc/platforms/85xx/mpc8540_ads.c b/arch/ppc/platforms/85xx/mpc8540_ads.c
index 4d857d6d63..ddd2e9a5bb 100644
--- a/arch/ppc/platforms/85xx/mpc8540_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8540_ads.c
@@ -41,7 +41,6 @@
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/prom.h>
 #include <asm/open_pic.h>
 #include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
@@ -88,33 +87,39 @@ mpc8540ads_setup_arch(void)
 #ifdef CONFIG_SERIAL_TEXT_DEBUG
         /* Invalidate the entry we stole earlier the serial ports
          * should be properly mapped */
-        invalidate_tlbcam_entry(NUM_TLBCAMS - 1);
+        invalidate_tlbcam_entry(num_tlbcam_entries - 1);
 #endif
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
-        pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-        pdata->interruptPHY = MPC85xx_IRQ_EXT5;
-        pdata->phyid = 0;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 0;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        }
 
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
-        pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-        pdata->interruptPHY = MPC85xx_IRQ_EXT5;
-        pdata->phyid = 1;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
-
-        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_FEC);
-        pdata->board_flags = 0;
-        pdata->interruptPHY = MPC85xx_IRQ_EXT5;
-        pdata->phyid = 3;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enet2addr, 6);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 1;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        }
+
+        if (pdata) {
+                pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_FEC);
+                pdata->board_flags = 0;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 3;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enet2addr, 6);
+        }
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start)
@@ -150,7 +155,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                 struct uart_port p;
 
                 /* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */
-                settlbcam(NUM_TLBCAMS - 1, binfo->bi_immr_base,
+                settlbcam(num_tlbcam_entries - 1, binfo->bi_immr_base,
                           binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
 
                 memset(&p, 0, sizeof (p));
@@ -210,6 +215,9 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 #if defined(CONFIG_SERIAL_8250) && defined(CONFIG_SERIAL_TEXT_DEBUG)
         ppc_md.progress = gen550_progress;
 #endif  /* CONFIG_SERIAL_8250 && CONFIG_SERIAL_TEXT_DEBUG */
+#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_KGDB)
+        ppc_md.early_serial_map = mpc85xx_early_serial_map;
+#endif  /* CONFIG_SERIAL_8250 && CONFIG_KGDB */
 
         if (ppc_md.progress)
                 ppc_md.progress("mpc8540ads_init(): exit", 0);
diff --git a/arch/ppc/platforms/85xx/mpc8560_ads.c b/arch/ppc/platforms/85xx/mpc8560_ads.c
index 761b8c7b25..e18380258b 100644
--- a/arch/ppc/platforms/85xx/mpc8560_ads.c
+++ b/arch/ppc/platforms/85xx/mpc8560_ads.c
@@ -41,7 +41,6 @@
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/prom.h>
 #include <asm/open_pic.h>
 #include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
@@ -91,20 +90,24 @@ mpc8560ads_setup_arch(void)
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
-        pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-        pdata->interruptPHY = MPC85xx_IRQ_EXT5;
-        pdata->phyid = 0;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 0;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        }
 
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
-        pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-        pdata->interruptPHY = MPC85xx_IRQ_EXT5;
-        pdata->phyid = 1;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 1;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        }
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start)
diff --git a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
index ba9f9f562c..18e952d176 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_ads_common.c
@@ -36,7 +36,6 @@
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/prom.h>
 #include <asm/open_pic.h>
 #include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
@@ -59,40 +58,8 @@ extern unsigned long total_memory;	/* in mm/init */
 unsigned char __res[sizeof (bd_t)];
 
 /* Internal interrupts are all Level Sensitive, and Positive Polarity */
-
 static u_char mpc85xx_ads_openpic_initsenses[] __initdata = {
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  0: L2 Cache */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  1: ECM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  2: DDR DRAM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  3: LBIU */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  4: DMA 0 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  5: DMA 1 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  6: DMA 2 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  7: DMA 3 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  8: PCI/PCI-X */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  9: RIO Inbound Port Write Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 10: RIO Doorbell Inbound */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 11: RIO Outbound Message */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 12: RIO Inbound Message */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 13: TSEC 0 Transmit */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 14: TSEC 0 Receive */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 15: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 16: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 17: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 18: TSEC 0 Receive/Transmit Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 19: TSEC 1 Transmit */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 20: TSEC 1 Receive */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 21: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 22: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 23: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 24: TSEC 1 Receive/Transmit Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 25: Fast Ethernet */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 26: DUART */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 27: I2C */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 28: Performance Monitor */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 29: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 30: CPM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 31: Unused */
+        MPC85XX_INTERNAL_IRQ_SENSES,
         0x0,                                            /* External  0: */
 #if defined(CONFIG_PCI)
         (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 1: PCI slot 0 */
@@ -159,7 +126,7 @@ mpc85xx_ads_init_IRQ(void)
         /* Skip reserved space and internal sources */
         openpic_set_sources(0, 32, OpenPIC_Addr + 0x10200);
         /* Map PIC IRQs 0-11 */
-        openpic_set_sources(32, 12, OpenPIC_Addr + 0x10000);
+        openpic_set_sources(48, 12, OpenPIC_Addr + 0x10000);
 
         /* we let openpic interrupts starting from an offset, to
          * leave space for cascading interrupts underneath.
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
index 6c020d67ad..b52c4317fe 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c
@@ -42,8 +42,8 @@
 #include <asm/todc.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/prom.h>
 #include <asm/open_pic.h>
+#include <asm/i8259.h>
 #include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
 #include <asm/mpc85xx.h>
@@ -72,40 +72,8 @@ static int cds_pci_slot = 2;
 static volatile u8 * cadmus;
 
 /* Internal interrupts are all Level Sensitive, and Positive Polarity */
-
 static u_char mpc85xx_cds_openpic_initsenses[] __initdata = {
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  0: L2 Cache */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  1: ECM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  2: DDR DRAM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  3: LBIU */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  4: DMA 0 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  5: DMA 1 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  6: DMA 2 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  7: DMA 3 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  8: PCI/PCI-X */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  9: RIO Inbound Port Write Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 10: RIO Doorbell Inbound */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 11: RIO Outbound Message */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 12: RIO Inbound Message */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 13: TSEC 0 Transmit */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 14: TSEC 0 Receive */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 15: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 16: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 17: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 18: TSEC 0 Receive/Transmit Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 19: TSEC 1 Transmit */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 20: TSEC 1 Receive */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 21: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 22: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 23: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 24: TSEC 1 Receive/Transmit Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 25: Fast Ethernet */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 26: DUART */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 27: I2C */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 28: Performance Monitor */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 29: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 30: CPM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 31: Unused */
+        MPC85XX_INTERNAL_IRQ_SENSES,
 #if defined(CONFIG_PCI)
         (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 0: PCI1 slot */
         (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 1: PCI1 slot */
@@ -181,6 +149,7 @@ void __init
 mpc85xx_cds_init_IRQ(void)
 {
         bd_t *binfo = (bd_t *) __res;
+        int i;
 
         /* Determine the Physical Address of the OpenPIC regs */
         phys_addr_t OpenPIC_PAddr = binfo->bi_immr_base + MPC85xx_OPENPIC_OFFSET;
@@ -189,15 +158,28 @@ mpc85xx_cds_init_IRQ(void)
         OpenPIC_NumInitSenses = sizeof (mpc85xx_cds_openpic_initsenses);
 
         /* Skip reserved space and internal sources */
+#ifdef CONFIG_MPC8548
+        openpic_set_sources(0, 48, OpenPIC_Addr + 0x10200);
+#else
         openpic_set_sources(0, 32, OpenPIC_Addr + 0x10200);
+#endif
         /* Map PIC IRQs 0-11 */
-        openpic_set_sources(32, 12, OpenPIC_Addr + 0x10000);
+        openpic_set_sources(48, 12, OpenPIC_Addr + 0x10000);
 
         /* we let openpic interrupts starting from an offset, to
          * leave space for cascading interrupts underneath.
          */
         openpic_init(MPC85xx_OPENPIC_IRQ_OFFSET);
 
+#ifdef CONFIG_PCI
+        openpic_hookup_cascade(PIRQ0A, "82c59 cascade", i8259_irq);
+
+        for (i = 0; i < NUM_8259_INTERRUPTS; i++)
+                irq_desc[i].handler = &i8259_pic;
+
+        i8259_init(0);
+#endif
+
 #ifdef CONFIG_CPM2
         /* Setup CPM2 PIC */
         cpm2_init_IRQ();
@@ -231,7 +213,7 @@ mpc85xx_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
                          * interrupt on slot */
                 {
                         { 0, 1, 2, 3 }, /* 16 - PMC */
-                        { 3, 0, 0, 0 }, /* 17 P2P (Tsi320) */
+                        { 0, 1, 2, 3 }, /* 17 P2P (Tsi320) */
                         { 0, 1, 2, 3 }, /* 18 - Slot 1 */
                         { 1, 2, 3, 0 }, /* 19 - Slot 2 */
                         { 2, 3, 0, 1 }, /* 20 - Slot 3 */
@@ -280,13 +262,135 @@ mpc85xx_exclude_device(u_char bus, u_char devfn)
                         return PCIBIOS_DEVICE_NOT_FOUND;
 #endif
         /* We explicitly do not go past the Tundra 320 Bridge */
-        if (bus == 1)
+        if ((bus == 1) && (PCI_SLOT(devfn) == ARCADIA_2ND_BRIDGE_IDSEL))
                 return PCIBIOS_DEVICE_NOT_FOUND;
         if ((bus == 0) && (PCI_SLOT(devfn) == ARCADIA_2ND_BRIDGE_IDSEL))
                 return PCIBIOS_DEVICE_NOT_FOUND;
         else
                 return PCIBIOS_SUCCESSFUL;
 }
+
+void __init
+mpc85xx_cds_enable_via(struct pci_controller *hose)
+{
+        u32 pci_class;
+        u16 vid, did;
+
+        early_read_config_dword(hose, 0, 0x88, PCI_CLASS_REVISION, &pci_class);
+        if ((pci_class >> 16) != PCI_CLASS_BRIDGE_PCI)
+                return;
+
+        /* Configure P2P so that we can reach bus 1 */
+        early_write_config_byte(hose, 0, 0x88, PCI_PRIMARY_BUS, 0);
+        early_write_config_byte(hose, 0, 0x88, PCI_SECONDARY_BUS, 1);
+        early_write_config_byte(hose, 0, 0x88, PCI_SUBORDINATE_BUS, 0xff);
+
+        early_read_config_word(hose, 1, 0x10, PCI_VENDOR_ID, &vid);
+        early_read_config_word(hose, 1, 0x10, PCI_DEVICE_ID, &did);
+
+        if ((vid != PCI_VENDOR_ID_VIA) ||
+                        (did != PCI_DEVICE_ID_VIA_82C686))
+                return;
+
+        /* Enable USB and IDE functions */
+        early_write_config_byte(hose, 1, 0x10, 0x48, 0x08);
+}
+
+void __init
+mpc85xx_cds_fixup_via(struct pci_controller *hose)
+{
+        u32 pci_class;
+        u16 vid, did;
+
+        early_read_config_dword(hose, 0, 0x88, PCI_CLASS_REVISION, &pci_class);
+        if ((pci_class >> 16) != PCI_CLASS_BRIDGE_PCI)
+                return;
+
+        /*
+         * Force the backplane P2P bridge to have a window
+         * open from 0x00000000-0x00001fff in PCI I/O space.
+         * This allows legacy I/O (i8259, etc) on the VIA
+         * southbridge to be accessed.
+         */
+        early_write_config_byte(hose, 0, 0x88, PCI_IO_BASE, 0x00);
+        early_write_config_word(hose, 0, 0x88, PCI_IO_BASE_UPPER16, 0x0000);
+        early_write_config_byte(hose, 0, 0x88, PCI_IO_LIMIT, 0x10);
+        early_write_config_word(hose, 0, 0x88, PCI_IO_LIMIT_UPPER16, 0x0000);
+
+        early_read_config_word(hose, 1, 0x10, PCI_VENDOR_ID, &vid);
+        early_read_config_word(hose, 1, 0x10, PCI_DEVICE_ID, &did);
+        if ((vid != PCI_VENDOR_ID_VIA) ||
+                        (did != PCI_DEVICE_ID_VIA_82C686))
+                return;
+
+        /*
+         * Since the P2P window was forced to cover the fixed
+         * legacy I/O addresses, it is necessary to manually
+         * place the base addresses for the IDE and USB functions
+         * within this window.
+         */
+        /* Function 1, IDE */
+        early_write_config_dword(hose, 1, 0x11, PCI_BASE_ADDRESS_0, 0x1ff8);
+        early_write_config_dword(hose, 1, 0x11, PCI_BASE_ADDRESS_1, 0x1ff4);
+        early_write_config_dword(hose, 1, 0x11, PCI_BASE_ADDRESS_2, 0x1fe8);
+        early_write_config_dword(hose, 1, 0x11, PCI_BASE_ADDRESS_3, 0x1fe4);
+        early_write_config_dword(hose, 1, 0x11, PCI_BASE_ADDRESS_4, 0x1fd0);
+
+        /* Function 2, USB ports 0-1 */
+        early_write_config_dword(hose, 1, 0x12, PCI_BASE_ADDRESS_4, 0x1fa0);
+
+        /* Function 3, USB ports 2-3 */
+        early_write_config_dword(hose, 1, 0x13, PCI_BASE_ADDRESS_4, 0x1f80);
+
+        /* Function 5, Power Management */
+        early_write_config_dword(hose, 1, 0x15, PCI_BASE_ADDRESS_0, 0x1e00);
+        early_write_config_dword(hose, 1, 0x15, PCI_BASE_ADDRESS_1, 0x1dfc);
+        early_write_config_dword(hose, 1, 0x15, PCI_BASE_ADDRESS_2, 0x1df8);
+
+        /* Function 6, AC97 Interface */
+        early_write_config_dword(hose, 1, 0x16, PCI_BASE_ADDRESS_0, 0x1c00);
+}
+
+void __init
+mpc85xx_cds_pcibios_fixup(void)
+{
+        struct pci_dev *dev = NULL;
+        u_char          c;
+
+        if ((dev = pci_find_device(PCI_VENDOR_ID_VIA,
+                                        PCI_DEVICE_ID_VIA_82C586_1, NULL))) {
+                /*
+                 * U-Boot does not set the enable bits
+                 * for the IDE device. Force them on here.
+                 */
+                pci_read_config_byte(dev, 0x40, &c);
+                c |= 0x03; /* IDE: Chip Enable Bits */
+                pci_write_config_byte(dev, 0x40, c);
+
+                /*
+                 * Since only primary interface works, force the
+                 * IDE function to standard primary IDE interrupt
+                 * w/ 8259 offset
+                 */
+                dev->irq = 14;
+                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq);
+        }
+
+        /*
+         * Force legacy USB interrupt routing
+         */
+        if ((dev = pci_find_device(PCI_VENDOR_ID_VIA,
+                                        PCI_DEVICE_ID_VIA_82C586_2, NULL))) {
+                dev->irq = 10;
+                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 10);
+        }
+
+        if ((dev = pci_find_device(PCI_VENDOR_ID_VIA,
+                                        PCI_DEVICE_ID_VIA_82C586_2, dev))) {
+                dev->irq = 11;
+                pci_write_config_byte(dev, PCI_INTERRUPT_LINE, 11);
+        }
+}
 #endif /* CONFIG_PCI */
 
 TODC_ALLOC();
@@ -328,6 +432,9 @@ mpc85xx_cds_setup_arch(void)
         loops_per_jiffy = freq / HZ;
 
 #ifdef CONFIG_PCI
+        /* VIA IDE configuration */
+        ppc_md.pcibios_fixup = mpc85xx_cds_pcibios_fixup;
+
         /* setup PCI host bridges */
         mpc85xx_setup_hose();
 #endif
@@ -339,26 +446,52 @@ mpc85xx_cds_setup_arch(void)
 #ifdef CONFIG_SERIAL_TEXT_DEBUG
         /* Invalidate the entry we stole earlier the serial ports
          * should be properly mapped */
-        invalidate_tlbcam_entry(NUM_TLBCAMS - 1);
+        invalidate_tlbcam_entry(num_tlbcam_entries - 1);
 #endif
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
-        pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-        pdata->interruptPHY = MPC85xx_IRQ_EXT5;
-        pdata->phyid = 0;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 0;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        }
 
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
-        pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-        pdata->interruptPHY = MPC85xx_IRQ_EXT5;
-        pdata->phyid = 1;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 1;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        }
+
+        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_eTSEC1);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 0;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        }
+
+        pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_eTSEC2);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 1;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        }
 
+        ppc_sys_device_remove(MPC85xx_eTSEC3);
+        ppc_sys_device_remove(MPC85xx_eTSEC4);
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start)
@@ -395,7 +528,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                 struct uart_port p;
 
                 /* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */
-                settlbcam(NUM_TLBCAMS - 1, binfo->bi_immr_base,
+                settlbcam(num_tlbcam_entries - 1, binfo->bi_immr_base,
                                 binfo->bi_immr_base, MPC85xx_CCSRBAR_SIZE, _PAGE_IO, 0);
 
                 memset(&p, 0, sizeof (p));
@@ -459,6 +592,9 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 #if defined(CONFIG_SERIAL_8250) && defined(CONFIG_SERIAL_TEXT_DEBUG)
         ppc_md.progress = gen550_progress;
 #endif /* CONFIG_SERIAL_8250 && CONFIG_SERIAL_TEXT_DEBUG */
+#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_KGDB)
+        ppc_md.early_serial_map = mpc85xx_early_serial_map;
+#endif  /* CONFIG_SERIAL_8250 && CONFIG_KGDB */
 
         if (ppc_md.progress)
                 ppc_md.progress("mpc85xx_cds_init(): exit", 0);
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
index 7627d77504..12b292c6ae 100644
--- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
+++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.h
@@ -77,4 +77,7 @@
 
 #define MPC85XX_PCI2_IO_SIZE         0x01000000
 
+#define NR_8259_INTS                 16
+#define CPM_IRQ_OFFSET               NR_8259_INTS
+
 #endif /* __MACH_MPC85XX_CDS_H__ */
diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c
index 9ab05e590c..165df94d4a 100644
--- a/arch/ppc/platforms/85xx/sbc8560.c
+++ b/arch/ppc/platforms/85xx/sbc8560.c
@@ -41,7 +41,6 @@
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/prom.h>
 #include <asm/open_pic.h>
 #include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
@@ -125,25 +124,29 @@ sbc8560_setup_arch(void)
 #ifdef CONFIG_SERIAL_TEXT_DEBUG
         /* Invalidate the entry we stole earlier the serial ports
          * should be properly mapped */ 
-        invalidate_tlbcam_entry(NUM_TLBCAMS - 1);
+        invalidate_tlbcam_entry(num_tlbcam_entries - 1);
 #endif
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
-        pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-        pdata->interruptPHY = MPC85xx_IRQ_EXT6;
-        pdata->phyid = 25;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT6;
+                pdata->phyid = 25;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        }
 
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
-        pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
-        pdata->interruptPHY = MPC85xx_IRQ_EXT7;
-        pdata->phyid = 26;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        if (pdata) {
+                pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR;
+                pdata->interruptPHY = MPC85xx_IRQ_EXT7;
+                pdata->phyid = 26;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        }
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start)
@@ -176,7 +179,7 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 
 #ifdef CONFIG_SERIAL_TEXT_DEBUG
         /* Use the last TLB entry to map CCSRBAR to allow access to DUART regs */
-        settlbcam(NUM_TLBCAMS - 1, UARTA_ADDR,
+        settlbcam(num_tlbcam_entries - 1, UARTA_ADDR,
                   UARTA_ADDR, 0x1000, _PAGE_IO, 0);
 #endif
 
@@ -221,6 +224,9 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 #if defined(CONFIG_SERIAL_8250) && defined(CONFIG_SERIAL_TEXT_DEBUG)
         ppc_md.progress = gen550_progress;
 #endif  /* CONFIG_SERIAL_8250 && CONFIG_SERIAL_TEXT_DEBUG */
+#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_KGDB)
+        ppc_md.early_serial_map = sbc8560_early_serial_map;
+#endif  /* CONFIG_SERIAL_8250 && CONFIG_KGDB */
 
         if (ppc_md.progress)
                 ppc_md.progress("sbc8560_init(): exit", 0);
diff --git a/arch/ppc/platforms/85xx/sbc85xx.c b/arch/ppc/platforms/85xx/sbc85xx.c
index 2d638c1c1b..4f6d1ddd6f 100644
--- a/arch/ppc/platforms/85xx/sbc85xx.c
+++ b/arch/ppc/platforms/85xx/sbc85xx.c
@@ -35,7 +35,6 @@
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/prom.h>
 #include <asm/open_pic.h>
 #include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
@@ -59,40 +58,8 @@ unsigned long pci_dram_offset = 0;
 extern unsigned long total_memory;      /* in mm/init */
 
 /* Internal interrupts are all Level Sensitive, and Positive Polarity */
-
 static u_char sbc8560_openpic_initsenses[] __initdata = {
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  0: L2 Cache */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  1: ECM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  2: DDR DRAM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  3: LBIU */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  4: DMA 0 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  5: DMA 1 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  6: DMA 2 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  7: DMA 3 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  8: PCI/PCI-X */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  9: RIO Inbound Port Write Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 10: RIO Doorbell Inbound */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 11: RIO Outbound Message */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 12: RIO Inbound Message */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 13: TSEC 0 Transmit */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 14: TSEC 0 Receive */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 15: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 16: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 17: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 18: TSEC 0 Receive/Transmit Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 19: TSEC 1 Transmit */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 20: TSEC 1 Receive */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 21: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 22: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 23: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 24: TSEC 1 Receive/Transmit Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 25: Fast Ethernet */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 26: DUART */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 27: I2C */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 28: Performance Monitor */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 29: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 30: CPM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 31: Unused */
+        MPC85XX_INTERNAL_IRQ_SENSES,
         0x0,                            /* External  0: */
         0x0,                            /* External  1: */
 #if defined(CONFIG_PCI)
@@ -159,7 +126,7 @@ sbc8560_init_IRQ(void)
         /* Skip reserved space and internal sources */
         openpic_set_sources(0, 32, OpenPIC_Addr + 0x10200);
         /* Map PIC IRQs 0-11 */
-        openpic_set_sources(32, 12, OpenPIC_Addr + 0x10000);
+        openpic_set_sources(48, 12, OpenPIC_Addr + 0x10000);
 
         /* we let openpic interrupts starting from an offset, to 
          * leave space for cascading interrupts underneath.
diff --git a/arch/ppc/platforms/85xx/stx_gp3.c b/arch/ppc/platforms/85xx/stx_gp3.c
index bc95836e41..bb41265cfc 100644
--- a/arch/ppc/platforms/85xx/stx_gp3.c
+++ b/arch/ppc/platforms/85xx/stx_gp3.c
@@ -46,7 +46,6 @@
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/machdep.h>
-#include <asm/prom.h>
 #include <asm/open_pic.h>
 #include <asm/bootinfo.h>
 #include <asm/pci-bridge.h>
@@ -72,38 +71,7 @@ unsigned long pci_dram_offset = 0;
 
 /* Internal interrupts are all Level Sensitive, and Positive Polarity */
 static u8 gp3_openpic_initsenses[] __initdata = {
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  0: L2 Cache */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  1: ECM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  2: DDR DRAM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  3: LBIU */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  4: DMA 0 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  5: DMA 1 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  6: DMA 2 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  7: DMA 3 */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  8: PCI/PCI-X */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal  9: RIO Inbound Port Write Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 10: RIO Doorbell Inbound */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 11: RIO Outbound Message */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 12: RIO Inbound Message */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 13: TSEC 0 Transmit */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 14: TSEC 0 Receive */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 15: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 16: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 17: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 18: TSEC 0 Receive/Transmit Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 19: TSEC 1 Transmit */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 20: TSEC 1 Receive */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 21: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 22: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 23: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 24: TSEC 1 Receive/Transmit Error */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 25: Fast Ethernet */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 26: DUART */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 27: I2C */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 28: Performance Monitor */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 29: Unused */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 30: CPM */
-        (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE),      /* Internal 31: Unused */
+        MPC85XX_INTERNAL_IRQ_SENSES,
         0x0,                                            /* External  0: */
 #if defined(CONFIG_PCI)
         (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE),      /* External 1: PCI slot 0 */
@@ -154,19 +122,23 @@ gp3_setup_arch(void)
 
         /* setup the board related information for the enet controllers */
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC1);
-/*      pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; */
-        pdata->interruptPHY = MPC85xx_IRQ_EXT5;
-        pdata->phyid = 2;
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        if (pdata) {
+        /*      pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; */
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 2;
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enetaddr, 6);
+        }
 
         pdata = (struct gianfar_platform_data *) ppc_sys_get_pdata(MPC85xx_TSEC2);
-/*      pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; */
-        pdata->interruptPHY = MPC85xx_IRQ_EXT5;
-        pdata->phyid = 4;
-        /* fixup phy address */
-        pdata->phy_reg_addr += binfo->bi_immr_base;
-        memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        if (pdata) {
+        /*      pdata->board_flags = FSL_GIANFAR_BRD_HAS_PHY_INTR; */
+                pdata->interruptPHY = MPC85xx_IRQ_EXT5;
+                pdata->phyid = 4;
+                /* fixup phy address */
+                pdata->phy_reg_addr += binfo->bi_immr_base;
+                memcpy(pdata->mac_addr, binfo->bi_enet1addr, 6);
+        }
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start)
@@ -200,7 +172,6 @@ static struct irqaction cpm2_irqaction = {
 static void __init
 gp3_init_IRQ(void)
 {
-        int i;
         bd_t *binfo = (bd_t *) __res;
 
         /*
@@ -218,7 +189,7 @@ gp3_init_IRQ(void)
         openpic_set_sources(0, 32, OpenPIC_Addr + 0x10200);
 
         /* Map PIC IRQs 0-11 */
-        openpic_set_sources(32, 12, OpenPIC_Addr + 0x10000);
+        openpic_set_sources(48, 12, OpenPIC_Addr + 0x10000);
 
         /*
          * Let openpic interrupts starting from an offset, to
diff --git a/arch/ppc/platforms/chrp_pci.c b/arch/ppc/platforms/chrp_pci.c
index 7d0ee308f6..7d3fbb5c5d 100644
--- a/arch/ppc/platforms/chrp_pci.c
+++ b/arch/ppc/platforms/chrp_pci.c
@@ -9,7 +9,6 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/ide.h>
-#include <linux/bootmem.h>
 
 #include <asm/io.h>
 #include <asm/pgtable.h>
diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c
index eda922ac31..169dbf6534 100644
--- a/arch/ppc/platforms/katana.c
+++ b/arch/ppc/platforms/katana.c
@@ -27,12 +27,12 @@
 #include <linux/root_dev.h>
 #include <linux/delay.h>
 #include <linux/seq_file.h>
-#include <linux/bootmem.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mv643xx.h>
 #ifdef CONFIG_BOOTIMG
 #include <linux/bootimg.h>
 #endif
+#include <asm/io.h>
 #include <asm/page.h>
 #include <asm/time.h>
 #include <asm/smp.h>
diff --git a/arch/ppc/platforms/pmac_cpufreq.c b/arch/ppc/platforms/pmac_cpufreq.c
index f7fb2786cd..5fdd4f607a 100644
--- a/arch/ppc/platforms/pmac_cpufreq.c
+++ b/arch/ppc/platforms/pmac_cpufreq.c
@@ -83,16 +83,13 @@ static u32 frequency_gpio;
 static u32 slew_done_gpio;
 static int no_schedule;
 static int has_cpu_l2lve;
-
-
-#define PMAC_CPU_LOW_SPEED      1
-#define PMAC_CPU_HIGH_SPEED     0
+static int is_pmu_based;
 
 /* There are only two frequency states for each processor. Values
  * are in kHz for the time being.
  */
-#define CPUFREQ_HIGH                  PMAC_CPU_HIGH_SPEED
-#define CPUFREQ_LOW                   PMAC_CPU_LOW_SPEED
+#define CPUFREQ_HIGH                  0
+#define CPUFREQ_LOW                   1
 
 static struct cpufreq_frequency_table pmac_cpu_freqs[] = {
         {CPUFREQ_HIGH,          0},
@@ -100,6 +97,11 @@ static struct cpufreq_frequency_table pmac_cpu_freqs[] = {
         {0,                     CPUFREQ_TABLE_END},
 };
 
+static struct freq_attr* pmac_cpu_freqs_attr[] = {
+        &cpufreq_freq_attr_scaling_available_freqs,
+        NULL,
+};
+
 static inline void local_delay(unsigned long ms)
 {
         if (no_schedule)
@@ -269,6 +271,8 @@ static int __pmac pmu_set_cpu_speed(int low_speed)
 #ifdef DEBUG_FREQ
         printk(KERN_DEBUG "HID1, before: %x\n", mfspr(SPRN_HID1));
 #endif
+        pmu_suspend();
+
         /* Disable all interrupt sources on openpic */
         pic_prio = openpic_get_priority();
         openpic_set_priority(0xf);
@@ -343,6 +347,8 @@ static int __pmac pmu_set_cpu_speed(int low_speed)
         debug_calc_bogomips();
 #endif
 
+        pmu_resume();
+
         preempt_enable();
 
         return 0;
@@ -355,7 +361,7 @@ static int __pmac do_set_cpu_speed(int speed_mode, int notify)
         static unsigned long prev_l3cr;
 
         freqs.old = cur_freq;
-        freqs.new = (speed_mode == PMAC_CPU_HIGH_SPEED) ? hi_freq : low_freq;
+        freqs.new = (speed_mode == CPUFREQ_HIGH) ? hi_freq : low_freq;
         freqs.cpu = smp_processor_id();
 
         if (freqs.old == freqs.new)
@@ -363,7 +369,7 @@ static int __pmac do_set_cpu_speed(int speed_mode, int notify)
 
         if (notify)
                 cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-        if (speed_mode == PMAC_CPU_LOW_SPEED &&
+        if (speed_mode == CPUFREQ_LOW &&
             cpu_has_feature(CPU_FTR_L3CR)) {
                 l3cr = _get_L3CR();
                 if (l3cr & L3CR_L3E) {
@@ -371,8 +377,8 @@ static int __pmac do_set_cpu_speed(int speed_mode, int notify)
                         _set_L3CR(0);
                 }
         }
-        set_speed_proc(speed_mode == PMAC_CPU_LOW_SPEED);
-        if (speed_mode == PMAC_CPU_HIGH_SPEED &&
+        set_speed_proc(speed_mode == CPUFREQ_LOW);
+        if (speed_mode == CPUFREQ_HIGH &&
             cpu_has_feature(CPU_FTR_L3CR)) {
                 l3cr = _get_L3CR();
                 if ((prev_l3cr & L3CR_L3E) && l3cr != prev_l3cr)
@@ -380,7 +386,7 @@ static int __pmac do_set_cpu_speed(int speed_mode, int notify)
         }
         if (notify)
                 cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-        cur_freq = (speed_mode == PMAC_CPU_HIGH_SPEED) ? hi_freq : low_freq;
+        cur_freq = (speed_mode == CPUFREQ_HIGH) ? hi_freq : low_freq;
 
         return 0;
 }
@@ -423,7 +429,8 @@ static int __pmac pmac_cpufreq_cpu_init(struct cpufreq_policy *policy)
         policy->cpuinfo.transition_latency      = CPUFREQ_ETERNAL;
         policy->cur = cur_freq;
 
-        return cpufreq_frequency_table_cpuinfo(policy, &pmac_cpu_freqs[0]);
+        cpufreq_frequency_table_get_attr(pmac_cpu_freqs, policy->cpu);
+        return cpufreq_frequency_table_cpuinfo(policy, pmac_cpu_freqs);
 }
 
 static u32 __pmac read_gpio(struct device_node *np)
@@ -456,8 +463,8 @@ static int __pmac pmac_cpufreq_suspend(struct cpufreq_policy *policy, u32 state)
          */
         no_schedule = 1;
         sleep_freq = cur_freq;
-        if (cur_freq == low_freq)
-                do_set_cpu_speed(PMAC_CPU_HIGH_SPEED, 0);
+        if (cur_freq == low_freq && !is_pmu_based)
+                do_set_cpu_speed(CPUFREQ_HIGH, 0);
         return 0;
 }
 
@@ -473,8 +480,8 @@ static int __pmac pmac_cpufreq_resume(struct cpufreq_policy *policy)
          * is that we force a switch to whatever it was, which is
          * probably high speed due to our suspend() routine
          */
-        do_set_cpu_speed(sleep_freq == low_freq ? PMAC_CPU_LOW_SPEED
-                         : PMAC_CPU_HIGH_SPEED, 0);
+        do_set_cpu_speed(sleep_freq == low_freq ?
+                         CPUFREQ_LOW : CPUFREQ_HIGH, 0);
 
         no_schedule = 0;
         return 0;
@@ -488,6 +495,7 @@ static struct cpufreq_driver pmac_cpufreq_driver = {
         .suspend        = pmac_cpufreq_suspend,
         .resume         = pmac_cpufreq_resume,
         .flags          = CPUFREQ_PM_NO_WARN,
+        .attr           = pmac_cpu_freqs_attr,
         .name           = "powermac",
         .owner          = THIS_MODULE,
 };
@@ -580,6 +588,7 @@ static int __pmac pmac_cpufreq_init_MacRISC3(struct device_node *cpunode)
                 return 1;
         hi_freq = (*value) / 1000;
         set_speed_proc = pmu_set_cpu_speed;
+        is_pmu_based = 1;
 
         return 0;
 }
@@ -684,6 +693,7 @@ static int __init pmac_cpufreq_setup(void)
                 hi_freq = cur_freq;
                 low_freq = 400000;
                 set_speed_proc = pmu_set_cpu_speed;
+                is_pmu_based = 1;
         }
         /* Else check for TiPb 400 & 500 */
         else if (machine_is_compatible("PowerBook3,2")) {
@@ -695,6 +705,7 @@ static int __init pmac_cpufreq_setup(void)
                 hi_freq = cur_freq;
                 low_freq = 300000;
                 set_speed_proc = pmu_set_cpu_speed;
+                is_pmu_based = 1;
         }
         /* Else check for 750FX */
         else if (PVR_VER(mfspr(SPRN_PVR)) == 0x7000)
diff --git a/arch/ppc/platforms/pmac_pci.c b/arch/ppc/platforms/pmac_pci.c
index f6ff519240..719fb49fe2 100644
--- a/arch/ppc/platforms/pmac_pci.c
+++ b/arch/ppc/platforms/pmac_pci.c
@@ -17,7 +17,6 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
 
 #include <asm/sections.h>
 #include <asm/io.h>
diff --git a/arch/ppc/platforms/pq2ads.h b/arch/ppc/platforms/pq2ads.h
index cf5e5dd06d..067d9a5aeb 100644
--- a/arch/ppc/platforms/pq2ads.h
+++ b/arch/ppc/platforms/pq2ads.h
@@ -49,10 +49,10 @@
 /* PCI interrupt controller */
 #define PCI_INT_STAT_REG        0xF8200000
 #define PCI_INT_MASK_REG        0xF8200004
-#define PIRQA                   (NR_SIU_INTS + 0)
-#define PIRQB                   (NR_SIU_INTS + 1)
-#define PIRQC                   (NR_SIU_INTS + 2)
-#define PIRQD                   (NR_SIU_INTS + 3)
+#define PIRQA                   (NR_CPM_INTS + 0)
+#define PIRQB                   (NR_CPM_INTS + 1)
+#define PIRQC                   (NR_CPM_INTS + 2)
+#define PIRQD                   (NR_CPM_INTS + 3)
 
 /*
  * PCI memory map definitions for MPC8266ADS-PCI.
@@ -68,28 +68,23 @@
  *      0x00000000-0x1FFFFFFF   0x00000000-0x1FFFFFFF   MPC8266 local memory
  */
 
-/* window for a PCI master to access MPC8266 memory */
-#define PCI_SLV_MEM_LOCAL       0x00000000      /* Local base */
-#define PCI_SLV_MEM_BUS         0x00000000      /* PCI base */
+/* All the other PCI memory map definitions reside at syslib/m82xx_pci.h
+   Here we should redefine what is unique for this board */
+#define M82xx_PCI_SLAVE_MEM_LOCAL       0x00000000      /* Local base */
+#define M82xx_PCI_SLAVE_MEM_BUS         0x00000000      /* PCI base */
+#define M82xx_PCI_SLAVE_MEM_SIZE        0x10000000      /* 256 Mb */
 
-/* window for the processor to access PCI memory with prefetching */
-#define PCI_MSTR_MEM_LOCAL      0x80000000      /* Local base */
-#define PCI_MSTR_MEM_BUS        0x80000000      /* PCI base   */
-#define PCI_MSTR_MEM_SIZE       0x20000000      /* 512MB */
+#define M82xx_PCI_SLAVE_SEC_WND_SIZE    ~(0x40000000 - 1U)      /* 2 x 512Mb  */
+#define M82xx_PCI_SLAVE_SEC_WND_BASE    0x80000000              /* PCI Memory base */
 
-/* window for the processor to access PCI memory without prefetching */
-#define PCI_MSTR_MEMIO_LOCAL    0xA0000000      /* Local base */
-#define PCI_MSTR_MEMIO_BUS      0xA0000000      /* PCI base   */
-#define PCI_MSTR_MEMIO_SIZE     0x20000000      /* 512MB */
+#if defined(CONFIG_ADS8272)
+#define PCI_INT_TO_SIU  SIU_INT_IRQ2
+#elif defined(CONFIG_PQ2FADS)
+#define PCI_INT_TO_SIU  SIU_INT_IRQ6
+#else
+#warning PCI Bridge will be without interrupts support
+#endif
 
-/* window for the processor to access PCI I/O */
-#define PCI_MSTR_IO_LOCAL       0xF4000000      /* Local base */
-#define PCI_MSTR_IO_BUS         0x00000000      /* PCI base   */
-#define PCI_MSTR_IO_SIZE        0x04000000      /* 64MB */
-
-#define _IO_BASE                PCI_MSTR_IO_LOCAL
-#define _ISA_MEM_BASE           PCI_MSTR_MEMIO_LOCAL
-#define PCI_DRAM_OFFSET         PCI_SLV_MEM_BUS
 #endif /* CONFIG_PCI */
 
 #endif /* __MACH_ADS8260_DEFS */
diff --git a/arch/ppc/platforms/sandpoint.c b/arch/ppc/platforms/sandpoint.c
index 531bfa0e45..70e58f43f2 100644
--- a/arch/ppc/platforms/sandpoint.c
+++ b/arch/ppc/platforms/sandpoint.c
@@ -81,6 +81,7 @@
 #include <linux/serial.h>
 #include <linux/tty.h>  /* for linux/serial_core.h */
 #include <linux/serial_core.h>
+#include <linux/serial_8250.h>
 
 #include <asm/system.h>
 #include <asm/pgtable.h>
@@ -99,6 +100,7 @@
 #include <asm/mpc10x.h>
 #include <asm/pci-bridge.h>
 #include <asm/kgdb.h>
+#include <asm/ppc_sys.h>
 
 #include "sandpoint.h"
 
@@ -305,6 +307,24 @@ sandpoint_setup_arch(void)
         /* Lookup PCI host bridges */
         sandpoint_find_bridges();
 
+        if (strncmp (cur_ppc_sys_spec->ppc_sys_name, "8245", 4) == 0)
+        {
+                bd_t *bp = (bd_t *)__res;
+                struct plat_serial8250_port *pdata;
+                pdata = (struct plat_serial8250_port *) ppc_sys_get_pdata(MPC10X_DUART);
+
+                if (pdata)
+                {
+                        pdata[0].uartclk = bp->bi_busfreq;
+                        pdata[0].membase = ioremap(pdata[0].mapbase, 0x100);
+
+                        /* this disables the 2nd serial port on the DUART
+                         * since the sandpoint does not have it connected */
+                        pdata[1].uartclk = 0;
+                        pdata[1].irq = 0;
+                        pdata[1].mapbase = 0;
+                }
+
         printk(KERN_INFO "Motorola SPS Sandpoint Test Platform\n");
         printk(KERN_INFO "Port by MontaVista Software, Inc. (source@mvista.com)\n");
 
diff --git a/arch/ppc/syslib/Makefile b/arch/ppc/syslib/Makefile
index dd418ea342..dec5bf4f68 100644
--- a/arch/ppc/syslib/Makefile
+++ b/arch/ppc/syslib/Makefile
@@ -81,7 +81,7 @@ obj-$(CONFIG_SBC82xx)		+= todc_time.o
 obj-$(CONFIG_SPRUCE)            += cpc700_pic.o indirect_pci.o pci_auto.o \
                                    todc_time.o
 obj-$(CONFIG_8260)              += m8260_setup.o
-obj-$(CONFIG_PCI_8260)          += m8260_pci.o indirect_pci.o
+obj-$(CONFIG_PCI_8260)          += m82xx_pci.o indirect_pci.o pci_auto.o
 obj-$(CONFIG_8260_PCI9)         += m8260_pci_erratum9.o
 obj-$(CONFIG_CPM2)              += cpm2_common.o cpm2_pic.o
 ifeq ($(CONFIG_PPC_GEN550),y)
@@ -92,12 +92,12 @@ ifeq ($(CONFIG_SERIAL_MPSC_CONSOLE),y)
 obj-$(CONFIG_SERIAL_TEXT_DEBUG) += mv64x60_dbg.o
 endif
 obj-$(CONFIG_BOOTX_TEXT)        += btext.o
-obj-$(CONFIG_MPC10X_BRIDGE)     += mpc10x_common.o indirect_pci.o
+obj-$(CONFIG_MPC10X_BRIDGE)     += mpc10x_common.o indirect_pci.o ppc_sys.o
 obj-$(CONFIG_MPC10X_OPENPIC)    += open_pic.o
 obj-$(CONFIG_40x)               += dcr.o
 obj-$(CONFIG_BOOKE)             += dcr.o
 obj-$(CONFIG_85xx)              += open_pic.o ppc85xx_common.o ppc85xx_setup.o \
-                                        ppc_sys.o mpc85xx_sys.o \
+                                        ppc_sys.o i8259.o mpc85xx_sys.o \
                                         mpc85xx_devices.o
 ifeq ($(CONFIG_85xx),y)
 obj-$(CONFIG_PCI)               += indirect_pci.o pci_auto.o
@@ -107,6 +107,7 @@ obj-$(CONFIG_83xx)		+= ipic.o ppc83xx_setup.o ppc_sys.o \
 ifeq ($(CONFIG_83xx),y)
 obj-$(CONFIG_PCI)               += indirect_pci.o pci_auto.o
 endif
+obj-$(CONFIG_MPC8548_CDS)       += todc_time.o
 obj-$(CONFIG_MPC8555_CDS)       += todc_time.o
 obj-$(CONFIG_PPC_MPC52xx)       += mpc52xx_setup.o mpc52xx_pic.o \
                                         mpc52xx_sys.o mpc52xx_devices.o ppc_sys.o
diff --git a/arch/ppc/syslib/cpm2_common.c b/arch/ppc/syslib/cpm2_common.c
index ea5e77080e..4c19a4ac71 100644
--- a/arch/ppc/syslib/cpm2_common.c
+++ b/arch/ppc/syslib/cpm2_common.c
@@ -21,8 +21,8 @@
 #include <linux/string.h>
 #include <linux/mm.h>
 #include <linux/interrupt.h>
-#include <linux/bootmem.h>
 #include <linux/module.h>
+#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/mpc8260.h>
 #include <asm/page.h>
diff --git a/arch/ppc/syslib/indirect_pci.c b/arch/ppc/syslib/indirect_pci.c
index a5a752609e..e714884697 100644
--- a/arch/ppc/syslib/indirect_pci.c
+++ b/arch/ppc/syslib/indirect_pci.c
@@ -14,7 +14,6 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
 
 #include <asm/io.h>
 #include <asm/prom.h>
diff --git a/arch/ppc/syslib/ipic.c b/arch/ppc/syslib/ipic.c
index 580ed658e8..8f01e0f1d8 100644
--- a/arch/ppc/syslib/ipic.c
+++ b/arch/ppc/syslib/ipic.c
@@ -79,7 +79,7 @@ static struct ipic_info ipic_info[] = {
                 .prio_mask = 7,
         },
         [17] = {
-                .pend   = IPIC_SIPNR_H,
+                .pend   = IPIC_SEPNR,
                 .mask   = IPIC_SEMSR,
                 .prio   = IPIC_SMPRR_A,
                 .force  = IPIC_SEFCR,
@@ -87,7 +87,7 @@ static struct ipic_info ipic_info[] = {
                 .prio_mask = 5,
         },
         [18] = {
-                .pend   = IPIC_SIPNR_H,
+                .pend   = IPIC_SEPNR,
                 .mask   = IPIC_SEMSR,
                 .prio   = IPIC_SMPRR_A,
                 .force  = IPIC_SEFCR,
@@ -95,7 +95,7 @@ static struct ipic_info ipic_info[] = {
                 .prio_mask = 6,
         },
         [19] = {
-                .pend   = IPIC_SIPNR_H,
+                .pend   = IPIC_SEPNR,
                 .mask   = IPIC_SEMSR,
                 .prio   = IPIC_SMPRR_A,
                 .force  = IPIC_SEFCR,
@@ -103,7 +103,7 @@ static struct ipic_info ipic_info[] = {
                 .prio_mask = 7,
         },
         [20] = {
-                .pend   = IPIC_SIPNR_H,
+                .pend   = IPIC_SEPNR,
                 .mask   = IPIC_SEMSR,
                 .prio   = IPIC_SMPRR_B,
                 .force  = IPIC_SEFCR,
@@ -111,7 +111,7 @@ static struct ipic_info ipic_info[] = {
                 .prio_mask = 4,
         },
         [21] = {
-                .pend   = IPIC_SIPNR_H,
+                .pend   = IPIC_SEPNR,
                 .mask   = IPIC_SEMSR,
                 .prio   = IPIC_SMPRR_B,
                 .force  = IPIC_SEFCR,
@@ -119,7 +119,7 @@ static struct ipic_info ipic_info[] = {
                 .prio_mask = 5,
         },
         [22] = {
-                .pend   = IPIC_SIPNR_H,
+                .pend   = IPIC_SEPNR,
                 .mask   = IPIC_SEMSR,
                 .prio   = IPIC_SMPRR_B,
                 .force  = IPIC_SEFCR,
@@ -127,7 +127,7 @@ static struct ipic_info ipic_info[] = {
                 .prio_mask = 6,
         },
         [23] = {
-                .pend   = IPIC_SIPNR_H,
+                .pend   = IPIC_SEPNR,
                 .mask   = IPIC_SEMSR,
                 .prio   = IPIC_SMPRR_B,
                 .force  = IPIC_SEFCR,
diff --git a/arch/ppc/syslib/m8260_pci.c b/arch/ppc/syslib/m8260_pci.c
deleted file mode 100644
index 057cc3f8ff..0000000000
--- a/arch/ppc/syslib/m8260_pci.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * (C) Copyright 2003
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * (C) Copyright 2004 Red Hat, Inc.
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/pci.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
-
-#include <asm/byteorder.h>
-#include <asm/io.h>
-#include <asm/irq.h>
-#include <asm/uaccess.h>
-#include <asm/machdep.h>
-#include <asm/pci-bridge.h>
-#include <asm/immap_cpm2.h>
-#include <asm/mpc8260.h>
-
-#include "m8260_pci.h"
-
-
-/* PCI bus configuration registers.
- */
-
-static void __init m8260_setup_pci(struct pci_controller *hose)
-{
-        volatile cpm2_map_t *immap = cpm2_immr;
-        unsigned long pocmr;
-        u16 tempShort;
-
-#ifndef CONFIG_ATC      /* already done in U-Boot */
-        /* 
-         * Setting required to enable IRQ1-IRQ7 (SIUMCR [DPPC]), 
-         * and local bus for PCI (SIUMCR [LBPC]).
-         */
-        immap->im_siu_conf.siu_82xx.sc_siumcr = 0x00640000;
-#endif
-
-        /* Make PCI lowest priority */
-        /* Each 4 bits is a device bus request  and the MS 4bits 
-           is highest priority */
-        /* Bus               4bit value 
-           ---               ----------
-           CPM high          0b0000
-           CPM middle        0b0001
-           CPM low           0b0010
-           PCI reguest       0b0011
-           Reserved          0b0100
-           Reserved          0b0101
-           Internal Core     0b0110
-           External Master 1 0b0111
-           External Master 2 0b1000
-           External Master 3 0b1001
-           The rest are reserved */
-        immap->im_siu_conf.siu_82xx.sc_ppc_alrh = 0x61207893;
-
-        /* Park bus on core while modifying PCI Bus accesses */
-        immap->im_siu_conf.siu_82xx.sc_ppc_acr = 0x6;
-
-        /* 
-         * Set up master window that allows the CPU to access PCI space. This 
-         * window is set up using the first SIU PCIBR registers.
-         */
-        immap->im_memctl.memc_pcimsk0 = MPC826x_PCI_MASK;
-        immap->im_memctl.memc_pcibr0 =  MPC826x_PCI_BASE | PCIBR_ENABLE;
-
-        /* Disable machine check on no response or target abort */
-        immap->im_pci.pci_emr = cpu_to_le32(0x1fe7);
-        /* Release PCI RST (by default the PCI RST signal is held low)  */
-        immap->im_pci.pci_gcr = cpu_to_le32(PCIGCR_PCI_BUS_EN);
-
-        /* give it some time */
-        mdelay(1);
-
-        /* 
-         * Set up master window that allows the CPU to access PCI Memory (prefetch) 
-         * space. This window is set up using the first set of Outbound ATU registers.
-         */
-        immap->im_pci.pci_potar0 = cpu_to_le32(MPC826x_PCI_LOWER_MEM >> 12);
-        immap->im_pci.pci_pobar0 = cpu_to_le32((MPC826x_PCI_LOWER_MEM - MPC826x_PCI_MEM_OFFSET) >> 12);
-        pocmr = ((MPC826x_PCI_UPPER_MEM - MPC826x_PCI_LOWER_MEM) >> 12) ^ 0xfffff;
-        immap->im_pci.pci_pocmr0 = cpu_to_le32(pocmr | POCMR_ENABLE | POCMR_PREFETCH_EN);
-
-        /* 
-         * Set up master window that allows the CPU to access PCI Memory (non-prefetch) 
-         * space. This window is set up using the second set of Outbound ATU registers.
-         */
-        immap->im_pci.pci_potar1 = cpu_to_le32(MPC826x_PCI_LOWER_MMIO >> 12);
-        immap->im_pci.pci_pobar1 = cpu_to_le32((MPC826x_PCI_LOWER_MMIO - MPC826x_PCI_MMIO_OFFSET) >> 12);
-        pocmr = ((MPC826x_PCI_UPPER_MMIO - MPC826x_PCI_LOWER_MMIO) >> 12) ^ 0xfffff;
-        immap->im_pci.pci_pocmr1 = cpu_to_le32(pocmr | POCMR_ENABLE);
-
-        /* 
-         * Set up master window that allows the CPU to access PCI IO space. This window
-         * is set up using the third set of Outbound ATU registers.
-         */
-        immap->im_pci.pci_potar2 = cpu_to_le32(MPC826x_PCI_IO_BASE >> 12);
-        immap->im_pci.pci_pobar2 = cpu_to_le32(MPC826x_PCI_LOWER_IO >> 12);
-        pocmr = ((MPC826x_PCI_UPPER_IO - MPC826x_PCI_LOWER_IO) >> 12) ^ 0xfffff;
-        immap->im_pci.pci_pocmr2 = cpu_to_le32(pocmr | POCMR_ENABLE | POCMR_PCI_IO);
-
-        /* 
-         * Set up slave window that allows PCI masters to access MPC826x local memory. 
-         * This window is set up using the first set of Inbound ATU registers
-         */
-
-        immap->im_pci.pci_pitar0 = cpu_to_le32(MPC826x_PCI_SLAVE_MEM_LOCAL >> 12);
-        immap->im_pci.pci_pibar0 = cpu_to_le32(MPC826x_PCI_SLAVE_MEM_BUS >> 12);
-        pocmr = ((MPC826x_PCI_SLAVE_MEM_SIZE-1) >> 12) ^ 0xfffff;
-        immap->im_pci.pci_picmr0 = cpu_to_le32(pocmr | PICMR_ENABLE | PICMR_PREFETCH_EN);
-
-        /* See above for description - puts PCI request as highest priority */
-        immap->im_siu_conf.siu_82xx.sc_ppc_alrh = 0x03124567;
-
-        /* Park the bus on the PCI */
-        immap->im_siu_conf.siu_82xx.sc_ppc_acr = PPC_ACR_BUS_PARK_PCI;
-
-        /* Host mode - specify the bridge as a host-PCI bridge */
-        early_write_config_word(hose, 0, 0, PCI_CLASS_DEVICE, PCI_CLASS_BRIDGE_HOST);
-
-        /* Enable the host bridge to be a master on the PCI bus, and to act as a PCI memory target */
-        early_read_config_word(hose, 0, 0, PCI_COMMAND, &tempShort);
-        early_write_config_word(hose, 0, 0, PCI_COMMAND,
-                                tempShort | PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
-}
-
-void __init m8260_find_bridges(void)
-{
-        extern int pci_assign_all_busses;
-        struct pci_controller * hose;
-
-        pci_assign_all_busses = 1;
-
-        hose = pcibios_alloc_controller();
-
-        if (!hose)
-                return;
-
-        ppc_md.pci_swizzle = common_swizzle;
-
-        hose->first_busno = 0;
-        hose->bus_offset = 0;
-        hose->last_busno = 0xff;
-
-        setup_m8260_indirect_pci(hose, 
-                                 (unsigned long)&cpm2_immr->im_pci.pci_cfg_addr,
-                                 (unsigned long)&cpm2_immr->im_pci.pci_cfg_data);
-
-        m8260_setup_pci(hose);
-        hose->pci_mem_offset = MPC826x_PCI_MEM_OFFSET;
-
-        hose->io_base_virt = ioremap(MPC826x_PCI_IO_BASE,
-                                        MPC826x_PCI_IO_SIZE);
-        isa_io_base = (unsigned long) hose->io_base_virt;
- 
-        /* setup resources */
-        pci_init_resource(&hose->mem_resources[0],
-                          MPC826x_PCI_LOWER_MEM,
-                          MPC826x_PCI_UPPER_MEM,
-                          IORESOURCE_MEM|IORESOURCE_PREFETCH, "PCI prefetchable memory");
-
-        pci_init_resource(&hose->mem_resources[1],
-                          MPC826x_PCI_LOWER_MMIO,
-                          MPC826x_PCI_UPPER_MMIO,
-                          IORESOURCE_MEM, "PCI memory");
-
-        pci_init_resource(&hose->io_resource,
-                          MPC826x_PCI_LOWER_IO,
-                          MPC826x_PCI_UPPER_IO,
-                          IORESOURCE_IO, "PCI I/O");
-}
diff --git a/arch/ppc/syslib/m8260_pci.h b/arch/ppc/syslib/m8260_pci.h
deleted file mode 100644
index d1352120ac..0000000000
--- a/arch/ppc/syslib/m8260_pci.h
+++ /dev/null
@@ -1,76 +0,0 @@
-
-#ifndef _PPC_KERNEL_M8260_PCI_H
-#define _PPC_KERNEL_M8260_PCI_H
-
-#include <asm/m8260_pci.h>
-
-/*
- *   Local->PCI map (from CPU)                             controlled by
- *   MPC826x master window
- *
- *   0x80000000 - 0xBFFFFFFF    Total CPU2PCI space        PCIBR0
- *                       
- *   0x80000000 - 0x9FFFFFFF    PCI Mem with prefetch      (Outbound ATU #1)
- *   0xA0000000 - 0xAFFFFFFF    PCI Mem w/o  prefetch      (Outbound ATU #2)
- *   0xB0000000 - 0xB0FFFFFF    32-bit PCI IO              (Outbound ATU #3)
- *                      
- *   PCI->Local map (from PCI)
- *   MPC826x slave window                                  controlled by
- *
- *   0x00000000 - 0x07FFFFFF    MPC826x local memory       (Inbound ATU #1)
- */
-
-/* 
- * Slave window that allows PCI masters to access MPC826x local memory. 
- * This window is set up using the first set of Inbound ATU registers
- */
-
-#ifndef MPC826x_PCI_SLAVE_MEM_LOCAL
-#define MPC826x_PCI_SLAVE_MEM_LOCAL     (((struct bd_info *)__res)->bi_memstart)
-#define MPC826x_PCI_SLAVE_MEM_BUS       (((struct bd_info *)__res)->bi_memstart)
-#define MPC826x_PCI_SLAVE_MEM_SIZE      (((struct bd_info *)__res)->bi_memsize)
-#endif
-
-/* 
- * This is the window that allows the CPU to access PCI address space.
- * It will be setup with the SIU PCIBR0 register. All three PCI master
- * windows, which allow the CPU to access PCI prefetch, non prefetch,
- * and IO space (see below), must all fit within this window. 
- */
-#ifndef MPC826x_PCI_BASE
-#define MPC826x_PCI_BASE        0x80000000
-#define MPC826x_PCI_MASK        0xc0000000
-#endif
-
-#ifndef MPC826x_PCI_LOWER_MEM
-#define MPC826x_PCI_LOWER_MEM  0x80000000
-#define MPC826x_PCI_UPPER_MEM  0x9fffffff
-#define MPC826x_PCI_MEM_OFFSET 0x00000000
-#endif
-
-#ifndef MPC826x_PCI_LOWER_MMIO
-#define MPC826x_PCI_LOWER_MMIO  0xa0000000
-#define MPC826x_PCI_UPPER_MMIO  0xafffffff
-#define MPC826x_PCI_MMIO_OFFSET 0x00000000
-#endif
-
-#ifndef MPC826x_PCI_LOWER_IO
-#define MPC826x_PCI_LOWER_IO   0x00000000
-#define MPC826x_PCI_UPPER_IO   0x00ffffff
-#define MPC826x_PCI_IO_BASE    0xb0000000
-#define MPC826x_PCI_IO_SIZE    0x01000000
-#endif
-
-#ifndef _IO_BASE
-#define _IO_BASE isa_io_base
-#endif
-
-#ifdef CONFIG_8260_PCI9
-struct pci_controller;
-extern void setup_m8260_indirect_pci(struct pci_controller* hose,
-                                     u32 cfg_addr, u32 cfg_data);
-#else
-#define setup_m8260_indirect_pci setup_indirect_pci
-#endif
-
-#endif /* _PPC_KERNEL_M8260_PCI_H */
diff --git a/arch/ppc/syslib/m8260_pci_erratum9.c b/arch/ppc/syslib/m8260_pci_erratum9.c
index 9c0582d639..1dc7e4e1d4 100644
--- a/arch/ppc/syslib/m8260_pci_erratum9.c
+++ b/arch/ppc/syslib/m8260_pci_erratum9.c
@@ -31,7 +31,7 @@
 #include <asm/immap_cpm2.h>
 #include <asm/cpm2.h>
 
-#include "m8260_pci.h"
+#include "m82xx_pci.h"
 
 #ifdef CONFIG_8260_PCI9
 /*#include <asm/mpc8260_pci9.h>*/ /* included in asm/io.h */
@@ -248,11 +248,11 @@ EXPORT_SYMBOL(idma_pci9_read_le);
 
 static inline int is_pci_mem(unsigned long addr)
 {
-        if (addr >= MPC826x_PCI_LOWER_MMIO &&
-            addr <= MPC826x_PCI_UPPER_MMIO)
+        if (addr >= M82xx_PCI_LOWER_MMIO &&
+                addr <= M82xx_PCI_UPPER_MMIO)
                 return 1;
-        if (addr >= MPC826x_PCI_LOWER_MEM &&
-            addr <= MPC826x_PCI_UPPER_MEM)
+        if (addr >= M82xx_PCI_LOWER_MEM &&
+                addr <= M82xx_PCI_UPPER_MEM)
                 return 1;
         return 0;
 }
diff --git a/arch/ppc/syslib/m8260_setup.c b/arch/ppc/syslib/m8260_setup.c
index 23ea3f694d..fda75d7905 100644
--- a/arch/ppc/syslib/m8260_setup.c
+++ b/arch/ppc/syslib/m8260_setup.c
@@ -34,7 +34,8 @@
 unsigned char __res[sizeof(bd_t)];
 
 extern void cpm2_reset(void);
-extern void m8260_find_bridges(void);
+extern void pq2_find_bridges(void);
+extern void pq2pci_init_irq(void);
 extern void idma_pci9_init(void);
 
 /* Place-holder for board-specific init */
@@ -56,7 +57,7 @@ m8260_setup_arch(void)
         idma_pci9_init();
 #endif
 #ifdef CONFIG_PCI_8260
-        m8260_find_bridges();
+        pq2_find_bridges();
 #endif
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start)
@@ -173,6 +174,12 @@ m8260_init_IRQ(void)
          * in case the boot rom changed something on us.
          */
         cpm2_immr->im_intctl.ic_siprr = 0x05309770;
+
+#if defined(CONFIG_PCI) && (defined(CONFIG_ADS8272) || defined(CONFIG_PQ2FADS))
+        /* Initialize stuff for the 82xx CPLD IC and install demux  */
+        pq2pci_init_irq();
+#endif
+
 }
 
 /*
diff --git a/arch/ppc/syslib/m82xx_pci.c b/arch/ppc/syslib/m82xx_pci.c
new file mode 100644
index 0000000000..5e7a7edcea
--- /dev/null
+++ b/arch/ppc/syslib/m82xx_pci.c
@@ -0,0 +1,383 @@
+/*
+ *
+ * (C) Copyright 2003
+ * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ *
+ * (C) Copyright 2004 Red Hat, Inc.
+ *
+ * 2005 (c) MontaVista Software, Inc.
+ * Vitaly Bordug <vbordug@ru.mvista.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/slab.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+
+#include <asm/byteorder.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/uaccess.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/immap_cpm2.h>
+#include <asm/mpc8260.h>
+#include <asm/cpm2.h>
+
+#include "m82xx_pci.h"
+
+/*
+ * Interrupt routing
+ */
+
+static inline int
+pq2pci_map_irq(struct pci_dev *dev, unsigned char idsel, unsigned char pin)
+{
+        static char pci_irq_table[][4] =
+        /*
+         *      PCI IDSEL/INTPIN->INTLINE
+         *        A      B      C      D
+         */
+        {
+                { PIRQA, PIRQB, PIRQC, PIRQD }, /* IDSEL 22 - PCI slot 0 */
+                { PIRQD, PIRQA, PIRQB, PIRQC }, /* IDSEL 23 - PCI slot 1 */
+                { PIRQC, PIRQD, PIRQA, PIRQB }, /* IDSEL 24 - PCI slot 2 */
+        };
+
+        const long min_idsel = 22, max_idsel = 24, irqs_per_slot = 4;
+        return PCI_IRQ_TABLE_LOOKUP;
+}
+
+static void
+pq2pci_mask_irq(unsigned int irq)
+{
+        int bit = irq - NR_CPM_INTS;
+
+        *(volatile unsigned long *) PCI_INT_MASK_REG |= (1 << (31 - bit));
+        return;
+}
+
+static void
+pq2pci_unmask_irq(unsigned int irq)
+{
+        int bit = irq - NR_CPM_INTS;
+
+        *(volatile unsigned long *) PCI_INT_MASK_REG &= ~(1 << (31 - bit));
+        return;
+}
+
+static void
+pq2pci_mask_and_ack(unsigned int irq)
+{
+        int bit = irq - NR_CPM_INTS;
+
+        *(volatile unsigned long *) PCI_INT_MASK_REG |= (1 << (31 - bit));
+        return;
+}
+
+static void
+pq2pci_end_irq(unsigned int irq)
+{
+        int bit = irq - NR_CPM_INTS;
+
+        *(volatile unsigned long *) PCI_INT_MASK_REG &= ~(1 << (31 - bit));
+        return;
+}
+
+struct hw_interrupt_type pq2pci_ic = {
+        "PQ2 PCI",
+        NULL,
+        NULL,
+        pq2pci_unmask_irq,
+        pq2pci_mask_irq,
+        pq2pci_mask_and_ack,
+        pq2pci_end_irq,
+        0
+};
+
+static irqreturn_t
+pq2pci_irq_demux(int irq, void *dev_id, struct pt_regs *regs)
+{
+        unsigned long stat, mask, pend;
+        int bit;
+
+        for(;;) {
+                stat = *(volatile unsigned long *) PCI_INT_STAT_REG;
+                mask = *(volatile unsigned long *) PCI_INT_MASK_REG;
+                pend = stat & ~mask & 0xf0000000;
+                if (!pend)
+                        break;
+                for (bit = 0; pend != 0; ++bit, pend <<= 1) {
+                        if (pend & 0x80000000)
+                                __do_IRQ(NR_CPM_INTS + bit, regs);
+                }
+        }
+
+        return IRQ_HANDLED;
+}
+
+static struct irqaction pq2pci_irqaction = {
+        .handler = pq2pci_irq_demux,
+        .flags   = SA_INTERRUPT,
+        .mask    = CPU_MASK_NONE,
+        .name    = "PQ2 PCI cascade",
+};
+
+
+void
+pq2pci_init_irq(void)
+{
+        int irq;
+        volatile cpm2_map_t *immap = cpm2_immr;
+#if defined CONFIG_ADS8272
+        /* configure chip select for PCI interrupt controller */
+        immap->im_memctl.memc_br3 = PCI_INT_STAT_REG | 0x00001801;
+        immap->im_memctl.memc_or3 = 0xffff8010;
+#elif defined CONFIG_PQ2FADS
+        immap->im_memctl.memc_br8 = PCI_INT_STAT_REG | 0x00001801;
+        immap->im_memctl.memc_or8 = 0xffff8010;
+#endif
+        for (irq = NR_CPM_INTS; irq < NR_CPM_INTS + 4; irq++)
+                irq_desc[irq].handler = &pq2pci_ic;
+
+        /* make PCI IRQ level sensitive */
+        immap->im_intctl.ic_siexr &=
+                ~(1 << (14 - (PCI_INT_TO_SIU - SIU_INT_IRQ1)));
+
+        /* mask all PCI interrupts */
+        *(volatile unsigned long *) PCI_INT_MASK_REG |= 0xfff00000;
+
+        /* install the demultiplexer for the PCI cascade interrupt */
+        setup_irq(PCI_INT_TO_SIU, &pq2pci_irqaction);
+        return;
+}
+
+static int
+pq2pci_exclude_device(u_char bus, u_char devfn)
+{
+        return PCIBIOS_SUCCESSFUL;
+}
+
+/* PCI bus configuration registers.
+ */
+static void
+pq2ads_setup_pci(struct pci_controller *hose)
+{
+        __u32 val;
+        volatile cpm2_map_t *immap = cpm2_immr;
+        bd_t* binfo = (bd_t*) __res;
+        u32 sccr = immap->im_clkrst.car_sccr;
+        uint pci_div,freq,time;
+                /* PCI int lowest prio */
+        /* Each 4 bits is a device bus request  and the MS 4bits
+         is highest priority */
+        /* Bus                4bit value
+           ---                ----------
+           CPM high             0b0000
+           CPM middle           0b0001
+           CPM low              0b0010
+           PCI reguest          0b0011
+           Reserved             0b0100
+           Reserved             0b0101
+           Internal Core        0b0110
+           External Master 1    0b0111
+           External Master 2    0b1000
+           External Master 3    0b1001
+           The rest are reserved
+         */
+        immap->im_siu_conf.siu_82xx.sc_ppc_alrh = 0x61207893;
+        /* park bus on core */
+        immap->im_siu_conf.siu_82xx.sc_ppc_acr = PPC_ACR_BUS_PARK_CORE;
+        /*
+         * Set up master windows that allow the CPU to access PCI space. These
+         * windows are set up using the two SIU PCIBR registers.
+         */
+
+        immap->im_memctl.memc_pcimsk0 = M82xx_PCI_PRIM_WND_SIZE;
+        immap->im_memctl.memc_pcibr0  = M82xx_PCI_PRIM_WND_BASE | PCIBR_ENABLE;
+
+#ifdef M82xx_PCI_SEC_WND_SIZE
+        immap->im_memctl.memc_pcimsk1 = M82xx_PCI_SEC_WND_SIZE;
+        immap->im_memctl.memc_pcibr1  = M82xx_PCI_SEC_WND_BASE | PCIBR_ENABLE;
+#endif
+
+#if defined CONFIG_ADS8272
+        immap->im_siu_conf.siu_82xx.sc_siumcr =
+                (immap->im_siu_conf.siu_82xx.sc_siumcr &
+                ~(SIUMCR_BBD | SIUMCR_ESE | SIUMCR_PBSE |
+                SIUMCR_CDIS | SIUMCR_DPPC11 | SIUMCR_L2CPC11 |
+                SIUMCR_LBPC11 | SIUMCR_APPC11 |
+                SIUMCR_CS10PC11 | SIUMCR_BCTLC11 | SIUMCR_MMR11)) |
+                SIUMCR_DPPC11 | SIUMCR_L2CPC01 | SIUMCR_LBPC00 |
+                SIUMCR_APPC10 | SIUMCR_CS10PC00 |
+                SIUMCR_BCTLC00 | SIUMCR_MMR11 ;
+
+#elif defined CONFIG_PQ2FADS
+        /*
+         * Setting required to enable IRQ1-IRQ7 (SIUMCR [DPPC]),
+         * and local bus for PCI (SIUMCR [LBPC]).
+         */
+        immap->im_siu_conf.siu_82xx.sc_siumcr = (immap->im_siu_conf.sc_siumcr &
+                                ~(SIUMCR_L2PC11 | SIUMCR_LBPC11 | SIUMCR_CS10PC11 | SIUMCR_APPC11) |
+                                SIUMCR_BBD | SIUMCR_LBPC01 | SIUMCR_DPPC11 | SIUMCR_APPC10;
+#endif
+        /* Enable PCI  */
+        immap->im_pci.pci_gcr = cpu_to_le32(PCIGCR_PCI_BUS_EN);
+
+        pci_div = ( (sccr & SCCR_PCI_MODCK) ? 2 : 1) *
+                        ( ( (sccr & SCCR_PCIDF_MSK) >> SCCR_PCIDF_SHIFT) + 1);
+        freq = (uint)((2*binfo->bi_cpmfreq)/(pci_div));
+        time = (int)666666/freq;
+        /* due to PCI Local Bus spec, some devices needs to wait such a long
+        time after RST  deassertion. More specifically, 0.508s for 66MHz & twice more for 33 */
+        printk("%s: The PCI bus is %d Mhz.\nWaiting %s after deasserting RST...\n",__FILE__,freq,
+        (time==1) ? "0.5 seconds":"1 second" );
+
+        {
+                int i;
+                for(i=0;i<(500*time);i++)
+                        udelay(1000);
+        }
+
+        /* setup ATU registers */
+        immap->im_pci.pci_pocmr0 = cpu_to_le32(POCMR_ENABLE | POCMR_PCI_IO |
+                                ((~(M82xx_PCI_IO_SIZE - 1U)) >> POTA_ADDR_SHIFT));
+        immap->im_pci.pci_potar0 = cpu_to_le32(M82xx_PCI_LOWER_IO >> POTA_ADDR_SHIFT);
+        immap->im_pci.pci_pobar0 = cpu_to_le32(M82xx_PCI_IO_BASE >> POTA_ADDR_SHIFT);
+
+        /* Set-up non-prefetchable window */
+        immap->im_pci.pci_pocmr1 = cpu_to_le32(POCMR_ENABLE | ((~(M82xx_PCI_MMIO_SIZE-1U)) >> POTA_ADDR_SHIFT));
+        immap->im_pci.pci_potar1 = cpu_to_le32(M82xx_PCI_LOWER_MMIO >> POTA_ADDR_SHIFT);
+        immap->im_pci.pci_pobar1 = cpu_to_le32((M82xx_PCI_LOWER_MMIO - M82xx_PCI_MMIO_OFFSET) >> POTA_ADDR_SHIFT);
+
+        /* Set-up prefetchable window */
+        immap->im_pci.pci_pocmr2 = cpu_to_le32(POCMR_ENABLE |POCMR_PREFETCH_EN |
+                (~(M82xx_PCI_MEM_SIZE-1U) >> POTA_ADDR_SHIFT));
+        immap->im_pci.pci_potar2 = cpu_to_le32(M82xx_PCI_LOWER_MEM >> POTA_ADDR_SHIFT);
+        immap->im_pci.pci_pobar2 = cpu_to_le32((M82xx_PCI_LOWER_MEM - M82xx_PCI_MEM_OFFSET) >> POTA_ADDR_SHIFT);
+
+        /* Inbound transactions from PCI memory space */
+        immap->im_pci.pci_picmr0 = cpu_to_le32(PICMR_ENABLE | PICMR_PREFETCH_EN |
+                                        ((~(M82xx_PCI_SLAVE_MEM_SIZE-1U)) >> PITA_ADDR_SHIFT));
+        immap->im_pci.pci_pibar0 = cpu_to_le32(M82xx_PCI_SLAVE_MEM_BUS  >> PITA_ADDR_SHIFT);
+        immap->im_pci.pci_pitar0 = cpu_to_le32(M82xx_PCI_SLAVE_MEM_LOCAL>> PITA_ADDR_SHIFT);
+
+#if defined CONFIG_ADS8272
+        /* PCI int highest prio */
+        immap->im_siu_conf.siu_82xx.sc_ppc_alrh = 0x01236745;
+#elif defined CONFIG_PQ2FADS
+        immap->im_siu_conf.siu_82xx.sc_ppc_alrh = 0x03124567;
+#endif
+        /* park bus on PCI */
+        immap->im_siu_conf.siu_82xx.sc_ppc_acr = PPC_ACR_BUS_PARK_PCI;
+
+        /* Enable bus mastering and inbound memory transactions */
+        early_read_config_dword(hose, hose->first_busno, 0, PCI_COMMAND, &val);
+        val &= 0xffff0000;
+        val |= PCI_COMMAND_MEMORY|PCI_COMMAND_MASTER;
+        early_write_config_dword(hose, hose->first_busno, 0, PCI_COMMAND, val);
+
+}
+
+void __init pq2_find_bridges(void)
+{
+        extern int pci_assign_all_busses;
+        struct pci_controller * hose;
+        int host_bridge;
+
+        pci_assign_all_busses = 1;
+
+        hose = pcibios_alloc_controller();
+
+        if (!hose)
+                return;
+
+        ppc_md.pci_swizzle = common_swizzle;
+
+        hose->first_busno = 0;
+        hose->bus_offset = 0;
+        hose->last_busno = 0xff;
+
+#ifdef CONFIG_ADS8272
+        hose->set_cfg_type = 1;
+#endif
+
+        setup_m8260_indirect_pci(hose,
+                                 (unsigned long)&cpm2_immr->im_pci.pci_cfg_addr,
+                                 (unsigned long)&cpm2_immr->im_pci.pci_cfg_data);
+
+        /* Make sure it is a supported bridge */
+        early_read_config_dword(hose,
+                                0,
+                                PCI_DEVFN(0,0),
+                                PCI_VENDOR_ID,
+                                &host_bridge);
+        switch (host_bridge) {
+                case PCI_DEVICE_ID_MPC8265:
+                        break;
+                case PCI_DEVICE_ID_MPC8272:
+                        break;
+                default:
+                        printk("Attempting to use unrecognized host bridge ID"
+                                " 0x%08x.\n", host_bridge);
+                        break;
+        }
+
+        pq2ads_setup_pci(hose);
+
+        hose->io_space.start =  M82xx_PCI_LOWER_IO;
+        hose->io_space.end = M82xx_PCI_UPPER_IO;
+        hose->mem_space.start = M82xx_PCI_LOWER_MEM;
+        hose->mem_space.end = M82xx_PCI_UPPER_MMIO;
+        hose->pci_mem_offset = M82xx_PCI_MEM_OFFSET;
+
+        isa_io_base =
+        (unsigned long) ioremap(M82xx_PCI_IO_BASE,
+                                        M82xx_PCI_IO_SIZE);
+        hose->io_base_virt = (void *) isa_io_base;
+
+        /* setup resources */
+        pci_init_resource(&hose->mem_resources[0],
+                        M82xx_PCI_LOWER_MEM,
+                        M82xx_PCI_UPPER_MEM,
+                        IORESOURCE_MEM|IORESOURCE_PREFETCH, "PCI prefetchable memory");
+
+        pci_init_resource(&hose->mem_resources[1],
+                        M82xx_PCI_LOWER_MMIO,
+                        M82xx_PCI_UPPER_MMIO,
+                        IORESOURCE_MEM, "PCI memory");
+
+        pci_init_resource(&hose->io_resource,
+                        M82xx_PCI_LOWER_IO,
+                        M82xx_PCI_UPPER_IO,
+                        IORESOURCE_IO | 1, "PCI I/O");
+
+        ppc_md.pci_exclude_device = pq2pci_exclude_device;
+        hose->last_busno = pciauto_bus_scan(hose, hose->first_busno);
+
+        ppc_md.pci_map_irq = pq2pci_map_irq;
+        ppc_md.pcibios_fixup = NULL;
+        ppc_md.pcibios_fixup_bus = NULL;
+
+}
diff --git a/arch/ppc/syslib/m82xx_pci.h b/arch/ppc/syslib/m82xx_pci.h
new file mode 100644
index 0000000000..924f73f8e5
--- /dev/null
+++ b/arch/ppc/syslib/m82xx_pci.h
@@ -0,0 +1,92 @@
+
+#ifndef _PPC_KERNEL_M82XX_PCI_H
+#define _PPC_KERNEL_M82XX_PCI_H
+
+#include <asm/m8260_pci.h>
+/*
+ *   Local->PCI map (from CPU)                             controlled by
+ *   MPC826x master window
+ *
+ *   0xF6000000 - 0xF7FFFFFF    IO space
+ *   0x80000000 - 0xBFFFFFFF    CPU2PCI memory space       PCIBR0
+ *
+ *   0x80000000 - 0x9FFFFFFF    PCI Mem with prefetch      (Outbound ATU #1)
+ *   0xA0000000 - 0xBFFFFFFF    PCI Mem w/o  prefetch      (Outbound ATU #2)
+ *   0xF6000000 - 0xF7FFFFFF    32-bit PCI IO              (Outbound ATU #3)
+ *
+ *   PCI->Local map (from PCI)
+ *   MPC826x slave window                                  controlled by
+ *
+ *   0x00000000 - 0x07FFFFFF    MPC826x local memory       (Inbound ATU #1)
+ */
+
+/*
+ * Slave window that allows PCI masters to access MPC826x local memory.
+ * This window is set up using the first set of Inbound ATU registers
+ */
+
+#ifndef M82xx_PCI_SLAVE_MEM_LOCAL
+#define M82xx_PCI_SLAVE_MEM_LOCAL       (((struct bd_info *)__res)->bi_memstart)
+#define M82xx_PCI_SLAVE_MEM_BUS         (((struct bd_info *)__res)->bi_memstart)
+#define M82xx_PCI_SLAVE_MEM_SIZE        (((struct bd_info *)__res)->bi_memsize)
+#endif
+
+/*
+ * This is the window that allows the CPU to access PCI address space.
+ * It will be setup with the SIU PCIBR0 register. All three PCI master
+ * windows, which allow the CPU to access PCI prefetch, non prefetch,
+ * and IO space (see below), must all fit within this window.
+ */
+
+#ifndef M82xx_PCI_LOWER_MEM
+#define M82xx_PCI_LOWER_MEM             0x80000000
+#define M82xx_PCI_UPPER_MEM             0x9fffffff
+#define M82xx_PCI_MEM_OFFSET            0x00000000
+#define M82xx_PCI_MEM_SIZE              0x20000000
+#endif
+
+#ifndef M82xx_PCI_LOWER_MMIO
+#define M82xx_PCI_LOWER_MMIO            0xa0000000
+#define M82xx_PCI_UPPER_MMIO            0xafffffff
+#define M82xx_PCI_MMIO_OFFSET           0x00000000
+#define M82xx_PCI_MMIO_SIZE             0x20000000
+#endif
+
+#ifndef M82xx_PCI_LOWER_IO
+#define M82xx_PCI_LOWER_IO              0x00000000
+#define M82xx_PCI_UPPER_IO              0x01ffffff
+#define M82xx_PCI_IO_BASE               0xf6000000
+#define M82xx_PCI_IO_SIZE               0x02000000
+#endif
+
+#ifndef M82xx_PCI_PRIM_WND_SIZE
+#define M82xx_PCI_PRIM_WND_SIZE         ~(M82xx_PCI_IO_SIZE - 1U)
+#define M82xx_PCI_PRIM_WND_BASE         (M82xx_PCI_IO_BASE)
+#endif
+
+#ifndef M82xx_PCI_SEC_WND_SIZE
+#define M82xx_PCI_SEC_WND_SIZE          ~(M82xx_PCI_MEM_SIZE + M82xx_PCI_MMIO_SIZE - 1U)
+#define M82xx_PCI_SEC_WND_BASE          (M82xx_PCI_LOWER_MEM)
+#endif
+
+#ifndef POTA_ADDR_SHIFT
+#define POTA_ADDR_SHIFT         12
+#endif
+
+#ifndef PITA_ADDR_SHIFT
+#define PITA_ADDR_SHIFT         12
+#endif
+
+#ifndef _IO_BASE
+#define _IO_BASE isa_io_base
+#endif
+
+#ifdef CONFIG_8260_PCI9
+struct pci_controller;
+extern void setup_m8260_indirect_pci(struct pci_controller* hose,
+                                        u32 cfg_addr, u32 cfg_data);
+#else
+#define setup_m8260_indirect_pci setup_indirect_pci
+#endif
+
+#endif /* _PPC_KERNEL_M8260_PCI_H */
diff --git a/arch/ppc/syslib/mpc10x_common.c b/arch/ppc/syslib/mpc10x_common.c
index fd93adfd46..8fc5f41545 100644
--- a/arch/ppc/syslib/mpc10x_common.c
+++ b/arch/ppc/syslib/mpc10x_common.c
@@ -21,6 +21,9 @@
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
+#include <linux/serial_8250.h>
+#include <linux/fsl_devices.h>
+#include <linux/device.h>
 
 #include <asm/byteorder.h>
 #include <asm/io.h>
@@ -30,16 +33,7 @@
 #include <asm/pci-bridge.h>
 #include <asm/open_pic.h>
 #include <asm/mpc10x.h>
-#include <asm/ocp.h>
-
-/* The OCP structure is fixed by code below, before OCP initialises.
-   paddr depends on where the board places the EUMB.
-    - fixed in mpc10x_bridge_init().
-   irq depends on two things:
-    > does the board use the EPIC at all? (PCORE does not).
-    > is the EPIC in serial or parallel mode?
-    - fixed in mpc10x_set_openpic().
-*/
+#include <asm/ppc_sys.h>
 
 #ifdef CONFIG_MPC10X_OPENPIC
 #ifdef CONFIG_EPIC_SERIAL_MODE
@@ -50,35 +44,140 @@
 #define MPC10X_I2C_IRQ (EPIC_IRQ_BASE + NUM_8259_INTERRUPTS)
 #define MPC10X_DMA0_IRQ (EPIC_IRQ_BASE + 1 + NUM_8259_INTERRUPTS)
 #define MPC10X_DMA1_IRQ (EPIC_IRQ_BASE + 2 + NUM_8259_INTERRUPTS)
+#define MPC10X_UART0_IRQ (EPIC_IRQ_BASE + 4 + NUM_8259_INTERRUPTS)
 #else
-#define MPC10X_I2C_IRQ OCP_IRQ_NA
-#define MPC10X_DMA0_IRQ OCP_IRQ_NA
-#define MPC10X_DMA1_IRQ OCP_IRQ_NA
+#define MPC10X_I2C_IRQ -1
+#define MPC10X_DMA0_IRQ -1
+#define MPC10X_DMA1_IRQ -1
+#define MPC10X_UART0_IRQ -1
 #endif
 
-
-struct ocp_def core_ocp[] = {
-        { .vendor       = OCP_VENDOR_INVALID
-        }
+static struct fsl_i2c_platform_data mpc10x_i2c_pdata = {
+        .device_flags           = 0,
 };
 
-static struct ocp_fs_i2c_data mpc10x_i2c_data = {
-        .flags          = 0
+static struct plat_serial8250_port serial_platform_data[] = {
+        [0] = {
+                .mapbase        = 0x4500,
+                .iotype         = UPIO_MEM,
+                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+        },
+        [1] = {
+                .mapbase        = 0x4600,
+                .iotype         = UPIO_MEM,
+                .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,
+        },
+        { },
 };
-static struct ocp_def mpc10x_i2c_ocp = {
-        .vendor         = OCP_VENDOR_MOTOROLA,
-        .function       = OCP_FUNC_IIC,
-        .index          = 0,
-        .additions      = &mpc10x_i2c_data
+
+struct platform_device ppc_sys_platform_devices[] = {
+        [MPC10X_IIC1] = {
+                .name   = "fsl-i2c",
+                .id     = 1,
+                .dev.platform_data = &mpc10x_i2c_pdata,
+                .num_resources = 2,
+                .resource = (struct resource[]) {
+                        {
+                                .start  = MPC10X_EUMB_I2C_OFFSET,
+                                .end    = MPC10X_EUMB_I2C_OFFSET +
+                                            MPC10X_EUMB_I2C_SIZE - 1,
+                                .flags  = IORESOURCE_MEM,
+                        },
+                        {
+                                .flags  = IORESOURCE_IRQ
+                        },
+                },
+        },
+        [MPC10X_DMA0] = {
+                .name   = "fsl-dma",
+                .id     = 0,
+                .num_resources = 2,
+                .resource = (struct resource[]) {
+                        {
+                                .start  = MPC10X_EUMB_DMA_OFFSET + 0x10,
+                                .end    = MPC10X_EUMB_DMA_OFFSET + 0x1f,
+                                .flags  = IORESOURCE_MEM,
+                        },
+                        {
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                },
+        },
+        [MPC10X_DMA1] = {
+                .name   = "fsl-dma",
+                .id     = 1,
+                .num_resources = 2,
+                .resource = (struct resource[]) {
+                        {
+                                .start  = MPC10X_EUMB_DMA_OFFSET + 0x20,
+                                .end    = MPC10X_EUMB_DMA_OFFSET + 0x2f,
+                                .flags  = IORESOURCE_MEM,
+                        },
+                        {
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                },
+        },
+        [MPC10X_DMA1] = {
+                .name   = "fsl-dma",
+                .id     = 1,
+                .num_resources = 2,
+                .resource = (struct resource[]) {
+                        {
+                                .start  = MPC10X_EUMB_DMA_OFFSET + 0x20,
+                                .end    = MPC10X_EUMB_DMA_OFFSET + 0x2f,
+                                .flags  = IORESOURCE_MEM,
+                        },
+                        {
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                },
+        },
+        [MPC10X_DUART] = {
+                .name = "serial8250",
+                .id     = 0,
+                .dev.platform_data = serial_platform_data,
+        },
 };
 
-static struct ocp_def mpc10x_dma_ocp[2] = {
-{       .vendor         = OCP_VENDOR_MOTOROLA,
-        .function       = OCP_FUNC_DMA,
-        .index          = 0 },
-{       .vendor         = OCP_VENDOR_MOTOROLA,
-        .function       = OCP_FUNC_DMA,
-        .index          = 1 }
+/* We use the PCI ID to match on */
+struct ppc_sys_spec *cur_ppc_sys_spec;
+struct ppc_sys_spec ppc_sys_specs[] = {
+        {
+                .ppc_sys_name   = "8245",
+                .mask           = 0xFFFFFFFF,
+                .value          = MPC10X_BRIDGE_8245,
+                .num_devices    = 4,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        MPC10X_IIC1, MPC10X_DMA0, MPC10X_DMA1, MPC10X_DUART,
+                },
+        },
+        {
+                .ppc_sys_name   = "8240",
+                .mask           = 0xFFFFFFFF,
+                .value          = MPC10X_BRIDGE_8240,
+                .num_devices    = 3,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        MPC10X_IIC1, MPC10X_DMA0, MPC10X_DMA1,
+                },
+        },
+        {
+                .ppc_sys_name   = "107",
+                .mask           = 0xFFFFFFFF,
+                .value          = MPC10X_BRIDGE_107,
+                .num_devices    = 3,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        MPC10X_IIC1, MPC10X_DMA0, MPC10X_DMA1,
+                },
+        },
+        {       /* default match */
+                .ppc_sys_name   = "",
+                .mask           = 0x00000000,
+                .value          = 0x00000000,
+        },
 };
 
 /* Set resources to match bridge memory map */
@@ -132,7 +231,7 @@ mpc10x_bridge_init(struct pci_controller *hose,
                    uint new_map,
                    uint phys_eumb_base)
 {
-        int     host_bridge, picr1, picr1_bit;
+        int     host_bridge, picr1, picr1_bit, i;
         ulong   pci_config_addr, pci_config_data;
         u_char  pir, byte;
 
@@ -273,7 +372,7 @@ mpc10x_bridge_init(struct pci_controller *hose,
                         printk("Host bridge in Agent mode\n");
                         /* Read or Set LMBAR & PCSRBAR? */
                 }
-                
+
                 /* Set base addr of the 8240/107 EUMB.  */
                 early_write_config_dword(hose,
                                          0,
@@ -287,17 +386,6 @@ mpc10x_bridge_init(struct pci_controller *hose,
                         ioremap(phys_eumb_base + MPC10X_EUMB_EPIC_OFFSET,
                                 MPC10X_EUMB_EPIC_SIZE);
 #endif
-                mpc10x_i2c_ocp.paddr = phys_eumb_base + MPC10X_EUMB_I2C_OFFSET;
-                mpc10x_i2c_ocp.irq = MPC10X_I2C_IRQ;
-                ocp_add_one_device(&mpc10x_i2c_ocp);
-                mpc10x_dma_ocp[0].paddr = phys_eumb_base +
-                                        MPC10X_EUMB_DMA_OFFSET + 0x100;
-                mpc10x_dma_ocp[0].irq = MPC10X_DMA0_IRQ;
-                ocp_add_one_device(&mpc10x_dma_ocp[0]);
-                mpc10x_dma_ocp[1].paddr = phys_eumb_base +
-                                        MPC10X_EUMB_DMA_OFFSET + 0x200;
-                mpc10x_dma_ocp[1].irq = MPC10X_DMA1_IRQ;
-                ocp_add_one_device(&mpc10x_dma_ocp[1]);
         }
 
 #ifdef CONFIG_MPC10X_STORE_GATHERING
@@ -306,6 +394,29 @@ mpc10x_bridge_init(struct pci_controller *hose,
         mpc10x_disable_store_gathering(hose);
 #endif
 
+        /* setup platform devices for MPC10x bridges */
+        identify_ppc_sys_by_id (host_bridge);
+
+        for (i = 0; i < cur_ppc_sys_spec->num_devices; i++) {
+                unsigned int dev_id = cur_ppc_sys_spec->device_list[i];
+                ppc_sys_fixup_mem_resource(&ppc_sys_platform_devices[dev_id],
+                        phys_eumb_base);
+        }
+
+        /* IRQ's are determined at runtime */
+        ppc_sys_platform_devices[MPC10X_IIC1].resource[1].start = MPC10X_I2C_IRQ;
+        ppc_sys_platform_devices[MPC10X_IIC1].resource[1].end = MPC10X_I2C_IRQ;
+        ppc_sys_platform_devices[MPC10X_DMA0].resource[1].start = MPC10X_DMA0_IRQ;
+        ppc_sys_platform_devices[MPC10X_DMA0].resource[1].end = MPC10X_DMA0_IRQ;
+        ppc_sys_platform_devices[MPC10X_DMA1].resource[1].start = MPC10X_DMA1_IRQ;
+        ppc_sys_platform_devices[MPC10X_DMA1].resource[1].end = MPC10X_DMA1_IRQ;
+
+        serial_platform_data[0].mapbase += phys_eumb_base;
+        serial_platform_data[0].irq = MPC10X_UART0_IRQ;
+
+        serial_platform_data[1].mapbase += phys_eumb_base;
+        serial_platform_data[1].irq = MPC10X_UART0_IRQ + 1;
+
         /*
          * 8240 erratum 26, 8241/8245 erratum 29, 107 erratum 23: speculative
          * PCI reads may return stale data so turn off.
@@ -330,7 +441,7 @@ mpc10x_bridge_init(struct pci_controller *hose,
          * 8245 (Rev 2., dated 10/2003) says PICR2[0] is reserverd.
          */
         if (host_bridge == MPC10X_BRIDGE_8245) {
-                ulong   picr2;
+                u32     picr2;
 
                 early_read_config_dword(hose, 0, PCI_DEVFN(0,0),
                         MPC10X_CFG_PICR2_REG, &picr2);
@@ -504,6 +615,8 @@ void __init mpc10x_set_openpic(void)
         openpic_set_sources(EPIC_IRQ_BASE, 3, OpenPIC_Addr + 0x11020);
         /* Skip reserved space and map Message Unit Interrupt (I2O) */
         openpic_set_sources(EPIC_IRQ_BASE + 3, 1, OpenPIC_Addr + 0x110C0);
+        /* Skip reserved space and map Serial Interupts */
+        openpic_set_sources(EPIC_IRQ_BASE + 4, 2, OpenPIC_Addr + 0x11120);
 
         openpic_init(NUM_8259_INTERRUPTS);
 }
diff --git a/arch/ppc/syslib/mpc85xx_devices.c b/arch/ppc/syslib/mpc85xx_devices.c
index 1e658ef57e..8af322dd47 100644
--- a/arch/ppc/syslib/mpc85xx_devices.c
+++ b/arch/ppc/syslib/mpc85xx_devices.c
@@ -40,6 +40,42 @@ static struct gianfar_platform_data mpc85xx_tsec2_pdata = {
         .phy_reg_addr = MPC85xx_ENET1_OFFSET,
 };
 
+static struct gianfar_platform_data mpc85xx_etsec1_pdata = {
+        .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
+            FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
+            FSL_GIANFAR_DEV_HAS_MULTI_INTR |
+            FSL_GIANFAR_DEV_HAS_CSUM | FSL_GIANFAR_DEV_HAS_VLAN |
+            FSL_GIANFAR_DEV_HAS_EXTENDED_HASH,
+        .phy_reg_addr = MPC85xx_ENET1_OFFSET,
+};
+
+static struct gianfar_platform_data mpc85xx_etsec2_pdata = {
+        .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
+            FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
+            FSL_GIANFAR_DEV_HAS_MULTI_INTR |
+            FSL_GIANFAR_DEV_HAS_CSUM | FSL_GIANFAR_DEV_HAS_VLAN |
+            FSL_GIANFAR_DEV_HAS_EXTENDED_HASH,
+        .phy_reg_addr = MPC85xx_ENET1_OFFSET,
+};
+
+static struct gianfar_platform_data mpc85xx_etsec3_pdata = {
+        .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
+            FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
+            FSL_GIANFAR_DEV_HAS_MULTI_INTR |
+            FSL_GIANFAR_DEV_HAS_CSUM | FSL_GIANFAR_DEV_HAS_VLAN |
+            FSL_GIANFAR_DEV_HAS_EXTENDED_HASH,
+        .phy_reg_addr = MPC85xx_ENET1_OFFSET,
+};
+
+static struct gianfar_platform_data mpc85xx_etsec4_pdata = {
+        .device_flags = FSL_GIANFAR_DEV_HAS_GIGABIT |
+            FSL_GIANFAR_DEV_HAS_COALESCE | FSL_GIANFAR_DEV_HAS_RMON |
+            FSL_GIANFAR_DEV_HAS_MULTI_INTR |
+            FSL_GIANFAR_DEV_HAS_CSUM | FSL_GIANFAR_DEV_HAS_VLAN |
+            FSL_GIANFAR_DEV_HAS_EXTENDED_HASH,
+        .phy_reg_addr = MPC85xx_ENET1_OFFSET,
+};
+
 static struct gianfar_platform_data mpc85xx_fec_pdata = {
         .phy_reg_addr = MPC85xx_ENET1_OFFSET,
 };
@@ -48,6 +84,10 @@ static struct fsl_i2c_platform_data mpc85xx_fsl_i2c_pdata = {
         .device_flags = FSL_I2C_DEV_SEPARATE_DFSRR,
 };
 
+static struct fsl_i2c_platform_data mpc85xx_fsl_i2c2_pdata = {
+        .device_flags = FSL_I2C_DEV_SEPARATE_DFSRR,
+};
+
 static struct plat_serial8250_port serial_platform_data[] = {
         [0] = {
                 .mapbase        = 0x4500,
@@ -281,7 +321,6 @@ struct platform_device ppc_sys_platform_devices[] = {
                         },
                 },
         },
-#ifdef CONFIG_CPM2
         [MPC85xx_CPM_FCC1] = {
                 .name = "fsl-cpm-fcc",
                 .id     = 1,
@@ -535,7 +574,151 @@ struct platform_device ppc_sys_platform_devices[] = {
                         },
                 },
         },
-#endif /* CONFIG_CPM2 */
+        [MPC85xx_eTSEC1] = {
+                .name = "fsl-gianfar",
+                .id     = 1,
+                .dev.platform_data = &mpc85xx_etsec1_pdata,
+                .num_resources   = 4,
+                .resource = (struct resource[]) {
+                        {
+                                .start  = MPC85xx_ENET1_OFFSET,
+                                .end    = MPC85xx_ENET1_OFFSET +
+                                                MPC85xx_ENET1_SIZE - 1,
+                                .flags  = IORESOURCE_MEM,
+                        },
+                        {
+                                .name   = "tx",
+                                .start  = MPC85xx_IRQ_TSEC1_TX,
+                                .end    = MPC85xx_IRQ_TSEC1_TX,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                        {
+                                .name   = "rx",
+                                .start  = MPC85xx_IRQ_TSEC1_RX,
+                                .end    = MPC85xx_IRQ_TSEC1_RX,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                        {
+                                .name   = "error",
+                                .start  = MPC85xx_IRQ_TSEC1_ERROR,
+                                .end    = MPC85xx_IRQ_TSEC1_ERROR,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                },
+        },
+        [MPC85xx_eTSEC2] = {
+                .name = "fsl-gianfar",
+                .id     = 2,
+                .dev.platform_data = &mpc85xx_etsec2_pdata,
+                .num_resources   = 4,
+                .resource = (struct resource[]) {
+                        {
+                                .start  = MPC85xx_ENET2_OFFSET,
+                                .end    = MPC85xx_ENET2_OFFSET +
+                                                MPC85xx_ENET2_SIZE - 1,
+                                .flags  = IORESOURCE_MEM,
+                        },
+                        {
+                                .name   = "tx",
+                                .start  = MPC85xx_IRQ_TSEC2_TX,
+                                .end    = MPC85xx_IRQ_TSEC2_TX,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                        {
+                                .name   = "rx",
+                                .start  = MPC85xx_IRQ_TSEC2_RX,
+                                .end    = MPC85xx_IRQ_TSEC2_RX,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                        {
+                                .name   = "error",
+                                .start  = MPC85xx_IRQ_TSEC2_ERROR,
+                                .end    = MPC85xx_IRQ_TSEC2_ERROR,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                },
+        },
+        [MPC85xx_eTSEC3] = {
+                .name = "fsl-gianfar",
+                .id     = 3,
+                .dev.platform_data = &mpc85xx_etsec3_pdata,
+                .num_resources   = 4,
+                .resource = (struct resource[]) {
+                        {
+                                .start  = MPC85xx_ENET3_OFFSET,
+                                .end    = MPC85xx_ENET3_OFFSET +
+                                                MPC85xx_ENET3_SIZE - 1,
+                                .flags  = IORESOURCE_MEM,
+                        },
+                        {
+                                .name   = "tx",
+                                .start  = MPC85xx_IRQ_TSEC3_TX,
+                                .end    = MPC85xx_IRQ_TSEC3_TX,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                        {
+                                .name   = "rx",
+                                .start  = MPC85xx_IRQ_TSEC3_RX,
+                                .end    = MPC85xx_IRQ_TSEC3_RX,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                        {
+                                .name   = "error",
+                                .start  = MPC85xx_IRQ_TSEC3_ERROR,
+                                .end    = MPC85xx_IRQ_TSEC3_ERROR,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                },
+        },
+        [MPC85xx_eTSEC4] = {
+                .name = "fsl-gianfar",
+                .id     = 4,
+                .dev.platform_data = &mpc85xx_etsec4_pdata,
+                .num_resources   = 4,
+                .resource = (struct resource[]) {
+                        {
+                                .start  = 0x27000,
+                                .end    = 0x27fff,
+                                .flags  = IORESOURCE_MEM,
+                        },
+                        {
+                                .name   = "tx",
+                                .start  = MPC85xx_IRQ_TSEC4_TX,
+                                .end    = MPC85xx_IRQ_TSEC4_TX,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                        {
+                                .name   = "rx",
+                                .start  = MPC85xx_IRQ_TSEC4_RX,
+                                .end    = MPC85xx_IRQ_TSEC4_RX,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                        {
+                                .name   = "error",
+                                .start  = MPC85xx_IRQ_TSEC4_ERROR,
+                                .end    = MPC85xx_IRQ_TSEC4_ERROR,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                },
+        },
+        [MPC85xx_IIC2] = {
+                .name = "fsl-i2c",
+                .id     = 2,
+                .dev.platform_data = &mpc85xx_fsl_i2c2_pdata,
+                .num_resources   = 2,
+                .resource = (struct resource[]) {
+                        {
+                                .start  = 0x03100,
+                                .end    = 0x031ff,
+                                .flags  = IORESOURCE_MEM,
+                        },
+                        {
+                                .start  = MPC85xx_IRQ_IIC1,
+                                .end    = MPC85xx_IRQ_IIC1,
+                                .flags  = IORESOURCE_IRQ,
+                        },
+                },
+        },
 };
 
 static int __init mach_mpc85xx_fixup(struct platform_device *pdev)
diff --git a/arch/ppc/syslib/mpc85xx_sys.c b/arch/ppc/syslib/mpc85xx_sys.c
index d806a92a94..6e3184ab35 100644
--- a/arch/ppc/syslib/mpc85xx_sys.c
+++ b/arch/ppc/syslib/mpc85xx_sys.c
@@ -110,6 +110,111 @@ struct ppc_sys_spec ppc_sys_specs[] = {
                         MPC85xx_CPM_USB,
                 },
         },
+        /* SVRs on 8548 rev1.0 matches for 8548/8547/8545 */
+        {
+                .ppc_sys_name   = "8548E",
+                .mask           = 0xFFFF00F0,
+                .value          = 0x80390010,
+                .num_devices    = 13,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        MPC85xx_eTSEC1, MPC85xx_eTSEC2, MPC85xx_eTSEC3,
+                        MPC85xx_eTSEC4, MPC85xx_IIC1, MPC85xx_IIC2,
+                        MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
+                        MPC85xx_PERFMON, MPC85xx_DUART, MPC85xx_SEC2,
+                },
+        },
+        {
+                .ppc_sys_name   = "8548",
+                .mask           = 0xFFFF00F0,
+                .value          = 0x80310010,
+                .num_devices    = 12,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        MPC85xx_eTSEC1, MPC85xx_eTSEC2, MPC85xx_eTSEC3,
+                        MPC85xx_eTSEC4, MPC85xx_IIC1, MPC85xx_IIC2,
+                        MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
+                        MPC85xx_PERFMON, MPC85xx_DUART,
+                },
+        },
+        {
+                .ppc_sys_name   = "8547E",
+                .mask           = 0xFFFF00F0,
+                .value          = 0x80390010,
+                .num_devices    = 13,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        MPC85xx_eTSEC1, MPC85xx_eTSEC2, MPC85xx_eTSEC3,
+                        MPC85xx_eTSEC4, MPC85xx_IIC1, MPC85xx_IIC2,
+                        MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
+                        MPC85xx_PERFMON, MPC85xx_DUART, MPC85xx_SEC2,
+                },
+        },
+        {
+                .ppc_sys_name   = "8547",
+                .mask           = 0xFFFF00F0,
+                .value          = 0x80310010,
+                .num_devices    = 12,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        MPC85xx_eTSEC1, MPC85xx_eTSEC2, MPC85xx_eTSEC3,
+                        MPC85xx_eTSEC4, MPC85xx_IIC1, MPC85xx_IIC2,
+                        MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
+                        MPC85xx_PERFMON, MPC85xx_DUART,
+                },
+        },
+        {
+                .ppc_sys_name   = "8545E",
+                .mask           = 0xFFFF00F0,
+                .value          = 0x80390010,
+                .num_devices    = 11,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        MPC85xx_eTSEC1, MPC85xx_eTSEC2,
+                        MPC85xx_IIC1, MPC85xx_IIC2,
+                        MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
+                        MPC85xx_PERFMON, MPC85xx_DUART, MPC85xx_SEC2,
+                },
+        },
+        {
+                .ppc_sys_name   = "8545",
+                .mask           = 0xFFFF00F0,
+                .value          = 0x80310010,
+                .num_devices    = 10,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        MPC85xx_eTSEC1, MPC85xx_eTSEC2,
+                        MPC85xx_IIC1, MPC85xx_IIC2,
+                        MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
+                        MPC85xx_PERFMON, MPC85xx_DUART,
+                },
+        },
+        {
+                .ppc_sys_name   = "8543E",
+                .mask           = 0xFFFF00F0,
+                .value          = 0x803A0010,
+                .num_devices    = 11,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        MPC85xx_eTSEC1, MPC85xx_eTSEC2,
+                        MPC85xx_IIC1, MPC85xx_IIC2,
+                        MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
+                        MPC85xx_PERFMON, MPC85xx_DUART, MPC85xx_SEC2,
+                },
+        },
+        {
+                .ppc_sys_name   = "8543",
+                .mask           = 0xFFFF00F0,
+                .value          = 0x80320010,
+                .num_devices    = 10,
+                .device_list    = (enum ppc_sys_devices[])
+                {
+                        MPC85xx_eTSEC1, MPC85xx_eTSEC2,
+                        MPC85xx_IIC1, MPC85xx_IIC2,
+                        MPC85xx_DMA0, MPC85xx_DMA1, MPC85xx_DMA2, MPC85xx_DMA3,
+                        MPC85xx_PERFMON, MPC85xx_DUART,
+                },
+        },
         {       /* default match */
                 .ppc_sys_name   = "",
                 .mask           = 0x00000000,
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index 7b241e7876..cc77177fa1 100644
--- a/arch/ppc/syslib/mv64x60.c
+++ b/arch/ppc/syslib/mv64x60.c
@@ -17,7 +17,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/bootmem.h>
 #include <linux/spinlock.h>
 #include <linux/mv643xx.h>
 
diff --git a/arch/ppc/syslib/mv64x60_win.c b/arch/ppc/syslib/mv64x60_win.c
index b6f0f5dcf6..5b827e2bbe 100644
--- a/arch/ppc/syslib/mv64x60_win.c
+++ b/arch/ppc/syslib/mv64x60_win.c
@@ -17,7 +17,6 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/bootmem.h>
 #include <linux/mv643xx.h>
 
 #include <asm/byteorder.h>
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c
index a5156c5179..e5fd2ae503 100644
--- a/arch/ppc/syslib/ocp.c
+++ b/arch/ppc/syslib/ocp.c
@@ -68,7 +68,7 @@ static int ocp_inited;
 /* Sysfs support */
 #define OCP_DEF_ATTR(field, format_string)                              \
 static ssize_t                                                          \
-show_##field(struct device *dev, char *buf)                             \
+show_##field(struct device *dev, struct device_attribute *attr, char *buf)                              \
 {                                                                       \
         struct ocp_device *odev = to_ocp_dev(dev);                      \
                                                                         \
diff --git a/arch/ppc/syslib/of_device.c b/arch/ppc/syslib/of_device.c
index 46269ed21a..49c0e34e2d 100644
--- a/arch/ppc/syslib/of_device.c
+++ b/arch/ppc/syslib/of_device.c
@@ -161,7 +161,7 @@ void of_unregister_driver(struct of_platform_driver *drv)
 }
 
 
-static ssize_t dev_show_devspec(struct device *dev, char *buf)
+static ssize_t dev_show_devspec(struct device *dev, struct device_attribute *attr, char *buf)
 {
         struct of_device *ofdev;
 
diff --git a/arch/ppc/syslib/open_pic.c b/arch/ppc/syslib/open_pic.c
index 9d4ed68b58..b45d8268bf 100644
--- a/arch/ppc/syslib/open_pic.c
+++ b/arch/ppc/syslib/open_pic.c
@@ -21,7 +21,6 @@
 #include <asm/signal.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/prom.h>
 #include <asm/sections.h>
 #include <asm/open_pic.h>
 #include <asm/i8259.h>
@@ -275,7 +274,7 @@ static void __init openpic_enable_sie(void)
 }
 #endif
 
-#if defined(CONFIG_EPIC_SERIAL_MODE) || defined(CONFIG_PM)
+#if defined(CONFIG_EPIC_SERIAL_MODE)
 static void openpic_reset(void)
 {
         openpic_setfield(&OpenPIC->Global.Global_Configuration0,
@@ -993,8 +992,6 @@ int openpic_resume(struct sys_device *sysdev)
                 return 0;
         }
 
-        openpic_reset();
-
         /* OpenPIC sometimes seem to need some time to be fully back up... */
         do {
                 openpic_set_spurious(OPENPIC_VEC_SPURIOUS);
diff --git a/arch/ppc/syslib/open_pic2.c b/arch/ppc/syslib/open_pic2.c
index ea26da0d8b..7e272c51a4 100644
--- a/arch/ppc/syslib/open_pic2.c
+++ b/arch/ppc/syslib/open_pic2.c
@@ -25,7 +25,6 @@
 #include <asm/signal.h>
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/prom.h>
 #include <asm/sections.h>
 #include <asm/open_pic.h>
 #include <asm/i8259.h>
diff --git a/arch/ppc/syslib/ppc4xx_kgdb.c b/arch/ppc/syslib/ppc4xx_kgdb.c
deleted file mode 100644
index fe8668bf81..0000000000
--- a/arch/ppc/syslib/ppc4xx_kgdb.c
+++ /dev/null
@@ -1,124 +0,0 @@
-#include <linux/config.h>
-#include <linux/types.h>
-#include <asm/ibm4xx.h>
-#include <linux/kernel.h>
-
-
-
-#define LSR_DR          0x01 /* Data ready */
-#define LSR_OE          0x02 /* Overrun */
-#define LSR_PE          0x04 /* Parity error */
-#define LSR_FE          0x08 /* Framing error */
-#define LSR_BI          0x10 /* Break */
-#define LSR_THRE        0x20 /* Xmit holding register empty */
-#define LSR_TEMT        0x40 /* Xmitter empty */
-#define LSR_ERR         0x80 /* Error */
-
-#include <platforms/4xx/ibm_ocp.h>
-
-extern struct NS16550* COM_PORTS[];
-#ifndef NULL
-#define NULL 0x00
-#endif
-
-static volatile struct NS16550 *kgdb_debugport = NULL;
-
-volatile struct NS16550 *
-NS16550_init(int chan)
-{
-        volatile struct NS16550 *com_port;
-        int quot;
-#ifdef BASE_BAUD
-        quot = BASE_BAUD / 9600;
-#else
-        quot = 0x000c; /* 0xc = 9600 baud (on a pc) */
-#endif
-
-        com_port = (struct NS16550 *) COM_PORTS[chan];
-
-        com_port->lcr = 0x00;
-        com_port->ier = 0xFF;
-        com_port->ier = 0x00;
-        com_port->lcr = com_port->lcr | 0x80; /* Access baud rate */
-        com_port->dll = ( quot & 0x00ff ); /* 0xc = 9600 baud */
-        com_port->dlm = ( quot & 0xff00 ) >> 8;
-        com_port->lcr = 0x03; /* 8 data, 1 stop, no parity */
-        com_port->mcr = 0x00; /* RTS/DTR */
-        com_port->fcr = 0x07; /* Clear & enable FIFOs */
-
-        return( com_port );
-}
-
-
-void
-NS16550_putc(volatile struct NS16550 *com_port, unsigned char c)
-{
-        while ((com_port->lsr & LSR_THRE) == 0)
-                ;
-        com_port->thr = c;
-        return;
-}
-
-unsigned char
-NS16550_getc(volatile struct NS16550 *com_port)
-{
-        while ((com_port->lsr & LSR_DR) == 0)
-                ;
-        return (com_port->rbr);
-}
-
-unsigned char
-NS16550_tstc(volatile struct NS16550 *com_port)
-{
-        return ((com_port->lsr & LSR_DR) != 0);
-}
-
-
-#if defined(CONFIG_KGDB_TTYS0)
-#define KGDB_PORT 0
-#elif defined(CONFIG_KGDB_TTYS1)
-#define KGDB_PORT 1
-#elif defined(CONFIG_KGDB_TTYS2)
-#define KGDB_PORT 2
-#elif defined(CONFIG_KGDB_TTYS3)
-#define KGDB_PORT 3
-#else
-#error "invalid kgdb_tty port"
-#endif
-
-void putDebugChar( unsigned char c )
-{
-        if ( kgdb_debugport == NULL )
-                kgdb_debugport = NS16550_init(KGDB_PORT);
-        NS16550_putc( kgdb_debugport, c );
-}
-
-int getDebugChar( void )
-{
-        if (kgdb_debugport == NULL)
-                kgdb_debugport = NS16550_init(KGDB_PORT);
-
-        return(NS16550_getc(kgdb_debugport));
-}
-
-void kgdb_interruptible(int enable)
-{
-        return;
-}
-
-void putDebugString(char* str)
-{
-        while (*str != '\0') {
-                putDebugChar(*str);
-                str++;
-        }
-        putDebugChar('\r');
-        return;
-}
-
-void
-kgdb_map_scc(void)
-{
-        printk("kgdb init \n");
-        kgdb_debugport = NS16550_init(KGDB_PORT);
-}
diff --git a/arch/ppc/syslib/ppc83xx_setup.c b/arch/ppc/syslib/ppc83xx_setup.c
index c28f9d6794..602a86891f 100644
--- a/arch/ppc/syslib/ppc83xx_setup.c
+++ b/arch/ppc/syslib/ppc83xx_setup.c
@@ -23,12 +23,12 @@
 #include <linux/serial_core.h>
 #include <linux/serial_8250.h>
 
-#include <asm/prom.h>
 #include <asm/time.h>
 #include <asm/mpc83xx.h>
 #include <asm/mmu.h>
 #include <asm/ppc_sys.h>
 #include <asm/kgdb.h>
+#include <asm/delay.h>
 
 #include <syslib/ppc83xx_setup.h>
 
@@ -117,7 +117,34 @@ mpc83xx_early_serial_map(void)
 void
 mpc83xx_restart(char *cmd)
 {
+        volatile unsigned char __iomem *reg;
+        unsigned char tmp;
+
+        reg = ioremap(BCSR_PHYS_ADDR, BCSR_SIZE);
+
         local_irq_disable();
+
+        /*
+         * Unlock the BCSR bits so a PRST will update the contents.
+         * Otherwise the reset asserts but doesn't clear.
+         */
+        tmp = in_8(reg + BCSR_MISC_REG3_OFF);
+        tmp |= BCSR_MISC_REG3_CNFLOCK; /* low true, high false */
+        out_8(reg + BCSR_MISC_REG3_OFF, tmp);
+
+        /*
+         * Trigger a reset via a low->high transition of the
+         * PORESET bit.
+         */
+        tmp = in_8(reg + BCSR_MISC_REG2_OFF);
+        tmp &= ~BCSR_MISC_REG2_PORESET;
+        out_8(reg + BCSR_MISC_REG2_OFF, tmp);
+
+        udelay(1);
+
+        tmp |= BCSR_MISC_REG2_PORESET;
+        out_8(reg + BCSR_MISC_REG2_OFF, tmp);
+
         for(;;);
 }
 
diff --git a/arch/ppc/syslib/ppc85xx_setup.c b/arch/ppc/syslib/ppc85xx_setup.c
index 152c3ef131..ca95d79a70 100644
--- a/arch/ppc/syslib/ppc85xx_setup.c
+++ b/arch/ppc/syslib/ppc85xx_setup.c
@@ -23,7 +23,6 @@
 #include <linux/serial_core.h>
 #include <linux/serial_8250.h>
 
-#include <asm/prom.h>
 #include <asm/time.h>
 #include <asm/mpc85xx.h>
 #include <asm/immap_85xx.h>
@@ -33,6 +32,8 @@
 
 #include <syslib/ppc85xx_setup.h>
 
+extern void abort(void);
+
 /* Return the amount of memory */
 unsigned long __init
 mpc85xx_find_end_of_memory(void)
@@ -132,6 +133,12 @@ mpc85xx_halt(void)
 }
 
 #ifdef CONFIG_PCI
+
+#if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS)
+extern void mpc85xx_cds_enable_via(struct pci_controller *hose);
+extern void mpc85xx_cds_fixup_via(struct pci_controller *hose);
+#endif
+
 static void __init
 mpc85xx_setup_pci1(struct pci_controller *hose)
 {
@@ -302,8 +309,18 @@ mpc85xx_setup_hose(void)
 
         ppc_md.pci_exclude_device = mpc85xx_exclude_device;
 
+#if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS)
+        /* Pre pciauto_bus_scan VIA init */
+        mpc85xx_cds_enable_via(hose_a);
+#endif
+
         hose_a->last_busno = pciauto_bus_scan(hose_a, hose_a->first_busno);
 
+#if defined(CONFIG_MPC8555_CDS) || defined(CONFIG_MPC8548_CDS)
+        /* Post pciauto_bus_scan VIA fixup */
+        mpc85xx_cds_fixup_via(hose_a);
+#endif
+
 #ifdef CONFIG_85xx_PCI2
         hose_b = pcibios_alloc_controller();
 
diff --git a/arch/ppc/syslib/prom_init.c b/arch/ppc/syslib/prom_init.c
index 2cee87137f..7f15136830 100644
--- a/arch/ppc/syslib/prom_init.c
+++ b/arch/ppc/syslib/prom_init.c
@@ -626,8 +626,18 @@ inspect_node(phandle node, struct device_node *dad,
         l = call_prom("package-to-path", 3, 1, node,
                       mem_start, mem_end - mem_start);
         if (l >= 0) {
+                char *p, *ep;
+
                 np->full_name = PTRUNRELOC((char *) mem_start);
                 *(char *)(mem_start + l) = 0;
+                /* Fixup an Apple bug where they have bogus \0 chars in the
+                 * middle of the path in some properties
+                 */
+                for (p = (char *)mem_start, ep = p + l; p < ep; p++)
+                        if ((*p) == '\0') {
+                                memmove(p, p+1, ep - p);
+                                ep--;
+                        }
                 mem_start = ALIGNUL(mem_start + l + 1);
         }
 
diff --git a/arch/ppc/xmon/xmon.c b/arch/ppc/xmon/xmon.c
index 8565f49b8b..be7869e394 100644
--- a/arch/ppc/xmon/xmon.c
+++ b/arch/ppc/xmon/xmon.c
@@ -9,6 +9,7 @@
 #include <linux/smp.h>
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
+#include <linux/kallsyms.h>
 #include <asm/ptrace.h>
 #include <asm/string.h>
 #include <asm/prom.h>
@@ -93,8 +94,7 @@ static void take_input(char *);
 static unsigned read_spr(int);
 static void write_spr(int, unsigned);
 static void super_regs(void);
-static void print_sysmap(void);
-static void sysmap_lookup(void);
+static void symbol_lookup(void);
 static void remove_bpts(void);
 static void insert_bpts(void);
 static struct bpt *at_breakpoint(unsigned pc);
@@ -103,7 +103,6 @@ static void cacheflush(void);
 #ifdef CONFIG_SMP
 static void cpu_cmd(void);
 #endif /* CONFIG_SMP */
-static int pretty_print_addr(unsigned long addr);
 static void csum(void);
 #ifdef CONFIG_BOOTX_TEXT
 static void vidcmds(void);
@@ -120,8 +119,6 @@ extern void longjmp(u_int *, int);
 
 extern void xmon_enter(void);
 extern void xmon_leave(void);
-extern char* xmon_find_symbol(unsigned long addr, unsigned long* saddr);
-extern unsigned long xmon_symbol_to_addr(char* symbol);
 
 static unsigned start_tb[NR_CPUS][2];
 static unsigned stop_tb[NR_CPUS][2];
@@ -148,7 +145,6 @@ Commands:\n\
   mm    move a block of memory\n\
   ms    set a block of memory\n\
   md    compare two blocks of memory\n\
-  M     print System.map\n\
   r     print registers\n\
   S     print special registers\n\
   t     print backtrace\n\
@@ -175,6 +171,35 @@ extern inline void __delay(unsigned int loops)
                                      "r" (loops) : "ctr");
 }
 
+/* Print an address in numeric and symbolic form (if possible) */
+static void xmon_print_symbol(unsigned long address, const char *mid,
+                              const char *after)
+{
+        char *modname;
+        const char *name = NULL;
+        unsigned long offset, size;
+        static char tmpstr[128];
+
+        printf("%.8lx", address);
+        if (setjmp(bus_error_jmp) == 0) {
+                debugger_fault_handler = handle_fault;
+                sync();
+                name = kallsyms_lookup(address, &size, &offset, &modname,
+                                       tmpstr);
+                sync();
+                /* wait a little while to see if we get a machine check */
+                __delay(200);
+        }
+        debugger_fault_handler = NULL;
+
+        if (name) {
+                printf("%s%s+%#lx/%#lx", mid, name, offset, size);
+                if (modname)
+                        printf(" [%s]", modname);
+        }
+        printf("%s", after);
+}
+
 static void get_tb(unsigned *p)
 {
         unsigned hi, lo, hiagain;
@@ -454,7 +479,7 @@ cmds(struct pt_regs *excp)
                         dump();
                         break;
                 case 'l':
-                        sysmap_lookup();
+                        symbol_lookup();
                         break;
                 case 'r':
                         if (excp != NULL)
@@ -466,9 +491,6 @@ cmds(struct pt_regs *excp)
                         else
                                 excprint(excp);
                         break;
-                case 'M':
-                        print_sysmap();
-                        break;
                 case 'S':
                         super_regs();
                         break;
@@ -825,20 +847,19 @@ backtrace(struct pt_regs *excp)
         for (; sp != 0; sp = stack[0]) {
                 if (mread(sp, stack, sizeof(stack)) != sizeof(stack))
                         break;
-                pretty_print_addr(stack[1]);
-                printf(" ");
+                printf("[%.8lx] ", stack);
+                xmon_print_symbol(stack[1], " ", "\n");
                 if (stack[1] == (unsigned) &ret_from_except
                     || stack[1] == (unsigned) &ret_from_except_full
                     || stack[1] == (unsigned) &ret_from_syscall) {
                         if (mread(sp+16, &regs, sizeof(regs)) != sizeof(regs))
                                 break;
-                        printf("\nexception:%x [%x] %x ", regs.trap, sp+16,
+                        printf("exception:%x [%x] %x\n", regs.trap, sp+16,
                                regs.nip);
                         sp = regs.gpr[1];
                         if (mread(sp, stack, sizeof(stack)) != sizeof(stack))
                                 break;
                 }
-                printf("\n");
         }
 }
 
@@ -859,11 +880,10 @@ excprint(struct pt_regs *fp)
 #ifdef CONFIG_SMP
         printf("cpu %d: ", smp_processor_id());
 #endif /* CONFIG_SMP */
-        printf("vector: %x at pc = ", fp->trap);
-        pretty_print_addr(fp->nip);
-        printf(", lr = ");
-        pretty_print_addr(fp->link);
-        printf("\nmsr = %x, sp = %x [%x]\n", fp->msr, fp->gpr[1], fp);
+        printf("vector: %x at pc=", fp->trap);
+        xmon_print_symbol(fp->nip, ": ", ", lr=");
+        xmon_print_symbol(fp->link, ": ", "\n");
+        printf("msr = %x, sp = %x [%x]\n", fp->msr, fp->gpr[1], fp);
         trap = TRAP(fp);
         if (trap == 0x300 || trap == 0x600)
                 printf("dar = %x, dsisr = %x\n", fp->dar, fp->dsisr);
@@ -951,24 +971,6 @@ extern char exc_prolog;
 extern char dec_exc;
 
 void
-print_sysmap(void)
-{
-        extern char *sysmap;
-        if ( sysmap ) {
-                printf("System.map: \n");
-                if( setjmp(bus_error_jmp) == 0 ) {
-                        debugger_fault_handler = handle_fault;
-                        sync();
-                        xmon_puts(sysmap);
-                        sync();
-                }
-                debugger_fault_handler = NULL;
-        }
-        else
-                printf("No System.map\n");
-}
-
-void
 super_regs(void)
 {
         int i, cmd;
@@ -1738,7 +1740,7 @@ scanhex(unsigned *vp)
                 printf("invalid register name '%%%s'\n", regname);
                 return 0;
         } else if (c == '$') {
-                static char symname[64];
+                static char symname[128];
                 int i;
                 for (i=0; i<63; i++) {
                         c = inchar();
@@ -1749,7 +1751,14 @@ scanhex(unsigned *vp)
                         symname[i] = c;
                 }
                 symname[i++] = 0;
-                *vp = xmon_symbol_to_addr(symname);
+                *vp = 0;
+                if (setjmp(bus_error_jmp) == 0) {
+                        debugger_fault_handler = handle_fault;
+                        sync();
+                        *vp = kallsyms_lookup_name(symname);
+                        sync();
+                }
+                debugger_fault_handler = NULL;
                 if (!(*vp)) {
                         printf("unknown symbol\n");
                         return 0;
@@ -1840,169 +1849,34 @@ take_input(char *str)
         lineptr = str;
 }
 
-void
-sysmap_lookup(void)
+static void
+symbol_lookup(void)
 {
         int type = inchar();
         unsigned addr;
-        static char tmp[64];
-        char* cur;
-
-        extern char *sysmap;
-        extern unsigned long sysmap_size;
-        if ( !sysmap || !sysmap_size )
-                return;
-
-        switch(type) {
-                case 'a':
-                        if (scanhex(&addr)) {
-                                pretty_print_addr(addr);
-                                printf("\n");
-                        }
-                        termch = 0;
-                        break;
-                case 's':
-                        getstring(tmp, 64);
-                        if( setjmp(bus_error_jmp) == 0 ) {
-                                debugger_fault_handler = handle_fault;
-                                sync();
-                                cur = sysmap;
-                                do {
-                                        cur = strstr(cur, tmp);
-                                        if (cur) {
-                                                static char res[64];
-                                                char *p, *d;
-                                                p = cur;
-                                                while(p > sysmap && *p != 10)
-                                                        p--;
-                                                if (*p == 10) p++;
-                                                d = res;
-                                                while(*p && p < (sysmap + sysmap_size) && *p != 10)
-                                                        *(d++) = *(p++);
-                                                *(d++) = 0;
-                                                printf("%s\n", res);
-                                                cur++;
-                                        }
-                                } while (cur);
-                                sync();
-                        }
-                        debugger_fault_handler = NULL;
-                        termch = 0;
-                        break;
-        }
-}
+        static char tmp[128];
 
-static int
-pretty_print_addr(unsigned long addr)
-{
-        char *sym;
-        unsigned long saddr;
-        
-        printf("%08x", addr);
-        sym = xmon_find_symbol(addr, &saddr);
-        if (sym)
-                printf(" (%s+0x%x)", sym, addr-saddr);
-        return (sym != 0);
-}
-
-char*
-xmon_find_symbol(unsigned long addr, unsigned long* saddr)
-{
-        static char rbuffer[64];
-        char *p, *ep, *limit;
-        unsigned long prev, next;
-        char* psym;
-
-        extern char *sysmap;
-        extern unsigned long sysmap_size;
-        if ( !sysmap || !sysmap_size )
-                return NULL;
-        
-        prev = 0;
-        psym = NULL;
-        p = sysmap;
-        limit = p + sysmap_size;
-        if( setjmp(bus_error_jmp) == 0 ) {
-                debugger_fault_handler = handle_fault;
-                sync();
-                do {
-                        next = simple_strtoul(p, &p, 16);
-                        if (next > addr && prev <= addr) {
-                                if (!psym)
-                                        goto bail;
-                                ep = rbuffer;
-                                p = psym;
-                                while(*p && p < limit && *p == 32)
-                                        p++;
-                                while(*p && p < limit && *p != 10 && (ep - rbuffer) < 63)
-                                        *(ep++) = *(p++);
-                                *(ep++) = 0;
-                                if (saddr)
-                                        *saddr = prev;
-                                debugger_fault_handler = NULL;
-                                return rbuffer;
-                        }
-                        prev = next;
-                        psym = p;
-                        while(*p && p < limit && *p != 10)
-                                p++;
-                        if (*p) p++;
-                } while(*p && p < limit && next);
-bail:
-                sync();
+        switch (type) {
+        case 'a':
+                if (scanhex(&addr))
+                        xmon_print_symbol(addr, ": ", "\n");
+                termch = 0;
+                break;
+        case 's':
+                getstring(tmp, 64);
+                if (setjmp(bus_error_jmp) == 0) {
+                        debugger_fault_handler = handle_fault;
+                        sync();
+                        addr = kallsyms_lookup_name(tmp);
+                        if (addr)
+                                printf("%s: %lx\n", tmp, addr);
+                        else
+                                printf("Symbol '%s' not found.\n", tmp);
+                        sync();
+                }
+                debugger_fault_handler = NULL;
+                termch = 0;
+                break;
         }
-        debugger_fault_handler = NULL;
-        return NULL;
 }
 
-unsigned long
-xmon_symbol_to_addr(char* symbol)
-{
-        char *p, *cur;
-        char *match = NULL;
-        int goodness = 0;
-        int result = 0;
-        
-        extern char *sysmap;
-        extern unsigned long sysmap_size;
-        if ( !sysmap || !sysmap_size )
-                return 0;
-
-        if( setjmp(bus_error_jmp) == 0 ) {
-                debugger_fault_handler = handle_fault;
-                sync();
-                cur = sysmap;
-                while(cur) {
-                        cur = strstr(cur, symbol);
-                        if (cur) {
-                                int gd = 1;
-
-                                /* best match if equal, better match if
-                                 * begins with
-                                 */
-                                if (cur == sysmap || *(cur-1) == ' ') {
-                                        gd++;
-                                        if (cur[strlen(symbol)] == 10)
-                                                gd++;
-                                }
-                                if (gd > goodness) {
-                                        match = cur;
-                                        goodness = gd;
-                                        if (gd == 3)
-                                                break;
-                                }
-                                cur++;
-                        }
-                }       
-                if (goodness) {
-                        p = match;
-                        while(p > sysmap && *p != 10)
-                                p--;
-                        if (*p == 10) p++;
-                        result = simple_strtoul(p, &p, 16);
-                }
-                sync();
-        }
-        debugger_fault_handler = NULL;
-        return result;
-}