280 files changed, 24524 insertions, 3506 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 20eacf2a8424..de88972c5896 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -53,6 +53,9 @@ config STACKTRACE_SUPPORT
         bool
         default y
 
+config HAVE_LATENCYTOP_SUPPORT
+        def_bool y
+
 config TRACE_IRQFLAGS_SUPPORT
         bool
         depends on PPC64
@@ -111,6 +114,7 @@ config PPC
         select HAVE_KPROBES
         select HAVE_KRETPROBES
         select HAVE_LMB
+        select HAVE_DMA_ATTRS if PPC64
         select USE_GENERIC_SMP_HELPERS if SMP
         select HAVE_OPROFILE
 
@@ -311,8 +315,8 @@ config KEXEC
           strongly in flux, so no good recommendation can be made.
 
 config CRASH_DUMP
-        bool "Build a kdump crash kernel (EXPERIMENTAL)"
-        depends on PPC_MULTIPLATFORM && PPC64 && EXPERIMENTAL
+        bool "Build a kdump crash kernel"
+        depends on PPC_MULTIPLATFORM && PPC64
         help
           Build a kernel suitable for use as a kdump capture kernel.
           The kernel will be linked at a different address than normal, and
@@ -461,6 +465,19 @@ config CMDLINE
           some command-line options at build time by entering them here.  In
           most cases you will need to specify the root device here.
 
+config EXTRA_TARGETS
+        string "Additional default image types"
+        help
+          List additional targets to be built by the bootwrapper here (separated
+          by spaces).  This is useful for targets that depend of device tree
+          files in the .dts directory.
+
+          Targets in this list will be build as part of the default build
+          target, or when the user does a 'make zImage' or a
+          'make zImage.initrd'.
+
+          If unsure, leave blank
+
 if !44x || BROKEN
 config ARCH_WANTS_FREEZER_CONTROL
         def_bool y
@@ -541,6 +558,12 @@ config FSL_LBC
         help
           Freescale Localbus support
 
+config FSL_GTM
+        bool
+        depends on PPC_83xx || QUICC_ENGINE || CPM2
+        help
+          Freescale General-purpose Timers support
+
 # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
 config MCA
         bool
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index a7d24e692bab..2840ab69ef4e 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -57,6 +57,16 @@ config KGDB
           debugger.  See <http://kgdb.sourceforge.net/> for more information.
           Unless you are intending to debug the kernel, say N here.
 
+config CODE_PATCHING_SELFTEST
+        bool "Run self-tests of the code-patching code."
+        depends on DEBUG_KERNEL
+        default n
+
+config FTR_FIXUP_SELFTEST
+        bool "Run self-tests of the feature-fixup code."
+        depends on DEBUG_KERNEL
+        default n
+
 choice
         prompt "Serial Port"
         depends on KGDB
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index b7d4c4ce2fe6..9155c9312c1e 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -18,22 +18,16 @@ HAS_BIARCH	:= $(call cc-option-yn, -m32)
 CROSS32_COMPILE ?=
 
 CROSS32CC               := $(CROSS32_COMPILE)gcc
-CROSS32AS               := $(CROSS32_COMPILE)as
-CROSS32LD               := $(CROSS32_COMPILE)ld
 CROSS32AR               := $(CROSS32_COMPILE)ar
-CROSS32OBJCOPY          := $(CROSS32_COMPILE)objcopy
 
 ifeq ($(HAS_BIARCH),y)
 ifeq ($(CROSS32_COMPILE),)
 CROSS32CC       := $(CC) -m32
-CROSS32AS       := $(AS) -a32
-CROSS32LD       := $(LD) -m elf32ppc
-CROSS32OBJCOPY  := $(OBJCOPY)
 CROSS32AR       := GNUTARGET=elf32-powerpc $(AR)
 endif
 endif
 
-export CROSS32CC CROSS32AS CROSS32LD CROSS32AR CROSS32OBJCOPY
+export CROSS32CC CROSS32AR
 
 ifeq ($(CROSS_COMPILE),)
 KBUILD_DEFCONFIG := $(shell uname -m)_defconfig
@@ -169,12 +163,25 @@ bootwrapper_install %.dtb:
         $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
 
 define archhelp
-  @echo '* zImage          - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'
+  @echo '* zImage          - Build default images selected by kernel config'
+  @echo '  zImage.*        - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'
+  @echo '  uImage          - U-Boot native image format'
+  @echo '  cuImage.<dt>    - Backwards compatible U-Boot image for older'
+  @echo '                    versions which do not support device trees'
+  @echo '  dtbImage.<dt>   - zImage with an embedded device tree blob'
+  @echo '  simpleImage.<dt> - Firmware independent image.'
+  @echo '  treeImage.<dt>  - Support for older IBM 4xx firmware (not U-Boot)'
   @echo '  install         - Install kernel using'
   @echo '                    (your) ~/bin/installkernel or'
   @echo '                    (distribution) /sbin/installkernel or'
   @echo '                    install to $$(INSTALL_PATH) and run lilo'
   @echo '  *_defconfig     - Select default config from arch/$(ARCH)/configs'
+  @echo ''
+  @echo '  Targets with <dt> embed a device tree blob inside the image'
+  @echo '  These targets support board with firmware that does not'
+  @echo '  support passing a device tree directly.  Replace <dt> with the'
+  @echo '  name of a dts file from the arch/$(ARCH)/boot/dts/ directory'
+  @echo '  (minus the .dts extension).'
 endef
 
 install:
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 095e04db1c0e..19f83c8f219d 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -35,6 +35,8 @@ endif
 
 BOOTCFLAGS      += -I$(obj) -I$(srctree)/$(obj) -I$(srctree)/$(src)/libfdt
 
+DTS_FLAGS       ?= -p 1024
+
 $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
 $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
 $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
@@ -63,10 +65,10 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c
                 ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \
                 cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c \
                 cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
-                fixed-head.S ep88xc.c ep405.c \
+                fixed-head.S ep88xc.c ep405.c cuboot-c2k.c \
                 cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
                 cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
-                virtex405-head.S
+                virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -213,6 +215,7 @@ image-$(CONFIG_WALNUT)			+= treeImage.walnut
 # Board ports in arch/powerpc/platform/44x/Kconfig
 image-$(CONFIG_EBONY)                   += treeImage.ebony cuImage.ebony
 image-$(CONFIG_BAMBOO)                  += treeImage.bamboo cuImage.bamboo
+image-$(CONFIG_SAM440EP)                += cuImage.sam440ep
 image-$(CONFIG_SEQUOIA)                 += cuImage.sequoia
 image-$(CONFIG_RAINIER)                 += cuImage.rainier
 image-$(CONFIG_TAISHAN)                 += cuImage.taishan
@@ -242,6 +245,7 @@ image-$(CONFIG_MPC834x_ITX)		+= cuImage.mpc8349emitx \
                                            cuImage.mpc8349emitxgp
 image-$(CONFIG_MPC834x_MDS)             += cuImage.mpc834x_mds
 image-$(CONFIG_MPC836x_MDS)             += cuImage.mpc836x_mds
+image-$(CONFIG_ASP834x)                 += dtbImage.asp834x-redboot
 
 # Board ports in arch/powerpc/platform/85xx/Kconfig
 image-$(CONFIG_MPC8540_ADS)             += cuImage.mpc8540ads
@@ -254,6 +258,7 @@ image-$(CONFIG_MPC85xx_DS)		+= cuImage.mpc8544ds \
                                            cuImage.mpc8572ds
 image-$(CONFIG_TQM8540)                 += cuImage.tqm8540
 image-$(CONFIG_TQM8541)                 += cuImage.tqm8541
+image-$(CONFIG_TQM8548)                 += cuImage.tqm8548
 image-$(CONFIG_TQM8555)                 += cuImage.tqm8555
 image-$(CONFIG_TQM8560)                 += cuImage.tqm8560
 image-$(CONFIG_SBC8548)                 += cuImage.sbc8548
@@ -263,6 +268,7 @@ image-$(CONFIG_KSI8560)			+= cuImage.ksi8560
 # Board ports in arch/powerpc/platform/embedded6xx/Kconfig
 image-$(CONFIG_STORCENTER)              += cuImage.storcenter
 image-$(CONFIG_MPC7448HPC2)             += cuImage.mpc7448hpc2
+image-$(CONFIG_PPC_C2K)                 += cuImage.c2k
 
 # For 32-bit powermacs, build the COFF and miboot images
 # as well as the ELF images.
@@ -270,6 +276,9 @@ ifeq ($(CONFIG_PPC32),y)
 image-$(CONFIG_PPC_PMAC)        += zImage.coff zImage.miboot
 endif
 
+# Allow extra targets to be added to the defconfig
+image-y += $(subst ",,$(CONFIG_EXTRA_TARGETS))
+
 initrd-  := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-))
 initrd-y := $(patsubst zImage%, zImage.initrd%, \
                 $(patsubst dtbImage%, dtbImage.initrd%, \
diff --git a/arch/powerpc/boot/addnote.c b/arch/powerpc/boot/addnote.c
index 8041a9845ab7..b1e5611b2ab1 100644
--- a/arch/powerpc/boot/addnote.c
+++ b/arch/powerpc/boot/addnote.c
@@ -25,7 +25,7 @@ char arch[] = "PowerPC";
 #define N_DESCR 6
 unsigned int descr[N_DESCR] = {
         0xffffffff,             /* real-mode = true */
-        0x00c00000,             /* real-base, i.e. where we expect OF to be */
+        0x02000000,             /* real-base, i.e. where we expect OF to be */
         0xffffffff,             /* real-size */
         0xffffffff,             /* virt-base */
         0xffffffff,             /* virt-size */
diff --git a/arch/powerpc/boot/cuboot-c2k.c b/arch/powerpc/boot/cuboot-c2k.c
new file mode 100644
index 000000000000..e43594950ba3
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-c2k.c
@@ -0,0 +1,190 @@
+/*
+ * GEFanuc C2K platform code.
+ *
+ * Author: Remi Machet <rmachet@slac.stanford.edu>
+ *
+ * Originated from prpmc2800.c
+ *
+ * 2008 (c) Stanford University
+ * 2007 (c) MontaVista, Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "types.h"
+#include "stdio.h"
+#include "io.h"
+#include "ops.h"
+#include "elf.h"
+#include "gunzip_util.h"
+#include "mv64x60.h"
+#include "cuboot.h"
+#include "ppcboot.h"
+
+static u8 *bridge_base;
+
+static void c2k_bridge_setup(u32 mem_size)
+{
+        u32 i, v[30], enables, acc_bits;
+        u32 pci_base_hi, pci_base_lo, size, buf[2];
+        unsigned long cpu_base;
+        int rc;
+        void *devp, *mv64x60_devp;
+        u8 *bridge_pbase, is_coherent;
+        struct mv64x60_cpu2pci_win *tbl;
+        int bus;
+
+        bridge_pbase = mv64x60_get_bridge_pbase();
+        is_coherent = mv64x60_is_coherent();
+
+        if (is_coherent)
+                acc_bits = MV64x60_PCI_ACC_CNTL_SNOOP_WB
+                        | MV64x60_PCI_ACC_CNTL_SWAP_NONE
+                        | MV64x60_PCI_ACC_CNTL_MBURST_32_BYTES
+                        | MV64x60_PCI_ACC_CNTL_RDSIZE_32_BYTES;
+        else
+                acc_bits = MV64x60_PCI_ACC_CNTL_SNOOP_NONE
+                        | MV64x60_PCI_ACC_CNTL_SWAP_NONE
+                        | MV64x60_PCI_ACC_CNTL_MBURST_128_BYTES
+                        | MV64x60_PCI_ACC_CNTL_RDSIZE_256_BYTES;
+
+        mv64x60_config_ctlr_windows(bridge_base, bridge_pbase, is_coherent);
+        mv64x60_devp = find_node_by_compatible(NULL, "marvell,mv64360");
+        if (mv64x60_devp == NULL)
+                fatal("Error: Missing marvell,mv64360 device tree node\n\r");
+
+        enables = in_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE));
+        enables |= 0x007ffe00; /* Disable all cpu->pci windows */
+        out_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE), enables);
+
+        /* Get the cpu -> pci i/o & mem mappings from the device tree */
+        devp = NULL;
+        for (bus = 0; ; bus++) {
+                char name[] = "pci ";
+
+                name[strlen(name)-1] = bus+'0';
+
+                devp = find_node_by_alias(name);
+                if (devp == NULL)
+                        break;
+
+                if (bus >= 2)
+                        fatal("Error: Only 2 PCI controllers are supported at" \
+                                " this time.\n");
+
+                mv64x60_config_pci_windows(bridge_base, bridge_pbase, bus, 0,
+                                mem_size, acc_bits);
+
+                rc = getprop(devp, "ranges", v, sizeof(v));
+                if (rc == 0)
+                        fatal("Error: Can't find marvell,mv64360-pci ranges"
+                                " property\n\r");
+
+                /* Get the cpu -> pci i/o & mem mappings from the device tree */
+
+                for (i = 0; i < rc; i += 6) {
+                        switch (v[i] & 0xff000000) {
+                        case 0x01000000: /* PCI I/O Space */
+                                tbl = mv64x60_cpu2pci_io;
+                                break;
+                        case 0x02000000: /* PCI MEM Space */
+                                tbl = mv64x60_cpu2pci_mem;
+                                break;
+                        default:
+                                continue;
+                        }
+
+                        pci_base_hi = v[i+1];
+                        pci_base_lo = v[i+2];
+                        cpu_base = v[i+3];
+                        size = v[i+5];
+
+                        buf[0] = cpu_base;
+                        buf[1] = size;
+
+                        if (!dt_xlate_addr(devp, buf, sizeof(buf), &cpu_base))
+                                fatal("Error: Can't translate PCI address " \
+                                                "0x%x\n\r", (u32)cpu_base);
+
+                        mv64x60_config_cpu2pci_window(bridge_base, bus,
+                                pci_base_hi, pci_base_lo, cpu_base, size, tbl);
+                }
+
+                enables &= ~(3<<(9+bus*5)); /* Enable cpu->pci<bus> i/o,
+                                                cpu->pci<bus> mem0 */
+                out_le32((u32 *)(bridge_base + MV64x60_CPU_BAR_ENABLE),
+                        enables);
+        };
+}
+
+static void c2k_fixups(void)
+{
+        u32 mem_size;
+
+        mem_size = mv64x60_get_mem_size(bridge_base);
+        c2k_bridge_setup(mem_size); /* Do necessary bridge setup */
+}
+
+#define MV64x60_MPP_CNTL_0      0xf000
+#define MV64x60_MPP_CNTL_2      0xf008
+#define MV64x60_GPP_IO_CNTL     0xf100
+#define MV64x60_GPP_LEVEL_CNTL  0xf110
+#define MV64x60_GPP_VALUE_SET   0xf118
+
+static void c2k_reset(void)
+{
+        u32 temp;
+
+        udelay(5000000);
+
+        if (bridge_base != 0) {
+                temp = in_le32((u32 *)(bridge_base + MV64x60_MPP_CNTL_0));
+                temp &= 0xFFFF0FFF;
+                out_le32((u32 *)(bridge_base + MV64x60_MPP_CNTL_0), temp);
+
+                temp = in_le32((u32 *)(bridge_base + MV64x60_GPP_LEVEL_CNTL));
+                temp |= 0x00000004;
+                out_le32((u32 *)(bridge_base + MV64x60_GPP_LEVEL_CNTL), temp);
+
+                temp = in_le32((u32 *)(bridge_base + MV64x60_GPP_IO_CNTL));
+                temp |= 0x00000004;
+                out_le32((u32 *)(bridge_base + MV64x60_GPP_IO_CNTL), temp);
+
+                temp = in_le32((u32 *)(bridge_base + MV64x60_MPP_CNTL_2));
+                temp &= 0xFFFF0FFF;
+                out_le32((u32 *)(bridge_base + MV64x60_MPP_CNTL_2), temp);
+
+                temp = in_le32((u32 *)(bridge_base + MV64x60_GPP_LEVEL_CNTL));
+                temp |= 0x00080000;
+                out_le32((u32 *)(bridge_base + MV64x60_GPP_LEVEL_CNTL), temp);
+
+                temp = in_le32((u32 *)(bridge_base + MV64x60_GPP_IO_CNTL));
+                temp |= 0x00080000;
+                out_le32((u32 *)(bridge_base + MV64x60_GPP_IO_CNTL), temp);
+
+                out_le32((u32 *)(bridge_base + MV64x60_GPP_VALUE_SET),
+                                0x00080004);
+        }
+
+        for (;;);
+}
+
+static bd_t bd;
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                        unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+
+        fdt_init(_dtb_start);
+
+        bridge_base = mv64x60_get_bridge_base();
+
+        platform_ops.fixups = c2k_fixups;
+        platform_ops.exit = c2k_reset;
+
+        if (serial_console_init() < 0)
+                exit();
+}
diff --git a/arch/powerpc/boot/cuboot-sam440ep.c b/arch/powerpc/boot/cuboot-sam440ep.c
new file mode 100644
index 000000000000..ec10a47460dd
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-sam440ep.c
@@ -0,0 +1,49 @@
+/*
+ * Old U-boot compatibility for Sam440ep based off bamboo.c code
+ * original copyrights below
+ *
+ * Author: Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * Copyright 2007 IBM Corporation
+ *
+ * Based on cuboot-ebony.c
+ *
+ * Modified from cuboot-bamboo.c for sam440ep:
+ * Copyright 2008 Giuseppe Coviello <gicoviello@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+#include "44x.h"
+#include "4xx.h"
+#include "cuboot.h"
+
+#define TARGET_4xx
+#define TARGET_44x
+#include "ppcboot.h"
+
+static bd_t bd;
+
+static void sam440ep_fixups(void)
+{
+       unsigned long sysclk = 66666666;
+
+       ibm440ep_fixup_clocks(sysclk, 11059200, 25000000);
+       ibm4xx_sdram_fixup_memsize();
+       ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
+       dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+        platform_ops.fixups = sam440ep_fixups;
+        platform_ops.exit = ibm44x_dbcr_reset;
+        fdt_init(_dtb_start);
+        serial_console_init();
+}
diff --git a/arch/powerpc/boot/cuboot-warp.c b/arch/powerpc/boot/cuboot-warp.c
index eb108a877492..21780210057d 100644
--- a/arch/powerpc/boot/cuboot-warp.c
+++ b/arch/powerpc/boot/cuboot-warp.c
@@ -10,6 +10,7 @@
 #include "ops.h"
 #include "4xx.h"
 #include "cuboot.h"
+#include "stdio.h"
 
 #define TARGET_4xx
 #define TARGET_44x
@@ -17,14 +18,54 @@
 
 static bd_t bd;
 
-static void warp_fixups(void)
+static void warp_fixup_one_nor(u32 from, u32 to)
 {
-        unsigned long sysclk = 66000000;
+        void *devp;
+        char name[50];
+        u32 v[2];
+
+        sprintf(name, "/plb/opb/ebc/nor_flash@0,0/partition@%x", from);
+
+        devp = finddevice(name);
+        if (!devp)
+                return;
+
+        if (getprop(devp, "reg", v, sizeof(v)) == sizeof(v)) {
+                v[0] = to;
+                setprop(devp, "reg", v, sizeof(v));
+
+                printf("NOR 64M fixup %x -> %x\r\n", from, to);
+        }
+}
+
 
-        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
+static void warp_fixups(void)
+{
+        ibm440ep_fixup_clocks(66000000, 11059200, 50000000);
         ibm4xx_sdram_fixup_memsize();
         ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
         dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
+
+        /* Fixup for 64M flash on Rev A boards. */
+        if (bd.bi_flashsize == 0x4000000) {
+                void *devp;
+                u32 v[3];
+
+                devp = finddevice("/plb/opb/ebc/nor_flash@0,0");
+                if (!devp)
+                        return;
+
+                /* Fixup the size */
+                if (getprop(devp, "reg", v, sizeof(v)) == sizeof(v)) {
+                        v[2] = bd.bi_flashsize;
+                        setprop(devp, "reg", v, sizeof(v));
+                }
+
+                /* Fixup parition offsets */
+                warp_fixup_one_nor(0x300000, 0x3f00000);
+                warp_fixup_one_nor(0x340000, 0x3f40000);
+                warp_fixup_one_nor(0x380000, 0x3f80000);
+        }
 }
 
 
diff --git a/arch/powerpc/boot/dts/asp834x-redboot.dts b/arch/powerpc/boot/dts/asp834x-redboot.dts
new file mode 100644
index 000000000000..8b1bb0e41905
--- /dev/null
+++ b/arch/powerpc/boot/dts/asp834x-redboot.dts
@@ -0,0 +1,282 @@
+/*
+ * Analogue & Micro ASP8347 Device Tree Source
+ *
+ * Copyright 2008 Codehermit
+ *
+ * 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.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "Analogue & Micro ASP8347E";
+        compatible = "analogue-and-micro,asp8347e";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8347@0 {
+                        device_type = "cpu";
+                        reg = <0x0>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <32768>;
+                        i-cache-size = <32768>;
+                        timebase-frequency = <0>;       // from bootloader
+                        bus-frequency = <0>;            // from bootloader
+                        clock-frequency = <0>;          // from bootloader
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x8000000>;   // 128MB at 0
+        };
+
+        localbus@ff005000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8347e-localbus",
+                             "fsl,pq2pro-localbus",
+                             "simple-bus";
+                reg = <0xff005000 0x1000>;
+                interrupts = <77 0x8>;
+                interrupt-parent = <&ipic>;
+
+                ranges = <
+                        0 0 0xf0000000 0x02000000
+                >;
+
+                flash@0,0 {
+                        compatible = "cfi-flash";
+                        reg = <0 0 0x02000000>;
+                        bank-width = <2>;
+                        device-width = <2>;
+                };
+        };
+
+        soc8349@ff000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xff000000 0x00100000>;
+                reg = <0xff000000 0x00000200>;
+                bus-frequency = <0>;
+
+                wdt@200 {
+                        device_type = "watchdog";
+                        compatible = "mpc83xx_wdt";
+                        reg = <0x200 0x100>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <14 0x8>;
+                        interrupt-parent = <&ipic>;
+                        dfsrr;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1374";
+                                reg = <0x68>;
+                        };
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <15 0x8>;
+                        interrupt-parent = <&ipic>;
+                        dfsrr;
+                };
+
+                spi@7000 {
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
+                        reg = <0x7000 0x1000>;
+                        interrupts = <16 0x8>;
+                        interrupt-parent = <&ipic>;
+                        mode = "cpu";
+                };
+
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8347-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
+                /* phy type (ULPI or SERIAL) are only types supported for MPH */
+                /* port = 0 or 1 */
+                usb@22000 {
+                        compatible = "fsl-usb2-mph";
+                        reg = <0x22000 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <39 0x8>;
+                        phy_type = "ulpi";
+                        port1;
+                };
+                /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
+                usb@23000 {
+                        compatible = "fsl-usb2-dr";
+                        reg = <0x23000 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <38 0x8>;
+                        dr_mode = "otg";
+                        phy_type = "ulpi";
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
+                        phy0: ethernet-phy@0 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <17 0x8>;
+                                reg = <0x1>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy1: ethernet-phy@1 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <18 0x8>;
+                                reg = <0x2>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        local-mac-address = [ 00 08 e5 11 32 33 ];
+                        interrupts = <32 0x8 33 0x8 34 0x8>;
+                        interrupt-parent = <&ipic>;
+                        phy-handle = <&phy0>;
+                        linux,network-index = <0>;
+                };
+
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x25000 0x1000>;
+                        local-mac-address = [ 00 08 e5 11 32 34 ];
+                        interrupts = <35 0x8 36 0x8 37 0x8>;
+                        interrupt-parent = <&ipic>;
+                        phy-handle = <&phy1>;
+                        linux,network-index = <1>;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <400000000>;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <400000000>;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                /* May need to remove if on a part without crypto engine */
+                crypto@30000 {
+                        device_type = "crypto";
+                        model = "SEC2";
+                        compatible = "talitos";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <11 0x8>;
+                        interrupt-parent = <&ipic>;
+                        num-channels = <4>;
+                        channel-fifo-len = <24>;
+                        exec-units-mask = <0x0000007e>;
+                        /* desc mask is for rev2.0,
+                         * we need runtime fixup for >2.0 */
+                        descriptor-types-mask = <0x01010ebf>;
+                };
+
+                /* IPIC
+                 * interrupts cell = <intr #, sense>
+                 * sense values match linux IORESOURCE_IRQ_* defines:
+                 * sense == 8: Level, low assertion
+                 * sense == 2: Edge, high-to-low change
+                 */
+                ipic: pic@700 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x700 0x100>;
+                        device_type = "ipic";
+                };
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,38400 root=/dev/mtdblock3 rootfstype=jffs2";
+                linux,stdout-path = &serial0;
+        };
+
+};
diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts
index ba2521bdaab1..6ce0cc2c0208 100644
--- a/arch/powerpc/boot/dts/bamboo.dts
+++ b/arch/powerpc/boot/dts/bamboo.dts
@@ -11,12 +11,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,bamboo";
         compatible = "amcc,bamboo";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC0;
@@ -34,13 +36,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,440EP";
-                        reg = <0>;
+                        reg = <0x00000000>;
                         clock-frequency = <0>; /* Filled in by zImage */
                         timebase-frequency = <0>; /* Filled in by zImage */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <8000>;
-                        d-cache-size = <8000>;
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <32768>;
+                        d-cache-size = <32768>;
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -48,14 +50,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0 0>; /* Filled in by zImage */
+                reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */
         };
 
         UIC0: interrupt-controller0 {
                 compatible = "ibm,uic-440ep","ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -65,22 +67,22 @@
                 compatible = "ibm,uic-440ep","ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
         SDR0: sdr {
                 compatible = "ibm,sdr-440ep";
-                dcr-reg = <00e 002>;
+                dcr-reg = <0x00e 0x002>;
         };
 
         CPR0: cpr {
                 compatible = "ibm,cpr-440ep";
-                dcr-reg = <00c 002>;
+                dcr-reg = <0x00c 0x002>;
         };
 
         plb {
@@ -92,29 +94,29 @@
 
                 SDRAM0: sdram {
                         compatible = "ibm,sdram-440ep", "ibm,sdram-405gp";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 DMA0: dma {
                         compatible = "ibm,dma-440ep", "ibm,dma-440gp";
-                        dcr-reg = <100 027>;
+                        dcr-reg = <0x100 0x027>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <4>;
                         num-rx-chans = <2>;
                         interrupt-parent = <&MAL0>;
-                        interrupts = <0 1 2 3 4>;
+                        interrupts = <0x0 0x1 0x2 0x3 0x4>;
                         #interrupt-cells = <1>;
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-                                        /*RXEOB*/ 1 &UIC0 b 4
-                                        /*SERR*/  2 &UIC1 0 4
-                                        /*TXDE*/  3 &UIC1 1 4
-                                        /*RXDE*/  4 &UIC1 2 4>;
+                        interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4
+                                        /*RXEOB*/ 0x1 &UIC0 0xb 0x4
+                                        /*SERR*/  0x2 &UIC1 0x0 0x4
+                                        /*TXDE*/  0x3 &UIC1 0x1 0x4
+                                        /*RXDE*/  0x4 &UIC1 0x2 0x4>;
                 };
 
                 POB0: opb {
@@ -124,101 +126,101 @@
                         /* Bamboo is oddball in the 44x world and doesn't use the ERPN
                          * bits.
                          */
-                        ranges = <00000000 0 00000000 80000000
-                                  80000000 0 80000000 80000000>;
+                        ranges = <0x00000000 0x00000000 0x00000000 0x80000000
+                                  0x80000000 0x00000000 0x80000000 0x80000000>;
                         interrupt-parent = <&UIC1>;
-                        interrupts = <7 4>;
+                        interrupts = <0x7 0x4>;
                         clock-frequency = <0>; /* Filled in by zImage */
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                interrupts = <5 1>;
+                                interrupts = <0x5 0x1>;
                                 interrupt-parent = <&UIC1>;
                         };
 
                         UART0: serial@ef600300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600300 8>;
-                                virtual-reg = <ef600300>;
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                current-speed = <1c200>;
+                                current-speed = <115200>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <0 4>;
+                                interrupts = <0x0 0x4>;
                         };
 
                         UART1: serial@ef600400 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600400 8>;
-                                virtual-reg = <ef600400>;
+                                reg = <0xef600400 0x00000008>;
+                                virtual-reg = <0xef600400>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         UART2: serial@ef600500 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600500 8>;
-                                virtual-reg = <ef600500>;
+                                reg = <0xef600500 0x00000008>;
+                                virtual-reg = <0xef600500>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <3 4>;
+                                interrupts = <0x3 0x4>;
                         };
 
                         UART3: serial@ef600600 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600600 8>;
-                                virtual-reg = <ef600600>;
+                                reg = <0xef600600 0x00000008>;
+                                virtual-reg = <0xef600600>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <4 4>;
+                                interrupts = <0x4 0x4>;
                         };
 
                         IIC0: i2c@ef600700 {
                                 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
-                                reg = <ef600700 14>;
+                                reg = <0xef600700 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
 
                         IIC1: i2c@ef600800 {
                                 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
-                                reg = <ef600800 14>;
+                                reg = <0xef600800 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <7 4>;
+                                interrupts = <0x7 0x4>;
                         };
 
                         ZMII0: emac-zmii@ef600d00 {
                                 compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii";
-                                reg = <ef600d00 c>;
+                                reg = <0xef600d00 0x0000000c>;
                         };
 
                         EMAC0: ethernet@ef600e00 {
                                 device_type = "network";
                                 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1c 4 1d 4>;
-                                reg = <ef600e00 70>;
+                                interrupts = <0x1c 0x4 0x1d 0x4>;
+                                reg = <0xef600e00 0x00000070>;
                                 local-mac-address = [000000000000];
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0 1>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <5dc>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <1500>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <0>;
                         };
@@ -227,26 +229,26 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1e 4 1f 4>;
-                                reg = <ef600f00 70>;
+                                interrupts = <0x1e 0x4 0x1f 0x4>;
+                                reg = <0xef600f00 0x00000070>;
                                 local-mac-address = [000000000000];
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <2 3>;
                                 mal-rx-channel = <1>;
                                 cell-index = <1>;
-                                max-frame-size = <5dc>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <1500>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <1>;
                         };
 
                         usb@ef601000 {
                                 compatible = "ohci-be";
-                                reg = <ef601000 80>;
-                                interrupts = <8 1 9 1>;
+                                reg = <0xef601000 0x00000080>;
+                                interrupts = <0x8 0x1 0x9 0x1>;
                                 interrupt-parent = < &UIC1 >;
                         };
                 };
@@ -258,35 +260,35 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb440ep-pci", "ibm,plb-pci";
                         primary;
-                        reg = <0 eec00000 8     /* Config space access */
-                               0 eed00000 4     /* IACK */
-                               0 eed00000 4     /* Special cycle */
-                               0 ef400000 40>;  /* Internal registers */
+                        reg = <0x00000000 0xeec00000 0x00000008 /* Config space access */
+                               0x00000000 0xeed00000 0x00000004 /* IACK */
+                               0x00000000 0xeed00000 0x00000004 /* Special cycle */
+                               0x00000000 0xef400000 0x00000040>;       /* Internal registers */
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed. Chip supports a second
                          * IO range but we don't use it for now
                          */
-                        ranges = <02000000 0 a0000000 0 a0000000 0 20000000
-                                  01000000 0 00000000 0 e8000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0xa0000000 0x00000000 0xa0000000 0x00000000 0x20000000
+                                  0x01000000 0x00000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* Bamboo has all 4 IRQ pins tied together per slot */
-                        interrupt-map-mask = <f800 0 0 0>;
+                        interrupt-map-mask = <0xf800 0x0 0x0 0x0>;
                         interrupt-map = <
                                 /* IDSEL 1 */
-                                0800 0 0 0 &UIC0 1c 8
+                                0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8
 
                                 /* IDSEL 2 */
-                                1000 0 0 0 &UIC0 1b 8
+                                0x1000 0x0 0x0 0x0 &UIC0 0x1b 0x8
 
                                 /* IDSEL 3 */
-                                1800 0 0 0 &UIC0 1a 8
+                                0x1800 0x0 0x0 0x0 &UIC0 0x1a 0x8
 
                                 /* IDSEL 4 */
-                                2000 0 0 0 &UIC0 19 8
+                                0x2000 0x0 0x0 0x0 &UIC0 0x19 0x8
                         >;
                 };
         };
diff --git a/arch/powerpc/boot/dts/c2k.dts b/arch/powerpc/boot/dts/c2k.dts
new file mode 100644
index 000000000000..f5d625fa3e52
--- /dev/null
+++ b/arch/powerpc/boot/dts/c2k.dts
@@ -0,0 +1,371 @@
+/* Device Tree Source for GEFanuc C2K
+ *
+ * Author: Remi Machet <rmachet@slac.stanford.edu>
+ *
+ * Originated from prpmc2800.dts
+ *
+ * 2008 (c) Stanford University
+ * 2007 (c) MontaVista, Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+/dts-v1/;
+
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        model = "C2K";
+        compatible = "GEFanuc,C2K";
+        coherency-off;
+
+        aliases {
+                pci0 = &PCI0;
+                pci1 = &PCI1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "PowerPC,7447";
+                        reg = <0>;
+                        clock-frequency = <996000000>;  /* 996 MHz */
+                        bus-frequency = <166666667>;    /* 166.6666 MHz */
+                        timebase-frequency = <41666667>;        /* 166.6666/4 MHz */
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <32768>;
+                        d-cache-size = <32768>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x40000000>;  /* 1GB */
+        };
+
+        system-controller@d8000000 { /* Marvell Discovery */
+                #address-cells = <1>;
+                #size-cells = <1>;
+                model = "mv64460";
+                compatible = "marvell,mv64360";
+                clock-frequency = <166666667>;          /* 166.66... MHz */
+                reg = <0xd8000000 0x00010000>;
+                virtual-reg = <0xd8000000>;
+                ranges = <0xd4000000 0xd4000000 0x01000000      /* PCI 0 I/O Space */
+                          0x80000000 0x80000000 0x08000000      /* PCI 0 MEM Space */
+                          0xd0000000 0xd0000000 0x01000000      /* PCI 1 I/O Space */
+                          0xa0000000 0xa0000000 0x08000000      /* PCI 1 MEM Space */
+                          0xd8100000 0xd8100000 0x00010000      /* FPGA */
+                          0xd8110000 0xd8110000 0x00010000      /* FPGA USARTs */
+                          0xf8000000 0xf8000000 0x08000000      /* User FLASH */
+                          0x00000000 0xd8000000 0x00010000      /* Bridge's regs */
+                          0xd8140000 0xd8140000 0x00040000>;    /* Integrated SRAM */
+
+                mdio@2000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "marvell,mv64360-mdio";
+                        reg = <0x2000 4>;
+                        PHY0: ethernet-phy@0 {
+                                device_type = "ethernet-phy";
+                                interrupts = <76>;      /* GPP 12 */
+                                interrupt-parent = <&PIC>;
+                                reg = <0>;
+                        };
+                        PHY1: ethernet-phy@1 {
+                                device_type = "ethernet-phy";
+                                interrupts = <76>;      /* GPP 12 */
+                                interrupt-parent = <&PIC>;
+                                reg = <1>;
+                        };
+                        PHY2: ethernet-phy@2 {
+                                device_type = "ethernet-phy";
+                                interrupts = <76>;      /* GPP 12 */
+                                interrupt-parent = <&PIC>;
+                                reg = <2>;
+                        };
+                };
+
+                ethernet-group@2000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "marvell,mv64360-eth-group";
+                        reg = <0x2000 0x2000>;
+                        ethernet@0 {
+                                device_type = "network";
+                                compatible = "marvell,mv64360-eth";
+                                reg = <0>;
+                                interrupts = <32>;
+                                interrupt-parent = <&PIC>;
+                                phy = <&PHY0>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                        };
+                        ethernet@1 {
+                                device_type = "network";
+                                compatible = "marvell,mv64360-eth";
+                                reg = <1>;
+                                interrupts = <33>;
+                                interrupt-parent = <&PIC>;
+                                phy = <&PHY1>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                        };
+                        ethernet@2 {
+                                device_type = "network";
+                                compatible = "marvell,mv64360-eth";
+                                reg = <2>;
+                                interrupts = <34>;
+                                interrupt-parent = <&PIC>;
+                                phy = <&PHY2>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                        };
+                };
+
+                SDMA0: sdma@4000 {
+                        compatible = "marvell,mv64360-sdma";
+                        reg = <0x4000 0xc18>;
+                        virtual-reg = <0xd8004000>;
+                        interrupt-base = <0>;
+                        interrupts = <36>;
+                        interrupt-parent = <&PIC>;
+                };
+
+                SDMA1: sdma@6000 {
+                        compatible = "marvell,mv64360-sdma";
+                        reg = <0x6000 0xc18>;
+                        virtual-reg = <0xd8006000>;
+                        interrupt-base = <0>;
+                        interrupts = <38>;
+                        interrupt-parent = <&PIC>;
+                };
+
+                BRG0: brg@b200 {
+                        compatible = "marvell,mv64360-brg";
+                        reg = <0xb200 0x8>;
+                        clock-src = <8>;
+                        clock-frequency = <133333333>;
+                        current-speed = <115200>;
+                };
+
+                BRG1: brg@b208 {
+                        compatible = "marvell,mv64360-brg";
+                        reg = <0xb208 0x8>;
+                        clock-src = <8>;
+                        clock-frequency = <133333333>;
+                        current-speed = <115200>;
+                };
+
+                CUNIT: cunit@f200 {
+                        reg = <0xf200 0x200>;
+                };
+
+                MPSCROUTING: mpscrouting@b400 {
+                        reg = <0xb400 0xc>;
+                };
+
+                MPSCINTR: mpscintr@b800 {
+                        reg = <0xb800 0x100>;
+                        virtual-reg = <0xd800b800>;
+                };
+
+                MPSC0: mpsc@8000 {
+                        device_type = "serial";
+                        compatible = "marvell,mv64360-mpsc";
+                        reg = <0x8000 0x38>;
+                        virtual-reg = <0xd8008000>;
+                        sdma = <&SDMA0>;
+                        brg = <&BRG0>;
+                        cunit = <&CUNIT>;
+                        mpscrouting = <&MPSCROUTING>;
+                        mpscintr = <&MPSCINTR>;
+                        cell-index = <0>;
+                        interrupts = <40>;
+                        interrupt-parent = <&PIC>;
+                };
+
+                MPSC1: mpsc@9000 {
+                        device_type = "serial";
+                        compatible = "marvell,mv64360-mpsc";
+                        reg = <0x9000 0x38>;
+                        virtual-reg = <0xd8009000>;
+                        sdma = <&SDMA1>;
+                        brg = <&BRG1>;
+                        cunit = <&CUNIT>;
+                        mpscrouting = <&MPSCROUTING>;
+                        mpscintr = <&MPSCINTR>;
+                        cell-index = <1>;
+                        interrupts = <42>;
+                        interrupt-parent = <&PIC>;
+                };
+
+                wdt@b410 {                      /* watchdog timer */
+                        compatible = "marvell,mv64360-wdt";
+                        reg = <0xb410 0x8>;
+                };
+
+                i2c@c000 {
+                        compatible = "marvell,mv64360-i2c";
+                        reg = <0xc000 0x20>;
+                        virtual-reg = <0xd800c000>;
+                        interrupts = <37>;
+                        interrupt-parent = <&PIC>;
+                };
+
+                PIC: pic {
+                        #interrupt-cells = <1>;
+                        #address-cells = <0>;
+                        compatible = "marvell,mv64360-pic";
+                        reg = <0x0000 0x88>;
+                        interrupt-controller;
+                };
+
+                mpp@f000 {
+                        compatible = "marvell,mv64360-mpp";
+                        reg = <0xf000 0x10>;
+                };
+
+                gpp@f100 {
+                        compatible = "marvell,mv64360-gpp";
+                        reg = <0xf100 0x20>;
+                };
+
+                PCI0: pci@80000000 {
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        device_type = "pci";
+                        compatible = "marvell,mv64360-pci";
+                        reg = <0x0cf8 0x8>;
+                        ranges = <0x01000000 0x0 0x00000000 0xd4000000 0x0 0x01000000
+                                  0x02000000 0x0 0x80000000 0x80000000 0x0 0x08000000>;
+                        bus-range = <0 255>;
+                        clock-frequency = <66000000>;
+                        interrupt-pci-iack = <0x0c34>;
+                        interrupt-parent = <&PIC>;
+                        interrupt-map-mask = <0x0000 0x0 0x0 0x7>;
+                        interrupt-map = <
+                                /* Only one interrupt line for PMC0 slot (INTA) */
+                                0x0000 0 0 1 &PIC 88
+                        >;
+                };
+
+
+                PCI1: pci@a0000000 {
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        #interrupt-cells = <1>;
+                        device_type = "pci";
+                        compatible = "marvell,mv64360-pci";
+                        reg = <0x0c78 0x8>;
+                        ranges = <0x01000000 0x0 0x00000000 0xd0000000 0x0 0x01000000
+                                  0x02000000 0x0 0x80000000 0xa0000000 0x0 0x08000000>;
+                        bus-range = <0 255>;
+                        clock-frequency = <66000000>;
+                        interrupt-pci-iack = <0x0cb4>;
+                        interrupt-parent = <&PIC>;
+                        interrupt-map-mask = <0xf800 0x00 0x00 0x7>;
+                        interrupt-map = <
+                                /* IDSEL 0x01: PMC1 ? */
+                                0x0800 0 0 1 &PIC 88
+                                /* IDSEL 0x02: cPCI bridge */
+                                0x1000 0 0 1 &PIC 88
+                                /* IDSEL 0x03: USB controller */
+                                0x1800 0 0 1 &PIC 91
+                                /* IDSEL 0x04: SATA controller */
+                                0x2000 0 0 1 &PIC 95
+                        >;
+                };
+
+                cpu-error@0070 {
+                        compatible = "marvell,mv64360-cpu-error";
+                        reg = <0x0070 0x10 0x0128 0x28>;
+                        interrupts = <3>;
+                        interrupt-parent = <&PIC>;
+                };
+
+                sram-ctrl@0380 {
+                        compatible = "marvell,mv64360-sram-ctrl";
+                        reg = <0x0380 0x80>;
+                        interrupts = <13>;
+                        interrupt-parent = <&PIC>;
+                };
+
+                pci-error@1d40 {
+                        compatible = "marvell,mv64360-pci-error";
+                        reg = <0x1d40 0x40 0x0c28 0x4>;
+                        interrupts = <12>;
+                        interrupt-parent = <&PIC>;
+                };
+
+                pci-error@1dc0 {
+                        compatible = "marvell,mv64360-pci-error";
+                        reg = <0x1dc0 0x40 0x0ca8 0x4>;
+                        interrupts = <16>;
+                        interrupt-parent = <&PIC>;
+                };
+
+                mem-ctrl@1400 {
+                        compatible = "marvell,mv64360-mem-ctrl";
+                        reg = <0x1400 0x60>;
+                        interrupts = <17>;
+                        interrupt-parent = <&PIC>;
+                };
+                /* Devices attached to the device controller */
+                devicebus@045c {
+                        #address-cells = <2>;
+                        #size-cells = <1>;
+                        compatible = "marvell,mv64306-devctrl";
+                        reg = <0x45C 0x88>;
+                        interrupts = <1>;
+                        interrupt-parent = <&PIC>;
+                        ranges =        <0 0 0xd8100000 0x10000
+                                         2 0 0xd8110000 0x10000
+                                         4 0 0xf8000000 0x8000000>;
+                        fpga@0,0 {
+                                compatible = "sbs,fpga-c2k";
+                                reg = <0 0 0x10000>;
+                        };
+                        fpga_usart@2,0 {
+                                compatible = "sbs,fpga_usart-c2k";
+                                reg = <2 0 0x10000>;
+                        };
+                        nor_flash@4,0 {
+                                compatible = "cfi-flash";
+                                reg = <4 0 0x8000000>; /* 128MB */
+                                bank-width = <4>;
+                                device-width = <1>;
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                partition@0 {
+                                        label = "boot";
+                                        reg = <0x00000000 0x00080000>;
+                                };
+                                partition@40000 {
+                                        label = "kernel";
+                                        reg = <0x00080000 0x00400000>;
+                                };
+                                partition@440000 {
+                                        label = "initrd";
+                                        reg = <0x00480000 0x00B80000>;
+                                };
+                                partition@1000000 {
+                                        label = "rootfs";
+                                        reg = <0x01000000 0x06800000>;
+                                };
+                                partition@7800000 {
+                                        label = "recovery";
+                                        reg = <0x07800000 0x00800000>;
+                                        read-only;
+                                };
+                        };
+                };
+        };
+        chosen {
+                linux,stdout-path = &MPSC0;
+        };
+};
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
index 39634124929b..79fe412c11c9 100644
--- a/arch/powerpc/boot/dts/canyonlands.dts
+++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -8,12 +8,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,canyonlands";
         compatible = "amcc,canyonlands";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC0;
@@ -29,13 +31,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,460EX";
-                        reg = <0>;
+                        reg = <0x00000000>;
                         clock-frequency = <0>; /* Filled in by U-Boot */
                         timebase-frequency = <0>; /* Filled in by U-Boot */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <8000>;
-                        d-cache-size = <8000>;
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <32768>;
+                        d-cache-size = <32768>;
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -43,14 +45,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0 0>; /* Filled in by U-Boot */
+                reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by U-Boot */
         };
 
         UIC0: interrupt-controller0 {
                 compatible = "ibm,uic-460ex","ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -60,11 +62,11 @@
                 compatible = "ibm,uic-460ex","ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -72,11 +74,11 @@
                 compatible = "ibm,uic-460ex","ibm,uic";
                 interrupt-controller;
                 cell-index = <2>;
-                dcr-reg = <0e0 009>;
+                dcr-reg = <0x0e0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <a 4 b 4>; /* cascade */
+                interrupts = <0xa 0x4 0xb 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -84,22 +86,22 @@
                 compatible = "ibm,uic-460ex","ibm,uic";
                 interrupt-controller;
                 cell-index = <3>;
-                dcr-reg = <0f0 009>;
+                dcr-reg = <0x0f0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <10 4 11 4>; /* cascade */
+                interrupts = <0x10 0x4 0x11 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
         SDR0: sdr {
                 compatible = "ibm,sdr-460ex";
-                dcr-reg = <00e 002>;
+                dcr-reg = <0x00e 0x002>;
         };
 
         CPR0: cpr {
                 compatible = "ibm,cpr-460ex";
-                dcr-reg = <00c 002>;
+                dcr-reg = <0x00c 0x002>;
         };
 
         plb {
@@ -111,74 +113,74 @@
 
                 SDRAM0: sdram {
                         compatible = "ibm,sdram-460ex", "ibm,sdram-405gp";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-460ex", "ibm,mcmal2";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <2>;
-                        num-rx-chans = <10>;
+                        num-rx-chans = <16>;
                         #address-cells = <0>;
                         #size-cells = <0>;
                         interrupt-parent = <&UIC2>;
-                        interrupts = <  /*TXEOB*/ 6 4
-                                        /*RXEOB*/ 7 4
-                                        /*SERR*/  3 4
-                                        /*TXDE*/  4 4
-                                        /*RXDE*/  5 4>;
+                        interrupts = <  /*TXEOB*/ 0x6 0x4
+                                        /*RXEOB*/ 0x7 0x4
+                                        /*SERR*/  0x3 0x4
+                                        /*TXDE*/  0x4 0x4
+                                        /*RXDE*/  0x5 0x4>;
                 };
 
                 POB0: opb {
                         compatible = "ibm,opb-460ex", "ibm,opb";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges = <b0000000 4 b0000000 50000000>;
+                        ranges = <0xb0000000 0x00000004 0xb0000000 0x50000000>;
                         clock-frequency = <0>; /* Filled in by U-Boot */
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-460ex", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 /* ranges property is supplied by U-Boot */
-                                interrupts = <6 4>;
+                                interrupts = <0x6 0x4>;
                                 interrupt-parent = <&UIC1>;
 
                                 nor_flash@0,0 {
                                         compatible = "amd,s29gl512n", "cfi-flash";
                                         bank-width = <2>;
-                                        reg = <0 000000 4000000>;
+                                        reg = <0x00000000 0x00000000 0x04000000>;
                                         #address-cells = <1>;
                                         #size-cells = <1>;
                                         partition@0 {
                                                 label = "kernel";
-                                                reg = <0 1e0000>;
+                                                reg = <0x00000000 0x001e0000>;
                                         };
                                         partition@1e0000 {
                                                 label = "dtb";
-                                                reg = <1e0000 20000>;
+                                                reg = <0x001e0000 0x00020000>;
                                         };
                                         partition@200000 {
                                                 label = "ramdisk";
-                                                reg = <200000 1400000>;
+                                                reg = <0x00200000 0x01400000>;
                                         };
                                         partition@1600000 {
                                                 label = "jffs2";
-                                                reg = <1600000 400000>;
+                                                reg = <0x01600000 0x00400000>;
                                         };
                                         partition@1a00000 {
                                                 label = "user";
-                                                reg = <1a00000 2560000>;
+                                                reg = <0x01a00000 0x02560000>;
                                         };
                                         partition@3f60000 {
                                                 label = "env";
-                                                reg = <3f60000 40000>;
+                                                reg = <0x03f60000 0x00040000>;
                                         };
                                         partition@3fa0000 {
                                                 label = "u-boot";
-                                                reg = <3fa0000 60000>;
+                                                reg = <0x03fa0000 0x00060000>;
                                         };
                                 };
                         };
@@ -186,103 +188,103 @@
                         UART0: serial@ef600300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600300 8>;
-                                virtual-reg = <ef600300>;
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>; /* Filled in by U-Boot */
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         UART1: serial@ef600400 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600400 8>;
-                                virtual-reg = <ef600400>;
+                                reg = <0xef600400 0x00000008>;
+                                virtual-reg = <0xef600400>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>; /* Filled in by U-Boot */
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         UART2: serial@ef600500 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600500 8>;
-                                virtual-reg = <ef600500>;
+                                reg = <0xef600500 0x00000008>;
+                                virtual-reg = <0xef600500>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>; /* Filled in by U-Boot */
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1d 4>;
+                                interrupts = <0x1d 0x4>;
                         };
 
                         UART3: serial@ef600600 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600600 8>;
-                                virtual-reg = <ef600600>;
+                                reg = <0xef600600 0x00000008>;
+                                virtual-reg = <0xef600600>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>; /* Filled in by U-Boot */
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1e 4>;
+                                interrupts = <0x1e 0x4>;
                         };
 
                         IIC0: i2c@ef600700 {
                                 compatible = "ibm,iic-460ex", "ibm,iic";
-                                reg = <ef600700 14>;
+                                reg = <0xef600700 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
 
                         IIC1: i2c@ef600800 {
                                 compatible = "ibm,iic-460ex", "ibm,iic";
-                                reg = <ef600800 14>;
+                                reg = <0xef600800 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <3 4>;
+                                interrupts = <0x3 0x4>;
                         };
 
                         ZMII0: emac-zmii@ef600d00 {
                                 compatible = "ibm,zmii-460ex", "ibm,zmii";
-                                reg = <ef600d00 c>;
+                                reg = <0xef600d00 0x0000000c>;
                         };
 
                         RGMII0: emac-rgmii@ef601500 {
                                 compatible = "ibm,rgmii-460ex", "ibm,rgmii";
-                                reg = <ef601500 8>;
+                                reg = <0xef601500 0x00000008>;
                                 has-mdio;
                         };
 
                         TAH0: emac-tah@ef601350 {
                                 compatible = "ibm,tah-460ex", "ibm,tah";
-                                reg = <ef601350 30>;
+                                reg = <0xef601350 0x00000030>;
                         };
 
                         TAH1: emac-tah@ef601450 {
                                 compatible = "ibm,tah-460ex", "ibm,tah";
-                                reg = <ef601450 30>;
+                                reg = <0xef601450 0x00000030>;
                         };
 
                         EMAC0: ethernet@ef600e00 {
                                 device_type = "network";
-                                compatible = "ibm,emac-460ex", "ibm,emac4";
+                                compatible = "ibm,emac-460ex", "ibm,emac4sync";
                                 interrupt-parent = <&EMAC0>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC2 10 4
-                                                 /*Wake*/   1 &UIC2 14 4>;
-                                reg = <ef600e00 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4
+                                                 /*Wake*/   0x1 &UIC2 0x14 0x4>;
+                                reg = <0xef600e00 0x000000c4>;
                                 local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <0>;
                                 tah-device = <&TAH0>;
@@ -293,25 +295,25 @@
 
                         EMAC1: ethernet@ef600f00 {
                                 device_type = "network";
-                                compatible = "ibm,emac-460ex", "ibm,emac4";
+                                compatible = "ibm,emac-460ex", "ibm,emac4sync";
                                 interrupt-parent = <&EMAC1>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC2 11 4
-                                                 /*Wake*/   1 &UIC2 15 4>;
-                                reg = <ef600f00 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4
+                                                 /*Wake*/   0x1 &UIC2 0x15 0x4>;
+                                reg = <0xef600f00 0x000000c4>;
                                 local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <1>;
                                 mal-rx-channel = <8>;
                                 cell-index = <1>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <1>;
                                 tah-device = <&TAH1>;
@@ -331,27 +333,27 @@
                         primary;
                         large-inbound-windows;
                         enable-msi-hole;
-                        reg = <c 0ec00000   8   /* Config space access */
-                               0 0 0            /* no IACK cycles */
-                               c 0ed00000   4   /* Special cycles */
-                               c 0ec80000 100   /* Internal registers */
-                               c 0ec80100  fc>; /* Internal messaging registers */
+                        reg = <0x0000000c 0x0ec00000   0x00000008       /* Config space access */
+                               0x00000000 0x00000000 0x00000000         /* no IACK cycles */
+                               0x0000000c 0x0ed00000   0x00000004   /* Special cycles */
+                               0x0000000c 0x0ec80000 0x00000100 /* Internal registers */
+                               0x0000000c 0x0ec80100  0x000000fc>;      /* Internal messaging registers */
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 0000000d 80000000 0 80000000
-                                  01000000 0 00000000 0000000c 08000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000
+                                  0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 0 to 0x3f */
-                        bus-range = <0 3f>;
+                        bus-range = <0x0 0x3f>;
 
                         /* All PCI interrupts are routed to ext IRQ 2 -> UIC1-0 */
-                        interrupt-map-mask = <0000 0 0 0>;
-                        interrupt-map = < 0000 0 0 0 &UIC1 0 8 >;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x0>;
+                        interrupt-map = < 0x0 0x0 0x0 0x0 &UIC1 0x0 0x8 >;
                 };
 
                 PCIE0: pciex@d00000000 {
@@ -361,23 +363,23 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
                         primary;
-                        port = <0>; /* port number */
-                        reg = <d 00000000 20000000      /* Config space access */
-                               c 08010000 00001000>;    /* Registers */
-                        dcr-reg = <100 020>;
-                        sdr-base = <300>;
+                        port = <0x0>; /* port number */
+                        reg = <0x0000000d 0x00000000 0x20000000 /* Config space access */
+                               0x0000000c 0x08010000 0x00001000>;       /* Registers */
+                        dcr-reg = <0x100 0x020>;
+                        sdr-base = <0x300>;
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 0000000e 00000000 0 80000000
-                                  01000000 0 00000000 0000000f 80000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000
+                                  0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 40 to 0x7f */
-                        bus-range = <40 7f>;
+                        bus-range = <0x40 0x7f>;
 
                         /* Legacy interrupts (note the weird polarity, the bridge seems
                          * to invert PCIe legacy interrupts).
@@ -387,12 +389,12 @@
                          * below are basically de-swizzled numbers.
                          * The real slot is on idsel 0, so the swizzling is 1:1
                          */
-                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                         interrupt-map = <
-                                0000 0 0 1 &UIC3 c 4 /* swizzled int A */
-                                0000 0 0 2 &UIC3 d 4 /* swizzled int B */
-                                0000 0 0 3 &UIC3 e 4 /* swizzled int C */
-                                0000 0 0 4 &UIC3 f 4 /* swizzled int D */>;
+                                0x0 0x0 0x0 0x1 &UIC3 0xc 0x4 /* swizzled int A */
+                                0x0 0x0 0x0 0x2 &UIC3 0xd 0x4 /* swizzled int B */
+                                0x0 0x0 0x0 0x3 &UIC3 0xe 0x4 /* swizzled int C */
+                                0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>;
                 };
 
                 PCIE1: pciex@d20000000 {
@@ -402,23 +404,23 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
                         primary;
-                        port = <1>; /* port number */
-                        reg = <d 20000000 20000000      /* Config space access */
-                               c 08011000 00001000>;    /* Registers */
-                        dcr-reg = <120 020>;
-                        sdr-base = <340>;
+                        port = <0x1>; /* port number */
+                        reg = <0x0000000d 0x20000000 0x20000000 /* Config space access */
+                               0x0000000c 0x08011000 0x00001000>;       /* Registers */
+                        dcr-reg = <0x120 0x020>;
+                        sdr-base = <0x340>;
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 0000000e 80000000 0 80000000
-                                  01000000 0 00000000 0000000f 80010000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000
+                                  0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 80 to 0xbf */
-                        bus-range = <80 bf>;
+                        bus-range = <0x80 0xbf>;
 
                         /* Legacy interrupts (note the weird polarity, the bridge seems
                          * to invert PCIe legacy interrupts).
@@ -428,12 +430,12 @@
                          * below are basically de-swizzled numbers.
                          * The real slot is on idsel 0, so the swizzling is 1:1
                          */
-                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                         interrupt-map = <
-                                0000 0 0 1 &UIC3 10 4 /* swizzled int A */
-                                0000 0 0 2 &UIC3 11 4 /* swizzled int B */
-                                0000 0 0 3 &UIC3 12 4 /* swizzled int C */
-                                0000 0 0 4 &UIC3 13 4 /* swizzled int D */>;
+                                0x0 0x0 0x0 0x1 &UIC3 0x10 0x4 /* swizzled int A */
+                                0x0 0x0 0x0 0x2 &UIC3 0x11 0x4 /* swizzled int B */
+                                0x0 0x0 0x0 0x3 &UIC3 0x12 0x4 /* swizzled int C */
+                                0x0 0x0 0x0 0x4 &UIC3 0x13 0x4 /* swizzled int D */>;
                 };
         };
 };
diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index 5079dc890e0e..ec2d142291b4 100644
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -11,12 +11,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <2>;
         #size-cells = <1>;
         model = "ibm,ebony";
         compatible = "ibm,ebony";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC0;
@@ -32,13 +34,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,440GP";
-                        reg = <0>;
+                        reg = <0x00000000>;
                         clock-frequency = <0>; // Filled in by zImage
                         timebase-frequency = <0>; // Filled in by zImage
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <8000>; /* 32 kB */
-                        d-cache-size = <8000>; /* 32 kB */
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <32768>; /* 32 kB */
+                        d-cache-size = <32768>; /* 32 kB */
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -46,14 +48,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0 0>; // Filled in by zImage
+                reg = <0x00000000 0x00000000 0x00000000>; // Filled in by zImage
         };
 
         UIC0: interrupt-controller0 {
                 compatible = "ibm,uic-440gp", "ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -64,17 +66,17 @@
                 compatible = "ibm,uic-440gp", "ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
         CPC0: cpc {
                 compatible = "ibm,cpc-440gp";
-                dcr-reg = <0b0 003 0e0 010>;
+                dcr-reg = <0x0b0 0x003 0x0e0 0x010>;
                 // FIXME: anything else?
         };
 
@@ -87,37 +89,37 @@
 
                 SDRAM0: memory-controller {
                         compatible = "ibm,sdram-440gp";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                         // FIXME: anything else?
                 };
 
                 SRAM0: sram {
                         compatible = "ibm,sram-440gp";
-                        dcr-reg = <020 8 00a 1>;
+                        dcr-reg = <0x020 0x008 0x00a 0x001>;
                 };
 
                 DMA0: dma {
                         // FIXME: ???
                         compatible = "ibm,dma-440gp";
-                        dcr-reg = <100 027>;
+                        dcr-reg = <0x100 0x027>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-440gp", "ibm,mcmal";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <4>;
                         num-rx-chans = <4>;
                         interrupt-parent = <&MAL0>;
-                        interrupts = <0 1 2 3 4>;
+                        interrupts = <0x0 0x1 0x2 0x3 0x4>;
                         #interrupt-cells = <1>;
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-                                         /*RXEOB*/ 1 &UIC0 b 4
-                                         /*SERR*/  2 &UIC1 0 4
-                                         /*TXDE*/  3 &UIC1 1 4
-                                         /*RXDE*/  4 &UIC1 2 4>;
-                        interrupt-map-mask = <ffffffff>;
+                        interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4
+                                         /*RXEOB*/ 0x1 &UIC0 0xb 0x4
+                                         /*SERR*/  0x2 &UIC1 0x0 0x4
+                                         /*TXDE*/  0x3 &UIC1 0x1 0x4
+                                         /*RXDE*/  0x4 &UIC1 0x2 0x4>;
+                        interrupt-map-mask = <0xffffffff>;
                 };
 
                 POB0: opb {
@@ -126,34 +128,34 @@
                         #size-cells = <1>;
                         /* Wish there was a nicer way of specifying a full 32-bit
                            range */
-                        ranges = <00000000 1 00000000 80000000
-                                  80000000 1 80000000 80000000>;
-                        dcr-reg = <090 00b>;
+                        ranges = <0x00000000 0x00000001 0x00000000 0x80000000
+                                  0x80000000 0x00000001 0x80000000 0x80000000>;
+                        dcr-reg = <0x090 0x00b>;
                         interrupt-parent = <&UIC1>;
-                        interrupts = <7 4>;
+                        interrupts = <0x7 0x4>;
                         clock-frequency = <0>; // Filled in by zImage
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-440gp", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; // Filled in by zImage
                                 // ranges property is supplied by zImage
                                 // based on firmware's configuration of the
                                 // EBC bridge
-                                interrupts = <5 4>;
+                                interrupts = <0x5 0x4>;
                                 interrupt-parent = <&UIC1>;
 
                                 small-flash@0,80000 {
                                         compatible = "jedec-flash";
                                         bank-width = <1>;
-                                        reg = <0 80000 80000>;
+                                        reg = <0x00000000 0x00080000 0x00080000>;
                                         #address-cells = <1>;
                                         #size-cells = <1>;
                                         partition@0 {
                                                 label = "OpenBIOS";
-                                                reg = <0 80000>;
+                                                reg = <0x00000000 0x00080000>;
                                                 read-only;
                                         };
                                 };
@@ -161,101 +163,101 @@
                                 nvram@1,0 {
                                         /* NVRAM & RTC */
                                         compatible = "ds1743-nvram";
-                                        #bytes = <2000>;
-                                        reg = <1 0 2000>;
+                                        #bytes = <0x2000>;
+                                        reg = <0x00000001 0x00000000 0x00002000>;
                                 };
 
                                 large-flash@2,0 {
                                         compatible = "jedec-flash";
                                         bank-width = <1>;
-                                        reg = <2 0 400000>;
+                                        reg = <0x00000002 0x00000000 0x00400000>;
                                         #address-cells = <1>;
                                         #size-cells = <1>;
                                         partition@0 {
                                                 label = "fs";
-                                                reg = <0 380000>;
+                                                reg = <0x00000000 0x00380000>;
                                         };
                                         partition@380000 {
                                                 label = "firmware";
-                                                reg = <380000 80000>;
+                                                reg = <0x00380000 0x00080000>;
                                         };
                                 };
 
                                 ir@3,0 {
-                                        reg = <3 0 10>;
+                                        reg = <0x00000003 0x00000000 0x00000010>;
                                 };
 
                                 fpga@7,0 {
                                         compatible = "Ebony-FPGA";
-                                        reg = <7 0 10>;
-                                        virtual-reg = <e8300000>;
+                                        reg = <0x00000007 0x00000000 0x00000010>;
+                                        virtual-reg = <0xe8300000>;
                                 };
                         };
 
                         UART0: serial@40000200 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <40000200 8>;
-                                virtual-reg = <e0000200>;
-                                clock-frequency = <A8C000>;
-                                current-speed = <2580>;
+                                reg = <0x40000200 0x00000008>;
+                                virtual-reg = <0xe0000200>;
+                                clock-frequency = <11059200>;
+                                current-speed = <9600>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <0 4>;
+                                interrupts = <0x0 0x4>;
                         };
 
                         UART1: serial@40000300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <40000300 8>;
-                                virtual-reg = <e0000300>;
-                                clock-frequency = <A8C000>;
-                                current-speed = <2580>;
+                                reg = <0x40000300 0x00000008>;
+                                virtual-reg = <0xe0000300>;
+                                clock-frequency = <11059200>;
+                                current-speed = <9600>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         IIC0: i2c@40000400 {
                                 /* FIXME */
                                 compatible = "ibm,iic-440gp", "ibm,iic";
-                                reg = <40000400 14>;
+                                reg = <0x40000400 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
                         IIC1: i2c@40000500 {
                                 /* FIXME */
                                 compatible = "ibm,iic-440gp", "ibm,iic";
-                                reg = <40000500 14>;
+                                reg = <0x40000500 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <3 4>;
+                                interrupts = <0x3 0x4>;
                         };
 
                         GPIO0: gpio@40000700 {
                                 /* FIXME */
                                 compatible = "ibm,gpio-440gp";
-                                reg = <40000700 20>;
+                                reg = <0x40000700 0x00000020>;
                         };
 
                         ZMII0: emac-zmii@40000780 {
                                 compatible = "ibm,zmii-440gp", "ibm,zmii";
-                                reg = <40000780 c>;
+                                reg = <0x40000780 0x0000000c>;
                         };
 
                         EMAC0: ethernet@40000800 {
                                 device_type = "network";
                                 compatible = "ibm,emac-440gp", "ibm,emac";
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1c 4 1d 4>;
-                                reg = <40000800 70>;
+                                interrupts = <0x1c 0x4 0x1d 0x4>;
+                                reg = <0x40000800 0x00000070>;
                                 local-mac-address = [000000000000]; // Filled in by zImage
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0 1>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <5dc>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <1500>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rmii";
-                                phy-map = <00000001>;
+                                phy-map = <0x00000001>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <0>;
                         };
@@ -263,18 +265,18 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-440gp", "ibm,emac";
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1e 4 1f 4>;
-                                reg = <40000900 70>;
+                                interrupts = <0x1e 0x4 0x1f 0x4>;
+                                reg = <0x40000900 0x00000070>;
                                 local-mac-address = [000000000000]; // Filled in by zImage
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <2 3>;
                                 mal-rx-channel = <1>;
                                 cell-index = <1>;
-                                max-frame-size = <5dc>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <1500>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rmii";
-                                phy-map = <00000001>;
+                                phy-map = <0x00000001>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <1>;
                         };
@@ -282,9 +284,9 @@
 
                         GPT0: gpt@40000a00 {
                                 /* FIXME */
-                                reg = <40000a00 d4>;
+                                reg = <0x40000a00 0x000000d4>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <12 4 13 4 14 4 15 4 16 4>;
+                                interrupts = <0x12 0x4 0x13 0x4 0x14 0x4 0x15 0x4 0x16 0x4>;
                         };
 
                 };
@@ -296,35 +298,35 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb440gp-pcix", "ibm,plb-pcix";
                         primary;
-                        reg = <2 0ec00000 8     /* Config space access */
-                               0 0 0            /* no IACK cycles */
-                               2 0ed00000 4     /* Special cycles */
-                               2 0ec80000 f0    /* Internal registers */
-                               2 0ec80100 fc>;  /* Internal messaging registers */
+                        reg = <0x00000002 0x0ec00000 0x00000008 /* Config space access */
+                               0x00000000 0x00000000 0x00000000         /* no IACK cycles */
+                               0x00000002 0x0ed00000 0x00000004     /* Special cycles */
+                               0x00000002 0x0ec80000 0x000000f0 /* Internal registers */
+                               0x00000002 0x0ec80100 0x000000fc>;       /* Internal messaging registers */
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 00000003 80000000 0 80000000
-                                  01000000 0 00000000 00000002 08000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x00000003 0x80000000 0x00000000 0x80000000
+                                  0x01000000 0x00000000 0x00000000 0x00000002 0x08000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* Ebony has all 4 IRQ pins tied together per slot */
-                        interrupt-map-mask = <f800 0 0 0>;
+                        interrupt-map-mask = <0xf800 0x0 0x0 0x0>;
                         interrupt-map = <
                                 /* IDSEL 1 */
-                                0800 0 0 0 &UIC0 17 8
+                                0x800 0x0 0x0 0x0 &UIC0 0x17 0x8
 
                                 /* IDSEL 2 */
-                                1000 0 0 0 &UIC0 18 8
+                                0x1000 0x0 0x0 0x0 &UIC0 0x18 0x8
 
                                 /* IDSEL 3 */
-                                1800 0 0 0 &UIC0 19 8
+                                0x1800 0x0 0x0 0x0 &UIC0 0x19 0x8
 
                                 /* IDSEL 4 */
-                                2000 0 0 0 &UIC0 1a 8
+                                0x2000 0x0 0x0 0x0 &UIC0 0x1a 0x8
                         >;
                 };
         };
diff --git a/arch/powerpc/boot/dts/ep405.dts b/arch/powerpc/boot/dts/ep405.dts
index 92938557ac8a..53ef06cc2134 100644
--- a/arch/powerpc/boot/dts/ep405.dts
+++ b/arch/powerpc/boot/dts/ep405.dts
@@ -9,12 +9,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <1>;
         #size-cells = <1>;
         model = "ep405";
         compatible = "ep405";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC;
@@ -29,13 +31,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,405GP";
-                        reg = <0>;
-                        clock-frequency = <bebc200>; /* Filled in by zImage */
+                        reg = <0x00000000>;
+                        clock-frequency = <200000000>; /* Filled in by zImage */
                         timebase-frequency = <0>; /* Filled in by zImage */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <4000>;
-                        d-cache-size = <4000>;
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <16384>;
+                        d-cache-size = <16384>;
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -43,14 +45,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0>; /* Filled in by zImage */
+                reg = <0x00000000 0x00000000>; /* Filled in by zImage */
         };
 
         UIC0: interrupt-controller {
                 compatible = "ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 9>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -65,91 +67,91 @@
 
                 SDRAM0: memory-controller {
                         compatible = "ibm,sdram-405gp";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 MAL: mcmal {
                         compatible = "ibm,mcmal-405gp", "ibm,mcmal";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <1>;
                         num-rx-chans = <1>;
                         interrupt-parent = <&UIC0>;
                         interrupts = <
-                                b 4 /* TXEOB */
-                                c 4 /* RXEOB */
-                                a 4 /* SERR */
-                                d 4 /* TXDE */
-                                e 4 /* RXDE */>;
+                                0xb 0x4 /* TXEOB */
+                                0xc 0x4 /* RXEOB */
+                                0xa 0x4 /* SERR */
+                                0xd 0x4 /* TXDE */
+                                0xe 0x4 /* RXDE */>;
                 };
 
                 POB0: opb {
                         compatible = "ibm,opb-405gp", "ibm,opb";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges = <ef600000 ef600000 a00000>;
-                        dcr-reg = <0a0 5>;
+                        ranges = <0xef600000 0xef600000 0x00a00000>;
+                        dcr-reg = <0x0a0 0x005>;
                         clock-frequency = <0>; /* Filled in by zImage */
 
                         UART0: serial@ef600300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600300 8>;
-                                virtual-reg = <ef600300>;
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                current-speed = <2580>;
+                                current-speed = <9600>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <0 4>;
+                                interrupts = <0x0 0x4>;
                         };
 
                         UART1: serial@ef600400 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600400 8>;
-                                virtual-reg = <ef600400>;
+                                reg = <0xef600400 0x00000008>;
+                                virtual-reg = <0xef600400>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                current-speed = <2580>;
+                                current-speed = <9600>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         IIC: i2c@ef600500 {
                                 compatible = "ibm,iic-405gp", "ibm,iic";
-                                reg = <ef600500 11>;
+                                reg = <0xef600500 0x00000011>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
 
                         GPIO: gpio@ef600700 {
                                 compatible = "ibm,gpio-405gp";
-                                reg = <ef600700 20>;
+                                reg = <0xef600700 0x00000020>;
                         };
 
                         EMAC: ethernet@ef600800 {
-                                linux,network-index = <0>;
+                                linux,network-index = <0x0>;
                                 device_type = "network";
                                 compatible = "ibm,emac-405gp", "ibm,emac";
                                 interrupt-parent = <&UIC0>;
                                 interrupts = <
-                                        f 4 /* Ethernet */
-                                        9 4 /* Ethernet Wake Up */>;
+                                        0xf 0x4 /* Ethernet */
+                                        0x9 0x4 /* Ethernet Wake Up */>;
                                 local-mac-address = [000000000000]; /* Filled in by zImage */
-                                reg = <ef600800 70>;
+                                reg = <0xef600800 0x00000070>;
                                 mal-device = <&MAL>;
                                 mal-tx-channel = <0>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <5dc>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <1500>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                         };
 
                 };
 
                 EBC0: ebc {
                         compatible = "ibm,ebc-405gp", "ibm,ebc";
-                        dcr-reg = <012 2>;
+                        dcr-reg = <0x012 0x002>;
                         #address-cells = <2>;
                         #size-cells = <1>;
 
@@ -163,13 +165,13 @@
                         /* NVRAM and RTC */
                         nvrtc@4,200000 {
                                 compatible = "ds1742";
-                                reg = <4 200000 0>; /* size fixed up by zImage */
+                                reg = <0x00000004 0x00200000 0x00000000>; /* size fixed up by zImage */
                         };
 
                         /* "BCSR" CPLD contains a PCI irq controller */
                         bcsr@4,0 {
                                 compatible = "ep405-bcsr";
-                                reg = <4 0 10>;
+                                reg = <0x00000004 0x00000000 0x00000010>;
                                 interrupt-controller;
                                 /* Routing table */
                                 irq-routing = [ 00      /* SYSERR */
@@ -198,26 +200,26 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb405gp-pci", "ibm,plb-pci";
                         primary;
-                        reg = <eec00000 8       /* Config space access */
-                               eed80000 4       /* IACK */
-                               eed80000 4       /* Special cycle */
-                               ef480000 40>;    /* Internal registers */
+                        reg = <0xeec00000 0x00000008    /* Config space access */
+                               0xeed80000 0x00000004    /* IACK */
+                               0xeed80000 0x00000004    /* Special cycle */
+                               0xef480000 0x00000040>;  /* Internal registers */
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed. Chip supports a second
                          * IO range but we don't use it for now
                          */
-                        ranges = <02000000 0 80000000 80000000 0 20000000
-                                  01000000 0 00000000 e8000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x80000000 0x00000000 0x20000000
+                                  0x01000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* That's all I know about IRQs on that thing ... */
-                        interrupt-map-mask = <f800 0 0 0>;
+                        interrupt-map-mask = <0xf800 0x0 0x0 0x0>;
                         interrupt-map = <
                                 /* USB */
-                                7000 0 0 0 &UIC0 1e 8 /* IRQ5 */
+                                0x7000 0x0 0x0 0x0 &UIC0 0x1e 0x8 /* IRQ5 */
                         >;
                 };
         };
diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
index 0f2fc077d8db..24cf0dba120c 100644
--- a/arch/powerpc/boot/dts/glacier.dts
+++ b/arch/powerpc/boot/dts/glacier.dts
@@ -8,12 +8,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,glacier";
         compatible = "amcc,glacier", "amcc,canyonlands";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC0;
@@ -31,13 +33,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,460GT";
-                        reg = <0>;
+                        reg = <0x00000000>;
                         clock-frequency = <0>; /* Filled in by U-Boot */
                         timebase-frequency = <0>; /* Filled in by U-Boot */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <8000>;
-                        d-cache-size = <8000>;
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <32768>;
+                        d-cache-size = <32768>;
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -45,14 +47,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0 0>; /* Filled in by U-Boot */
+                reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by U-Boot */
         };
 
         UIC0: interrupt-controller0 {
                 compatible = "ibm,uic-460gt","ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -62,11 +64,11 @@
                 compatible = "ibm,uic-460gt","ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -74,11 +76,11 @@
                 compatible = "ibm,uic-460gt","ibm,uic";
                 interrupt-controller;
                 cell-index = <2>;
-                dcr-reg = <0e0 009>;
+                dcr-reg = <0x0e0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <a 4 b 4>; /* cascade */
+                interrupts = <0xa 0x4 0xb 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -86,22 +88,22 @@
                 compatible = "ibm,uic-460gt","ibm,uic";
                 interrupt-controller;
                 cell-index = <3>;
-                dcr-reg = <0f0 009>;
+                dcr-reg = <0x0f0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <10 4 11 4>; /* cascade */
+                interrupts = <0x10 0x4 0x11 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
         SDR0: sdr {
                 compatible = "ibm,sdr-460gt";
-                dcr-reg = <00e 002>;
+                dcr-reg = <0x00e 0x002>;
         };
 
         CPR0: cpr {
                 compatible = "ibm,cpr-460gt";
-                dcr-reg = <00c 002>;
+                dcr-reg = <0x00c 0x002>;
         };
 
         plb {
@@ -113,75 +115,75 @@
 
                 SDRAM0: sdram {
                         compatible = "ibm,sdram-460gt", "ibm,sdram-405gp";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-460gt", "ibm,mcmal2";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <4>;
-                        num-rx-chans = <20>;
+                        num-rx-chans = <32>;
                         #address-cells = <0>;
                         #size-cells = <0>;
                         interrupt-parent = <&UIC2>;
-                        interrupts = <  /*TXEOB*/ 6 4
-                                        /*RXEOB*/ 7 4
-                                        /*SERR*/  3 4
-                                        /*TXDE*/  4 4
-                                        /*RXDE*/  5 4>;
-                        desc-base-addr-high = <8>;
+                        interrupts = <  /*TXEOB*/ 0x6 0x4
+                                        /*RXEOB*/ 0x7 0x4
+                                        /*SERR*/  0x3 0x4
+                                        /*TXDE*/  0x4 0x4
+                                        /*RXDE*/  0x5 0x4>;
+                        desc-base-addr-high = <0x8>;
                 };
 
                 POB0: opb {
                         compatible = "ibm,opb-460gt", "ibm,opb";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges = <b0000000 4 b0000000 50000000>;
+                        ranges = <0xb0000000 0x00000004 0xb0000000 0x50000000>;
                         clock-frequency = <0>; /* Filled in by U-Boot */
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-460gt", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 /* ranges property is supplied by U-Boot */
-                                interrupts = <6 4>;
+                                interrupts = <0x6 0x4>;
                                 interrupt-parent = <&UIC1>;
 
                                 nor_flash@0,0 {
                                         compatible = "amd,s29gl512n", "cfi-flash";
                                         bank-width = <2>;
-                                        reg = <0 000000 4000000>;
+                                        reg = <0x00000000 0x00000000 0x04000000>;
                                         #address-cells = <1>;
                                         #size-cells = <1>;
                                         partition@0 {
                                                 label = "kernel";
-                                                reg = <0 1e0000>;
+                                                reg = <0x00000000 0x001e0000>;
                                         };
                                         partition@1e0000 {
                                                 label = "dtb";
-                                                reg = <1e0000 20000>;
+                                                reg = <0x001e0000 0x00020000>;
                                         };
                                         partition@200000 {
                                                 label = "ramdisk";
-                                                reg = <200000 1400000>;
+                                                reg = <0x00200000 0x01400000>;
                                         };
                                         partition@1600000 {
                                                 label = "jffs2";
-                                                reg = <1600000 400000>;
+                                                reg = <0x01600000 0x00400000>;
                                         };
                                         partition@1a00000 {
                                                 label = "user";
-                                                reg = <1a00000 2560000>;
+                                                reg = <0x01a00000 0x02560000>;
                                         };
                                         partition@3f60000 {
                                                 label = "env";
-                                                reg = <3f60000 40000>;
+                                                reg = <0x03f60000 0x00040000>;
                                         };
                                         partition@3fa0000 {
                                                 label = "u-boot";
-                                                reg = <3fa0000 60000>;
+                                                reg = <0x03fa0000 0x00060000>;
                                         };
                                 };
                         };
@@ -189,109 +191,109 @@
                         UART0: serial@ef600300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600300 8>;
-                                virtual-reg = <ef600300>;
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>; /* Filled in by U-Boot */
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         UART1: serial@ef600400 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600400 8>;
-                                virtual-reg = <ef600400>;
+                                reg = <0xef600400 0x00000008>;
+                                virtual-reg = <0xef600400>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>; /* Filled in by U-Boot */
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         UART2: serial@ef600500 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600500 8>;
-                                virtual-reg = <ef600500>;
+                                reg = <0xef600500 0x00000008>;
+                                virtual-reg = <0xef600500>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>; /* Filled in by U-Boot */
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1d 4>;
+                                interrupts = <0x1d 0x4>;
                         };
 
                         UART3: serial@ef600600 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600600 8>;
-                                virtual-reg = <ef600600>;
+                                reg = <0xef600600 0x00000008>;
+                                virtual-reg = <0xef600600>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>; /* Filled in by U-Boot */
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1e 4>;
+                                interrupts = <0x1e 0x4>;
                         };
 
                         IIC0: i2c@ef600700 {
                                 compatible = "ibm,iic-460gt", "ibm,iic";
-                                reg = <ef600700 14>;
+                                reg = <0xef600700 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
 
                         IIC1: i2c@ef600800 {
                                 compatible = "ibm,iic-460gt", "ibm,iic";
-                                reg = <ef600800 14>;
+                                reg = <0xef600800 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <3 4>;
+                                interrupts = <0x3 0x4>;
                         };
 
                         ZMII0: emac-zmii@ef600d00 {
                                 compatible = "ibm,zmii-460gt", "ibm,zmii";
-                                reg = <ef600d00 c>;
+                                reg = <0xef600d00 0x0000000c>;
                         };
 
                         RGMII0: emac-rgmii@ef601500 {
                                 compatible = "ibm,rgmii-460gt", "ibm,rgmii";
-                                reg = <ef601500 8>;
+                                reg = <0xef601500 0x00000008>;
                                 has-mdio;
                         };
 
                         RGMII1: emac-rgmii@ef601600 {
                                 compatible = "ibm,rgmii-460gt", "ibm,rgmii";
-                                reg = <ef601600 8>;
+                                reg = <0xef601600 0x00000008>;
                                 has-mdio;
                         };
 
                         TAH0: emac-tah@ef601350 {
                                 compatible = "ibm,tah-460gt", "ibm,tah";
-                                reg = <ef601350 30>;
+                                reg = <0xef601350 0x00000030>;
                         };
 
                         TAH1: emac-tah@ef601450 {
                                 compatible = "ibm,tah-460gt", "ibm,tah";
-                                reg = <ef601450 30>;
+                                reg = <0xef601450 0x00000030>;
                         };
 
                         EMAC0: ethernet@ef600e00 {
                                 device_type = "network";
                                 compatible = "ibm,emac-460gt", "ibm,emac4";
                                 interrupt-parent = <&EMAC0>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC2 10 4
-                                                 /*Wake*/   1 &UIC2 14 4>;
-                                reg = <ef600e00 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4
+                                                 /*Wake*/   0x1 &UIC2 0x14 0x4>;
+                                reg = <0xef600e00 0x00000074>;
                                 local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <0>;
                                 tah-device = <&TAH0>;
@@ -304,23 +306,23 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-460gt", "ibm,emac4";
                                 interrupt-parent = <&EMAC1>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC2 11 4
-                                                 /*Wake*/   1 &UIC2 15 4>;
-                                reg = <ef600f00 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4
+                                                 /*Wake*/   0x1 &UIC2 0x15 0x4>;
+                                reg = <0xef600f00 0x00000074>;
                                 local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <1>;
                                 mal-rx-channel = <8>;
                                 cell-index = <1>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <1>;
                                 tah-device = <&TAH1>;
@@ -334,23 +336,23 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-460gt", "ibm,emac4";
                                 interrupt-parent = <&EMAC2>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC2 12 4
-                                                 /*Wake*/   1 &UIC2 16 4>;
-                                reg = <ef601100 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC2 0x12 0x4
+                                                 /*Wake*/   0x1 &UIC2 0x16 0x4>;
+                                reg = <0xef601100 0x00000074>;
                                 local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <2>;
-                                mal-rx-channel = <10>;
+                                mal-rx-channel = <16>;
                                 cell-index = <2>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 rgmii-device = <&RGMII1>;
                                 rgmii-channel = <0>;
                                 has-inverted-stacr-oc;
@@ -362,23 +364,23 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-460gt", "ibm,emac4";
                                 interrupt-parent = <&EMAC3>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC2 13 4
-                                                 /*Wake*/   1 &UIC2 17 4>;
-                                reg = <ef601200 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC2 0x13 0x4
+                                                 /*Wake*/   0x1 &UIC2 0x17 0x4>;
+                                reg = <0xef601200 0x00000074>;
                                 local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <3>;
-                                mal-rx-channel = <18>;
+                                mal-rx-channel = <24>;
                                 cell-index = <3>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 rgmii-device = <&RGMII1>;
                                 rgmii-channel = <1>;
                                 has-inverted-stacr-oc;
@@ -396,27 +398,27 @@
                         primary;
                         large-inbound-windows;
                         enable-msi-hole;
-                        reg = <c 0ec00000   8   /* Config space access */
-                               0 0 0            /* no IACK cycles */
-                               c 0ed00000   4   /* Special cycles */
-                               c 0ec80000 100   /* Internal registers */
-                               c 0ec80100  fc>; /* Internal messaging registers */
+                        reg = <0x0000000c 0x0ec00000   0x00000008       /* Config space access */
+                               0x00000000 0x00000000 0x00000000         /* no IACK cycles */
+                               0x0000000c 0x0ed00000   0x00000004   /* Special cycles */
+                               0x0000000c 0x0ec80000 0x00000100 /* Internal registers */
+                               0x0000000c 0x0ec80100  0x000000fc>;      /* Internal messaging registers */
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 0000000d 80000000 0 80000000
-                                  01000000 0 00000000 0000000c 08000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000
+                                  0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 0 to 0x3f */
-                        bus-range = <0 3f>;
+                        bus-range = <0x0 0x3f>;
 
                         /* All PCI interrupts are routed to ext IRQ 2 -> UIC1-0 */
-                        interrupt-map-mask = <0000 0 0 0>;
-                        interrupt-map = < 0000 0 0 0 &UIC1 0 8 >;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x0>;
+                        interrupt-map = < 0x0 0x0 0x0 0x0 &UIC1 0x0 0x8 >;
                 };
 
                 PCIE0: pciex@d00000000 {
@@ -426,23 +428,23 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
                         primary;
-                        port = <0>; /* port number */
-                        reg = <d 00000000 20000000      /* Config space access */
-                               c 08010000 00001000>;    /* Registers */
-                        dcr-reg = <100 020>;
-                        sdr-base = <300>;
+                        port = <0x0>; /* port number */
+                        reg = <0x0000000d 0x00000000 0x20000000 /* Config space access */
+                               0x0000000c 0x08010000 0x00001000>;       /* Registers */
+                        dcr-reg = <0x100 0x020>;
+                        sdr-base = <0x300>;
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 0000000e 00000000 0 80000000
-                                  01000000 0 00000000 0000000f 80000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000
+                                  0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 40 to 0x7f */
-                        bus-range = <40 7f>;
+                        bus-range = <0x40 0x7f>;
 
                         /* Legacy interrupts (note the weird polarity, the bridge seems
                          * to invert PCIe legacy interrupts).
@@ -452,12 +454,12 @@
                          * below are basically de-swizzled numbers.
                          * The real slot is on idsel 0, so the swizzling is 1:1
                          */
-                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                         interrupt-map = <
-                                0000 0 0 1 &UIC3 c 4 /* swizzled int A */
-                                0000 0 0 2 &UIC3 d 4 /* swizzled int B */
-                                0000 0 0 3 &UIC3 e 4 /* swizzled int C */
-                                0000 0 0 4 &UIC3 f 4 /* swizzled int D */>;
+                                0x0 0x0 0x0 0x1 &UIC3 0xc 0x4 /* swizzled int A */
+                                0x0 0x0 0x0 0x2 &UIC3 0xd 0x4 /* swizzled int B */
+                                0x0 0x0 0x0 0x3 &UIC3 0xe 0x4 /* swizzled int C */
+                                0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D */>;
                 };
 
                 PCIE1: pciex@d20000000 {
@@ -467,23 +469,23 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
                         primary;
-                        port = <1>; /* port number */
-                        reg = <d 20000000 20000000      /* Config space access */
-                               c 08011000 00001000>;    /* Registers */
-                        dcr-reg = <120 020>;
-                        sdr-base = <340>;
+                        port = <0x1>; /* port number */
+                        reg = <0x0000000d 0x20000000 0x20000000 /* Config space access */
+                               0x0000000c 0x08011000 0x00001000>;       /* Registers */
+                        dcr-reg = <0x120 0x020>;
+                        sdr-base = <0x340>;
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 0000000e 80000000 0 80000000
-                                  01000000 0 00000000 0000000f 80010000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000
+                                  0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 80 to 0xbf */
-                        bus-range = <80 bf>;
+                        bus-range = <0x80 0xbf>;
 
                         /* Legacy interrupts (note the weird polarity, the bridge seems
                          * to invert PCIe legacy interrupts).
@@ -493,12 +495,12 @@
                          * below are basically de-swizzled numbers.
                          * The real slot is on idsel 0, so the swizzling is 1:1
                          */
-                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                         interrupt-map = <
-                                0000 0 0 1 &UIC3 10 4 /* swizzled int A */
-                                0000 0 0 2 &UIC3 11 4 /* swizzled int B */
-                                0000 0 0 3 &UIC3 12 4 /* swizzled int C */
-                                0000 0 0 4 &UIC3 13 4 /* swizzled int D */>;
+                                0x0 0x0 0x0 0x1 &UIC3 0x10 0x4 /* swizzled int A */
+                                0x0 0x0 0x0 0x2 &UIC3 0x11 0x4 /* swizzled int B */
+                                0x0 0x0 0x0 0x3 &UIC3 0x12 0x4 /* swizzled int C */
+                                0x0 0x0 0x0 0x4 &UIC3 0x13 0x4 /* swizzled int D */>;
                 };
         };
 };
diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts
index b5d95ac24dbf..513bc43a71af 100644
--- a/arch/powerpc/boot/dts/haleakala.dts
+++ b/arch/powerpc/boot/dts/haleakala.dts
@@ -8,12 +8,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <1>;
         #size-cells = <1>;
         model = "amcc,haleakala";
         compatible = "amcc,haleakala", "amcc,kilauea";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC0;
@@ -28,13 +30,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,405EXr";
-                        reg = <0>;
+                        reg = <0x00000000>;
                         clock-frequency = <0>; /* Filled in by U-Boot */
                         timebase-frequency = <0>; /* Filled in by U-Boot */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <4000>; /* 16 kB */
-                        d-cache-size = <4000>; /* 16 kB */
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <16384>; /* 16 kB */
+                        d-cache-size = <16384>; /* 16 kB */
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -42,14 +44,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0>; /* Filled in by U-Boot */
+                reg = <0x00000000 0x00000000>; /* Filled in by U-Boot */
         };
 
         UIC0: interrupt-controller {
                 compatible = "ibm,uic-405exr", "ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -59,11 +61,11 @@
                 compatible = "ibm,uic-405exr","ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -71,11 +73,11 @@
                 compatible = "ibm,uic-405exr","ibm,uic";
                 interrupt-controller;
                 cell-index = <2>;
-                dcr-reg = <0e0 009>;
+                dcr-reg = <0x0e0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1c 4 1d 4>; /* cascade */
+                interrupts = <0x1c 0x4 0x1d 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -88,72 +90,72 @@
 
                 SDRAM0: memory-controller {
                         compatible = "ibm,sdram-405exr";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-405exr", "ibm,mcmal2";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <2>;
                         num-rx-chans = <2>;
                         interrupt-parent = <&MAL0>;
-                        interrupts = <0 1 2 3 4>;
+                        interrupts = <0x0 0x1 0x2 0x3 0x4>;
                         #interrupt-cells = <1>;
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-                                        /*RXEOB*/ 1 &UIC0 b 4
-                                        /*SERR*/  2 &UIC1 0 4
-                                        /*TXDE*/  3 &UIC1 1 4
-                                        /*RXDE*/  4 &UIC1 2 4>;
-                        interrupt-map-mask = <ffffffff>;
+                        interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4
+                                        /*RXEOB*/ 0x1 &UIC0 0xb 0x4
+                                        /*SERR*/  0x2 &UIC1 0x0 0x4
+                                        /*TXDE*/  0x3 &UIC1 0x1 0x4
+                                        /*RXDE*/  0x4 &UIC1 0x2 0x4>;
+                        interrupt-map-mask = <0xffffffff>;
                 };
 
                 POB0: opb {
                         compatible = "ibm,opb-405exr", "ibm,opb";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges = <80000000 80000000 10000000
-                                  ef600000 ef600000 a00000
-                                  f0000000 f0000000 10000000>;
-                        dcr-reg = <0a0 5>;
+                        ranges = <0x80000000 0x80000000 0x10000000
+                                  0xef600000 0xef600000 0x00a00000
+                                  0xf0000000 0xf0000000 0x10000000>;
+                        dcr-reg = <0x0a0 0x005>;
                         clock-frequency = <0>; /* Filled in by U-Boot */
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-405exr", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 /* ranges property is supplied by U-Boot */
-                                interrupts = <5 1>;
+                                interrupts = <0x5 0x1>;
                                 interrupt-parent = <&UIC1>;
 
                                 nor_flash@0,0 {
                                         compatible = "amd,s29gl512n", "cfi-flash";
                                         bank-width = <2>;
-                                        reg = <0 000000 4000000>;
+                                        reg = <0x00000000 0x00000000 0x04000000>;
                                         #address-cells = <1>;
                                         #size-cells = <1>;
                                         partition@0 {
                                                 label = "kernel";
-                                                reg = <0 200000>;
+                                                reg = <0x00000000 0x00200000>;
                                         };
                                         partition@200000 {
                                                 label = "root";
-                                                reg = <200000 200000>;
+                                                reg = <0x00200000 0x00200000>;
                                         };
                                         partition@400000 {
                                                 label = "user";
-                                                reg = <400000 3b60000>;
+                                                reg = <0x00400000 0x03b60000>;
                                         };
                                         partition@3f60000 {
                                                 label = "env";
-                                                reg = <3f60000 40000>;
+                                                reg = <0x03f60000 0x00040000>;
                                         };
                                         partition@3fa0000 {
                                                 label = "u-boot";
-                                                reg = <3fa0000 60000>;
+                                                reg = <0x03fa0000 0x00060000>;
                                         };
                                 };
                         };
@@ -161,68 +163,68 @@
                         UART0: serial@ef600200 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600200 8>;
-                                virtual-reg = <ef600200>;
+                                reg = <0xef600200 0x00000008>;
+                                virtual-reg = <0xef600200>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1a 4>;
+                                interrupts = <0x1a 0x4>;
                         };
 
                         UART1: serial@ef600300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600300 8>;
-                                virtual-reg = <ef600300>;
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         IIC0: i2c@ef600400 {
                                 compatible = "ibm,iic-405exr", "ibm,iic";
-                                reg = <ef600400 14>;
+                                reg = <0xef600400 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
 
                         IIC1: i2c@ef600500 {
                                 compatible = "ibm,iic-405exr", "ibm,iic";
-                                reg = <ef600500 14>;
+                                reg = <0xef600500 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <7 4>;
+                                interrupts = <0x7 0x4>;
                         };
 
 
                         RGMII0: emac-rgmii@ef600b00 {
                                 compatible = "ibm,rgmii-405exr", "ibm,rgmii";
-                                reg = <ef600b00 104>;
+                                reg = <0xef600b00 0x00000104>;
                                 has-mdio;
                         };
 
                         EMAC0: ethernet@ef600900 {
-                                linux,network-index = <0>;
+                                linux,network-index = <0x0>;
                                 device_type = "network";
-                                compatible = "ibm,emac-405exr", "ibm,emac4";
+                                compatible = "ibm,emac-405exr", "ibm,emac4sync";
                                 interrupt-parent = <&EMAC0>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC0 18 4
-                                                /*Wake*/  1 &UIC1 1d 4>;
-                                reg = <ef600900 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4
+                                                /*Wake*/  0x1 &UIC1 0x1d 0x4>;
+                                reg = <0xef600900 0x000000c4>;
                                 local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <0>;
                                 has-inverted-stacr-oc;
@@ -237,23 +239,23 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex";
                         primary;
-                        port = <0>; /* port number */
-                        reg = <a0000000 20000000        /* Config space access */
-                               ef000000 00001000>;      /* Registers */
-                        dcr-reg = <040 020>;
-                        sdr-base = <400>;
+                        port = <0x0>; /* port number */
+                        reg = <0xa0000000 0x20000000    /* Config space access */
+                               0xef000000 0x00001000>;  /* Registers */
+                        dcr-reg = <0x040 0x020>;
+                        sdr-base = <0x400>;
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 90000000 0 08000000
-                                  01000000 0 00000000 e0000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x90000000 0x00000000 0x08000000
+                                  0x01000000 0x00000000 0x00000000 0xe0000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 0x00 to 0x3f */
-                        bus-range = <00 3f>;
+                        bus-range = <0x0 0x3f>;
 
                         /* Legacy interrupts (note the weird polarity, the bridge seems
                          * to invert PCIe legacy interrupts).
@@ -263,12 +265,12 @@
                          * below are basically de-swizzled numbers.
                          * The real slot is on idsel 0, so the swizzling is 1:1
                          */
-                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                         interrupt-map = <
-                                0000 0 0 1 &UIC2 0 4 /* swizzled int A */
-                                0000 0 0 2 &UIC2 1 4 /* swizzled int B */
-                                0000 0 0 3 &UIC2 2 4 /* swizzled int C */
-                                0000 0 0 4 &UIC2 3 4 /* swizzled int D */>;
+                                0x0 0x0 0x0 0x1 &UIC2 0x0 0x4 /* swizzled int A */
+                                0x0 0x0 0x0 0x2 &UIC2 0x1 0x4 /* swizzled int B */
+                                0x0 0x0 0x0 0x3 &UIC2 0x2 0x4 /* swizzled int C */
+                                0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>;
                 };
         };
 };
diff --git a/arch/powerpc/boot/dts/holly.dts b/arch/powerpc/boot/dts/holly.dts
index b5d87895fe06..f87fe7b9ced9 100644
--- a/arch/powerpc/boot/dts/holly.dts
+++ b/arch/powerpc/boot/dts/holly.dts
@@ -10,6 +10,8 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         model = "41K7339";
         compatible = "ibm,holly";
@@ -21,22 +23,22 @@
                 #size-cells =<0>;
                 PowerPC,750CL@0 {
                         device_type = "cpu";
-                        reg = <0>;
-                        d-cache-line-size = <20>;
-                        i-cache-line-size = <20>;
-                        d-cache-size = <8000>;
-                        i-cache-size = <8000>;
-                        d-cache-sets = <80>;
-                        i-cache-sets = <80>;
-                        timebase-frequency = <2faf080>;
-                        clock-frequency = <23c34600>;
-                        bus-frequency = <bebc200>;
+                        reg = <0x00000000>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <32768>;
+                        i-cache-size = <32768>;
+                        d-cache-sets = <128>;
+                        i-cache-sets = <128>;
+                        timebase-frequency = <50000000>;
+                        clock-frequency = <600000000>;
+                        bus-frequency = <200000000>;
                 };
         };
 
         memory@0 {
                 device_type = "memory";
-                reg = <00000000 20000000>;
+                reg = <0x00000000 0x20000000>;
         };
 
         tsi109@c0000000 {
@@ -44,33 +46,33 @@
                 compatible = "tsi109-bridge", "tsi108-bridge";
                 #address-cells = <1>;
                 #size-cells = <1>;
-                ranges = <00000000 c0000000 00010000>;
-                reg = <c0000000 00010000>;
+                ranges = <0x00000000 0xc0000000 0x00010000>;
+                reg = <0xc0000000 0x00010000>;
 
                 i2c@7000 {
                         device_type = "i2c";
                         compatible  = "tsi109-i2c", "tsi108-i2c";
                         interrupt-parent = <&MPIC>;
-                        interrupts = <e 2>;
-                        reg = <7000 400>;
+                        interrupts = <0xe 0x2>;
+                        reg = <0x00007000 0x00000400>;
                 };
 
                 MDIO: mdio@6000 {
                         device_type = "mdio";
                         compatible = "tsi109-mdio", "tsi108-mdio";
-                        reg = <6000 50>;
+                        reg = <0x00006000 0x00000050>;
                         #address-cells = <1>;
                         #size-cells = <0>;
 
                         PHY1: ethernet-phy@1 {
                                 compatible = "bcm5461a";
-                                reg = <1>;
+                                reg = <0x00000001>;
                                 txc-rxc-delay-disable;
                         };
 
                         PHY2: ethernet-phy@2 {
                                 compatible = "bcm5461a";
-                                reg = <2>;
+                                reg = <0x00000002>;
                                 txc-rxc-delay-disable;
                         };
                 };
@@ -80,10 +82,10 @@
                         compatible = "tsi109-ethernet", "tsi108-ethernet";
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        reg = <6000 200>;
+                        reg = <0x00006000 0x00000200>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupt-parent = <&MPIC>;
-                        interrupts = <10 2>;
+                        interrupts = <0x10 0x2>;
                         mdio-handle = <&MDIO>;
                         phy-handle = <&PHY1>;
                 };
@@ -93,10 +95,10 @@
                         compatible = "tsi109-ethernet", "tsi108-ethernet";
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        reg = <6400 200>;
+                        reg = <0x00006400 0x00000200>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupt-parent = <&MPIC>;
-                        interrupts = <11 2>;
+                        interrupts = <0x11 0x2>;
                         mdio-handle = <&MDIO>;
                         phy-handle = <&PHY2>;
                 };
@@ -104,23 +106,23 @@
                 serial@7808 {
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <7808 200>;
-                        virtual-reg = <c0007808>;
-                        clock-frequency = <3F9C6000>;
-                        current-speed = <1c200>;
+                        reg = <0x00007808 0x00000200>;
+                        virtual-reg = <0xc0007808>;
+                        clock-frequency = <1067212800>;
+                        current-speed = <115200>;
                         interrupt-parent = <&MPIC>;
-                        interrupts = <c 2>;
+                        interrupts = <0xc 0x2>;
                 };
 
                 serial@7c08 {
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <7c08 200>;
-                        virtual-reg = <c0007c08>;
-                        clock-frequency = <3F9C6000>;
-                        current-speed = <1c200>;
+                        reg = <0x00007c08 0x00000200>;
+                        virtual-reg = <0xc0007c08>;
+                        clock-frequency = <1067212800>;
+                        current-speed = <115200>;
                         interrupt-parent = <&MPIC>;
-                        interrupts = <d 2>;
+                        interrupts = <0xd 0x2>;
                 };
 
                 MPIC: pic@7400 {
@@ -128,7 +130,7 @@
                         compatible = "chrp,open-pic";
                         interrupt-controller;
                         #interrupt-cells = <2>;
-                        reg = <7400 400>;
+                        reg = <0x00007400 0x00000400>;
                         big-endian;
                 };
 
@@ -138,42 +140,42 @@
                         #interrupt-cells = <1>;
                         #size-cells = <2>;
                         #address-cells = <3>;
-                        reg = <1000 1000>;
-                        bus-range = <0 0>;
+                        reg = <0x00001000 0x00001000>;
+                        bus-range = <0x0 0x0>;
                         /*----------------------------------------------------+
                         | PCI memory range.
                         | 01 denotes I/O space
                         | 02 denotes 32-bit memory space
                         +----------------------------------------------------*/
-                        ranges = <02000000 0 40000000 40000000 0 10000000
-                                  01000000 0 00000000 7e000000 0 00010000>;
-                        clock-frequency = <7f28154>;
+                        ranges = <0x02000000 0x00000000 0x40000000 0x40000000 0x00000000 0x10000000
+                                  0x01000000 0x00000000 0x00000000 0x7e000000 0x00000000 0x00010000>;
+                        clock-frequency = <133333332>;
                         interrupt-parent = <&MPIC>;
-                        interrupts = <17 2>;
-                        interrupt-map-mask = <f800 0 0 7>;
+                        interrupts = <0x17 0x2>;
+                        interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                         /*----------------------------------------------------+
                         | The INTA, INTB, INTC, INTD are shared.
                         +----------------------------------------------------*/
                         interrupt-map = <
-                                0800 0 0 1 &RT0 24 0
-                                0800 0 0 2 &RT0 25 0
-                                0800 0 0 3 &RT0 26 0
-                                0800 0 0 4 &RT0 27 0
-
-                                1000 0 0 1 &RT0 25 0
-                                1000 0 0 2 &RT0 26 0
-                                1000 0 0 3 &RT0 27 0
-                                1000 0 0 4 &RT0 24 0
-
-                                1800 0 0 1 &RT0 26 0
-                                1800 0 0 2 &RT0 27 0
-                                1800 0 0 3 &RT0 24 0
-                                1800 0 0 4 &RT0 25 0
-
-                                2000 0 0 1 &RT0 27 0
-                                2000 0 0 2 &RT0 24 0
-                                2000 0 0 3 &RT0 25 0
-                                2000 0 0 4 &RT0 26 0
+                                0x800 0x0 0x0 0x1 &RT0 0x24 0x0
+                                0x800 0x0 0x0 0x2 &RT0 0x25 0x0
+                                0x800 0x0 0x0 0x3 &RT0 0x26 0x0
+                                0x800 0x0 0x0 0x4 &RT0 0x27 0x0
+
+                                0x1000 0x0 0x0 0x1 &RT0 0x25 0x0
+                                0x1000 0x0 0x0 0x2 &RT0 0x26 0x0
+                                0x1000 0x0 0x0 0x3 &RT0 0x27 0x0
+                                0x1000 0x0 0x0 0x4 &RT0 0x24 0x0
+
+                                0x1800 0x0 0x0 0x1 &RT0 0x26 0x0
+                                0x1800 0x0 0x0 0x2 &RT0 0x27 0x0
+                                0x1800 0x0 0x0 0x3 &RT0 0x24 0x0
+                                0x1800 0x0 0x0 0x4 &RT0 0x25 0x0
+
+                                0x2000 0x0 0x0 0x1 &RT0 0x27 0x0
+                                0x2000 0x0 0x0 0x2 &RT0 0x24 0x0
+                                0x2000 0x0 0x0 0x3 &RT0 0x25 0x0
+                                0x2000 0x0 0x0 0x4 &RT0 0x26 0x0
                                 >;
 
                         RT0: router@1180 {
@@ -183,7 +185,7 @@
                                 clock-frequency = <0>;
                                 #address-cells = <0>;
                                 #interrupt-cells = <2>;
-                                interrupts = <17 2>;
+                                interrupts = <0x17 0x2>;
                                 interrupt-parent = <&MPIC>;
                         };
                 };
diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts
index cc2873a531d2..077819bc3cbd 100644
--- a/arch/powerpc/boot/dts/katmai.dts
+++ b/arch/powerpc/boot/dts/katmai.dts
@@ -12,12 +12,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,katmai";
         compatible = "amcc,katmai";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC0;
@@ -33,13 +35,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,440SPe";
-                        reg = <0>;
+                        reg = <0x00000000>;
                         clock-frequency = <0>; /* Filled in by zImage */
                         timebase-frequency = <0>; /* Filled in by zImage */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <8000>;
-                        d-cache-size = <8000>;
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <32768>;
+                        d-cache-size = <32768>;
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -47,14 +49,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0 0>; /* Filled in by zImage */
+                reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */
         };
 
         UIC0: interrupt-controller0 {
                 compatible = "ibm,uic-440spe","ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -64,11 +66,11 @@
                 compatible = "ibm,uic-440spe","ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -76,11 +78,11 @@
                 compatible = "ibm,uic-440spe","ibm,uic";
                 interrupt-controller;
                 cell-index = <2>;
-                dcr-reg = <0e0 009>;
+                dcr-reg = <0x0e0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <a 4 b 4>; /* cascade */
+                interrupts = <0xa 0x4 0xb 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -88,22 +90,22 @@
                 compatible = "ibm,uic-440spe","ibm,uic";
                 interrupt-controller;
                 cell-index = <3>;
-                dcr-reg = <0f0 009>;
+                dcr-reg = <0x0f0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <10 4 11 4>; /* cascade */
+                interrupts = <0x10 0x4 0x11 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
         SDR0: sdr {
                 compatible = "ibm,sdr-440spe";
-                dcr-reg = <00e 002>;
+                dcr-reg = <0x00e 0x002>;
         };
 
         CPR0: cpr {
                 compatible = "ibm,cpr-440spe";
-                dcr-reg = <00c 002>;
+                dcr-reg = <0x00c 0x002>;
         };
 
         plb {
@@ -115,108 +117,108 @@
 
                 SDRAM0: sdram {
                         compatible = "ibm,sdram-440spe", "ibm,sdram-405gp";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-440spe", "ibm,mcmal2";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <2>;
                         num-rx-chans = <1>;
                         interrupt-parent = <&MAL0>;
-                        interrupts = <0 1 2 3 4>;
+                        interrupts = <0x0 0x1 0x2 0x3 0x4>;
                         #interrupt-cells = <1>;
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        interrupt-map = </*TXEOB*/ 0 &UIC1 6 4
-                                         /*RXEOB*/ 1 &UIC1 7 4
-                                         /*SERR*/  2 &UIC1 1 4
-                                         /*TXDE*/  3 &UIC1 2 4
-                                         /*RXDE*/  4 &UIC1 3 4>;
+                        interrupt-map = </*TXEOB*/ 0x0 &UIC1 0x6 0x4
+                                         /*RXEOB*/ 0x1 &UIC1 0x7 0x4
+                                         /*SERR*/  0x2 &UIC1 0x1 0x4
+                                         /*TXDE*/  0x3 &UIC1 0x2 0x4
+                                         /*RXDE*/  0x4 &UIC1 0x3 0x4>;
                 };
 
                 POB0: opb {
                         compatible = "ibm,opb-440spe", "ibm,opb-440gp", "ibm,opb";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges = <00000000 4 e0000000 20000000>;
+                        ranges = <0x00000000 0x00000004 0xe0000000 0x20000000>;
                         clock-frequency = <0>; /* Filled in by zImage */
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-440spe", "ibm,ebc-440gp", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                interrupts = <5 1>;
+                                interrupts = <0x5 0x1>;
                                 interrupt-parent = <&UIC1>;
                         };
 
                         UART0: serial@10000200 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <10000200 8>;
-                                virtual-reg = <a0000200>;
+                                reg = <0x10000200 0x00000008>;
+                                virtual-reg = <0xa0000200>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                current-speed = <1c200>;
+                                current-speed = <115200>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <0 4>;
+                                interrupts = <0x0 0x4>;
                         };
 
                         UART1: serial@10000300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <10000300 8>;
-                                virtual-reg = <a0000300>;
+                                reg = <0x10000300 0x00000008>;
+                                virtual-reg = <0xa0000300>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
 
                         UART2: serial@10000600 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <10000600 8>;
-                                virtual-reg = <a0000600>;
+                                reg = <0x10000600 0x00000008>;
+                                virtual-reg = <0xa0000600>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <5 4>;
+                                interrupts = <0x5 0x4>;
                         };
 
                         IIC0: i2c@10000400 {
                                 compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic";
-                                reg = <10000400 14>;
+                                reg = <0x10000400 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
 
                         IIC1: i2c@10000500 {
                                 compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic";
-                                reg = <10000500 14>;
+                                reg = <0x10000500 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <3 4>;
+                                interrupts = <0x3 0x4>;
                         };
 
                         EMAC0: ethernet@10000800 {
-                                linux,network-index = <0>;
+                                linux,network-index = <0x0>;
                                 device_type = "network";
                                 compatible = "ibm,emac-440spe", "ibm,emac4";
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1c 4 1d 4>;
-                                reg = <10000800 70>;
+                                interrupts = <0x1c 0x4 0x1d 0x4>;
+                                reg = <0x10000800 0x00000074>;
                                 local-mac-address = [000000000000];
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "gmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 has-inverted-stacr-oc;
                                 has-new-stacr-staopc;
                         };
@@ -231,23 +233,23 @@
                         primary;
                         large-inbound-windows;
                         enable-msi-hole;
-                        reg = <c 0ec00000   8   /* Config space access */
-                               0 0 0            /* no IACK cycles */
-                               c 0ed00000   4   /* Special cycles */
-                               c 0ec80000 100   /* Internal registers */
-                               c 0ec80100  fc>; /* Internal messaging registers */
+                        reg = <0x0000000c 0x0ec00000   0x00000008       /* Config space access */
+                               0x00000000 0x00000000 0x00000000         /* no IACK cycles */
+                               0x0000000c 0x0ed00000   0x00000004   /* Special cycles */
+                               0x0000000c 0x0ec80000 0x00000100 /* Internal registers */
+                               0x0000000c 0x0ec80100  0x000000fc>;      /* Internal messaging registers */
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 0000000d 80000000 0 80000000
-                                  01000000 0 00000000 0000000c 08000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x0000000d 0x80000000 0x00000000 0x80000000
+                                  0x01000000 0x00000000 0x00000000 0x0000000c 0x08000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 0 to 0xf */
-                        bus-range = <0 f>;
+                        bus-range = <0x0 0xf>;
 
                         /*
                          * On Katmai, the following PCI-X interrupts signals
@@ -258,13 +260,13 @@
                          * INTC: J2: 1-2
                          * INTD: J1: 1-2
                          */
-                        interrupt-map-mask = <f800 0 0 7>;
+                        interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                         interrupt-map = <
                                 /* IDSEL 1 */
-                                0800 0 0 1 &UIC1 14 8
-                                0800 0 0 2 &UIC1 13 8
-                                0800 0 0 3 &UIC1 12 8
-                                0800 0 0 4 &UIC1 11 8
+                                0x800 0x0 0x0 0x1 &UIC1 0x14 0x8
+                                0x800 0x0 0x0 0x2 &UIC1 0x13 0x8
+                                0x800 0x0 0x0 0x3 &UIC1 0x12 0x8
+                                0x800 0x0 0x0 0x4 &UIC1 0x11 0x8
                         >;
                 };
 
@@ -275,23 +277,23 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb-pciex-440spe", "ibm,plb-pciex";
                         primary;
-                        port = <0>; /* port number */
-                        reg = <d 00000000 20000000      /* Config space access */
-                               c 10000000 00001000>;    /* Registers */
-                        dcr-reg = <100 020>;
-                        sdr-base = <300>;
+                        port = <0x0>; /* port number */
+                        reg = <0x0000000d 0x00000000 0x20000000 /* Config space access */
+                               0x0000000c 0x10000000 0x00001000>;       /* Registers */
+                        dcr-reg = <0x100 0x020>;
+                        sdr-base = <0x300>;
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 0000000e 00000000 0 80000000
-                                  01000000 0 00000000 0000000f 80000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x00000000 0x00000000 0x80000000
+                                  0x01000000 0x00000000 0x00000000 0x0000000f 0x80000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 10 to 0x1f */
-                        bus-range = <10 1f>;
+                        bus-range = <0x10 0x1f>;
 
                         /* Legacy interrupts (note the weird polarity, the bridge seems
                          * to invert PCIe legacy interrupts).
@@ -301,12 +303,12 @@
                          * below are basically de-swizzled numbers.
                          * The real slot is on idsel 0, so the swizzling is 1:1
                          */
-                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                         interrupt-map = <
-                                0000 0 0 1 &UIC3 0 4 /* swizzled int A */
-                                0000 0 0 2 &UIC3 1 4 /* swizzled int B */
-                                0000 0 0 3 &UIC3 2 4 /* swizzled int C */
-                                0000 0 0 4 &UIC3 3 4 /* swizzled int D */>;
+                                0x0 0x0 0x0 0x1 &UIC3 0x0 0x4 /* swizzled int A */
+                                0x0 0x0 0x0 0x2 &UIC3 0x1 0x4 /* swizzled int B */
+                                0x0 0x0 0x0 0x3 &UIC3 0x2 0x4 /* swizzled int C */
+                                0x0 0x0 0x0 0x4 &UIC3 0x3 0x4 /* swizzled int D */>;
                 };
 
                 PCIE1: pciex@d20000000 {
@@ -316,23 +318,23 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb-pciex-440spe", "ibm,plb-pciex";
                         primary;
-                        port = <1>; /* port number */
-                        reg = <d 20000000 20000000      /* Config space access */
-                               c 10001000 00001000>;    /* Registers */
-                        dcr-reg = <120 020>;
-                        sdr-base = <340>;
+                        port = <0x1>; /* port number */
+                        reg = <0x0000000d 0x20000000 0x20000000 /* Config space access */
+                               0x0000000c 0x10001000 0x00001000>;       /* Registers */
+                        dcr-reg = <0x120 0x020>;
+                        sdr-base = <0x340>;
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 0000000e 80000000 0 80000000
-                                  01000000 0 00000000 0000000f 80010000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 0x80000000 0x00000000 0x80000000
+                                  0x01000000 0x00000000 0x00000000 0x0000000f 0x80010000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 10 to 0x1f */
-                        bus-range = <20 2f>;
+                        bus-range = <0x20 0x2f>;
 
                         /* Legacy interrupts (note the weird polarity, the bridge seems
                          * to invert PCIe legacy interrupts).
@@ -342,12 +344,12 @@
                          * below are basically de-swizzled numbers.
                          * The real slot is on idsel 0, so the swizzling is 1:1
                          */
-                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                         interrupt-map = <
-                                0000 0 0 1 &UIC3 4 4 /* swizzled int A */
-                                0000 0 0 2 &UIC3 5 4 /* swizzled int B */
-                                0000 0 0 3 &UIC3 6 4 /* swizzled int C */
-                                0000 0 0 4 &UIC3 7 4 /* swizzled int D */>;
+                                0x0 0x0 0x0 0x1 &UIC3 0x4 0x4 /* swizzled int A */
+                                0x0 0x0 0x0 0x2 &UIC3 0x5 0x4 /* swizzled int B */
+                                0x0 0x0 0x0 0x3 &UIC3 0x6 0x4 /* swizzled int C */
+                                0x0 0x0 0x0 0x4 &UIC3 0x7 0x4 /* swizzled int D */>;
                 };
 
                 PCIE2: pciex@d40000000 {
@@ -357,23 +359,23 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb-pciex-440spe", "ibm,plb-pciex";
                         primary;
-                        port = <2>; /* port number */
-                        reg = <d 40000000 20000000      /* Config space access */
-                               c 10002000 00001000>;    /* Registers */
-                        dcr-reg = <140 020>;
-                        sdr-base = <370>;
+                        port = <0x2>; /* port number */
+                        reg = <0x0000000d 0x40000000 0x20000000 /* Config space access */
+                               0x0000000c 0x10002000 0x00001000>;       /* Registers */
+                        dcr-reg = <0x140 0x020>;
+                        sdr-base = <0x370>;
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 0000000f 00000000 0 80000000
-                                  01000000 0 00000000 0000000f 80020000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x0000000f 0x00000000 0x00000000 0x80000000
+                                  0x01000000 0x00000000 0x00000000 0x0000000f 0x80020000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 10 to 0x1f */
-                        bus-range = <30 3f>;
+                        bus-range = <0x30 0x3f>;
 
                         /* Legacy interrupts (note the weird polarity, the bridge seems
                          * to invert PCIe legacy interrupts).
@@ -383,12 +385,12 @@
                          * below are basically de-swizzled numbers.
                          * The real slot is on idsel 0, so the swizzling is 1:1
                          */
-                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                         interrupt-map = <
-                                0000 0 0 1 &UIC3 8 4 /* swizzled int A */
-                                0000 0 0 2 &UIC3 9 4 /* swizzled int B */
-                                0000 0 0 3 &UIC3 a 4 /* swizzled int C */
-                                0000 0 0 4 &UIC3 b 4 /* swizzled int D */>;
+                                0x0 0x0 0x0 0x1 &UIC3 0x8 0x4 /* swizzled int A */
+                                0x0 0x0 0x0 0x2 &UIC3 0x9 0x4 /* swizzled int B */
+                                0x0 0x0 0x0 0x3 &UIC3 0xa 0x4 /* swizzled int C */
+                                0x0 0x0 0x0 0x4 &UIC3 0xb 0x4 /* swizzled int D */>;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index 48c9a6e71f1a..dececc4b5ff2 100644
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -8,12 +8,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <1>;
         #size-cells = <1>;
         model = "amcc,kilauea";
         compatible = "amcc,kilauea";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC0;
@@ -29,13 +31,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,405EX";
-                        reg = <0>;
+                        reg = <0x00000000>;
                         clock-frequency = <0>; /* Filled in by U-Boot */
                         timebase-frequency = <0>; /* Filled in by U-Boot */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <4000>; /* 16 kB */
-                        d-cache-size = <4000>; /* 16 kB */
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <16384>; /* 16 kB */
+                        d-cache-size = <16384>; /* 16 kB */
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -43,14 +45,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0>; /* Filled in by U-Boot */
+                reg = <0x00000000 0x00000000>; /* Filled in by U-Boot */
         };
 
         UIC0: interrupt-controller {
                 compatible = "ibm,uic-405ex", "ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -60,11 +62,11 @@
                 compatible = "ibm,uic-405ex","ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -72,11 +74,11 @@
                 compatible = "ibm,uic-405ex","ibm,uic";
                 interrupt-controller;
                 cell-index = <2>;
-                dcr-reg = <0e0 009>;
+                dcr-reg = <0x0e0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1c 4 1d 4>; /* cascade */
+                interrupts = <0x1c 0x4 0x1d 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -89,72 +91,72 @@
 
                 SDRAM0: memory-controller {
                         compatible = "ibm,sdram-405ex";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-405ex", "ibm,mcmal2";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <2>;
                         num-rx-chans = <2>;
                         interrupt-parent = <&MAL0>;
-                        interrupts = <0 1 2 3 4>;
+                        interrupts = <0x0 0x1 0x2 0x3 0x4>;
                         #interrupt-cells = <1>;
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-                                        /*RXEOB*/ 1 &UIC0 b 4
-                                        /*SERR*/  2 &UIC1 0 4
-                                        /*TXDE*/  3 &UIC1 1 4
-                                        /*RXDE*/  4 &UIC1 2 4>;
-                        interrupt-map-mask = <ffffffff>;
+                        interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4
+                                        /*RXEOB*/ 0x1 &UIC0 0xb 0x4
+                                        /*SERR*/  0x2 &UIC1 0x0 0x4
+                                        /*TXDE*/  0x3 &UIC1 0x1 0x4
+                                        /*RXDE*/  0x4 &UIC1 0x2 0x4>;
+                        interrupt-map-mask = <0xffffffff>;
                 };
 
                 POB0: opb {
                         compatible = "ibm,opb-405ex", "ibm,opb";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges = <80000000 80000000 10000000
-                                  ef600000 ef600000 a00000
-                                  f0000000 f0000000 10000000>;
-                        dcr-reg = <0a0 5>;
+                        ranges = <0x80000000 0x80000000 0x10000000
+                                  0xef600000 0xef600000 0x00a00000
+                                  0xf0000000 0xf0000000 0x10000000>;
+                        dcr-reg = <0x0a0 0x005>;
                         clock-frequency = <0>; /* Filled in by U-Boot */
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-405ex", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 /* ranges property is supplied by U-Boot */
-                                interrupts = <5 1>;
+                                interrupts = <0x5 0x1>;
                                 interrupt-parent = <&UIC1>;
 
                                 nor_flash@0,0 {
                                         compatible = "amd,s29gl512n", "cfi-flash";
                                         bank-width = <2>;
-                                        reg = <0 000000 4000000>;
+                                        reg = <0x00000000 0x00000000 0x04000000>;
                                         #address-cells = <1>;
                                         #size-cells = <1>;
                                         partition@0 {
                                                 label = "kernel";
-                                                reg = <0 200000>;
+                                                reg = <0x00000000 0x00200000>;
                                         };
                                         partition@200000 {
                                                 label = "root";
-                                                reg = <200000 200000>;
+                                                reg = <0x00200000 0x00200000>;
                                         };
                                         partition@400000 {
                                                 label = "user";
-                                                reg = <400000 3b60000>;
+                                                reg = <0x00400000 0x03b60000>;
                                         };
                                         partition@3f60000 {
                                                 label = "env";
-                                                reg = <3f60000 40000>;
+                                                reg = <0x03f60000 0x00040000>;
                                         };
                                         partition@3fa0000 {
                                                 label = "u-boot";
-                                                reg = <3fa0000 60000>;
+                                                reg = <0x03fa0000 0x00060000>;
                                         };
                                 };
                         };
@@ -162,68 +164,68 @@
                         UART0: serial@ef600200 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600200 8>;
-                                virtual-reg = <ef600200>;
+                                reg = <0xef600200 0x00000008>;
+                                virtual-reg = <0xef600200>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1a 4>;
+                                interrupts = <0x1a 0x4>;
                         };
 
                         UART1: serial@ef600300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600300 8>;
-                                virtual-reg = <ef600300>;
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         IIC0: i2c@ef600400 {
                                 compatible = "ibm,iic-405ex", "ibm,iic";
-                                reg = <ef600400 14>;
+                                reg = <0xef600400 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
 
                         IIC1: i2c@ef600500 {
                                 compatible = "ibm,iic-405ex", "ibm,iic";
-                                reg = <ef600500 14>;
+                                reg = <0xef600500 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <7 4>;
+                                interrupts = <0x7 0x4>;
                         };
 
 
                         RGMII0: emac-rgmii@ef600b00 {
                                 compatible = "ibm,rgmii-405ex", "ibm,rgmii";
-                                reg = <ef600b00 104>;
+                                reg = <0xef600b00 0x00000104>;
                                 has-mdio;
                         };
 
                         EMAC0: ethernet@ef600900 {
-                                linux,network-index = <0>;
+                                linux,network-index = <0x0>;
                                 device_type = "network";
-                                compatible = "ibm,emac-405ex", "ibm,emac4";
+                                compatible = "ibm,emac-405ex", "ibm,emac4sync";
                                 interrupt-parent = <&EMAC0>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC0 18 4
-                                                /*Wake*/  1 &UIC1 1d 4>;
-                                reg = <ef600900 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4
+                                                /*Wake*/  0x1 &UIC1 0x1d 0x4>;
+                                reg = <0xef600900 0x000000c4>;
                                 local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <0>;
                                 has-inverted-stacr-oc;
@@ -231,27 +233,27 @@
                         };
 
                         EMAC1: ethernet@ef600a00 {
-                                linux,network-index = <1>;
+                                linux,network-index = <0x1>;
                                 device_type = "network";
-                                compatible = "ibm,emac-405ex", "ibm,emac4";
+                                compatible = "ibm,emac-405ex", "ibm,emac4sync";
                                 interrupt-parent = <&EMAC1>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC0 19 4
-                                                /*Wake*/  1 &UIC1 1f 4>;
-                                reg = <ef600a00 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4
+                                                /*Wake*/  0x1 &UIC1 0x1f 0x4>;
+                                reg = <0xef600a00 0x000000c4>;
                                 local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <1>;
                                 mal-rx-channel = <1>;
                                 cell-index = <1>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <1>;
                                 has-inverted-stacr-oc;
@@ -266,23 +268,23 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex";
                         primary;
-                        port = <0>; /* port number */
-                        reg = <a0000000 20000000        /* Config space access */
-                               ef000000 00001000>;      /* Registers */
-                        dcr-reg = <040 020>;
-                        sdr-base = <400>;
+                        port = <0x0>; /* port number */
+                        reg = <0xa0000000 0x20000000    /* Config space access */
+                               0xef000000 0x00001000>;  /* Registers */
+                        dcr-reg = <0x040 0x020>;
+                        sdr-base = <0x400>;
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 90000000 0 08000000
-                                  01000000 0 00000000 e0000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x90000000 0x00000000 0x08000000
+                                  0x01000000 0x00000000 0x00000000 0xe0000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 0x00 to 0x3f */
-                        bus-range = <00 3f>;
+                        bus-range = <0x0 0x3f>;
 
                         /* Legacy interrupts (note the weird polarity, the bridge seems
                          * to invert PCIe legacy interrupts).
@@ -292,12 +294,12 @@
                          * below are basically de-swizzled numbers.
                          * The real slot is on idsel 0, so the swizzling is 1:1
                          */
-                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                         interrupt-map = <
-                                0000 0 0 1 &UIC2 0 4 /* swizzled int A */
-                                0000 0 0 2 &UIC2 1 4 /* swizzled int B */
-                                0000 0 0 3 &UIC2 2 4 /* swizzled int C */
-                                0000 0 0 4 &UIC2 3 4 /* swizzled int D */>;
+                                0x0 0x0 0x0 0x1 &UIC2 0x0 0x4 /* swizzled int A */
+                                0x0 0x0 0x0 0x2 &UIC2 0x1 0x4 /* swizzled int B */
+                                0x0 0x0 0x0 0x3 &UIC2 0x2 0x4 /* swizzled int C */
+                                0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>;
                 };
 
                 PCIE1: pciex@0c0000000 {
@@ -307,23 +309,23 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex";
                         primary;
-                        port = <1>; /* port number */
-                        reg = <c0000000 20000000        /* Config space access */
-                               ef001000 00001000>;      /* Registers */
-                        dcr-reg = <060 020>;
-                        sdr-base = <440>;
+                        port = <0x1>; /* port number */
+                        reg = <0xc0000000 0x20000000    /* Config space access */
+                               0xef001000 0x00001000>;  /* Registers */
+                        dcr-reg = <0x060 0x020>;
+                        sdr-base = <0x440>;
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 98000000 0 08000000
-                                  01000000 0 00000000 e0010000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x98000000 0x00000000 0x08000000
+                                  0x01000000 0x00000000 0x00000000 0xe0010000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 0x40 to 0x7f */
-                        bus-range = <40 7f>;
+                        bus-range = <0x40 0x7f>;
 
                         /* Legacy interrupts (note the weird polarity, the bridge seems
                          * to invert PCIe legacy interrupts).
@@ -333,12 +335,12 @@
                          * below are basically de-swizzled numbers.
                          * The real slot is on idsel 0, so the swizzling is 1:1
                          */
-                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                         interrupt-map = <
-                                0000 0 0 1 &UIC2 b 4 /* swizzled int A */
-                                0000 0 0 2 &UIC2 c 4 /* swizzled int B */
-                                0000 0 0 3 &UIC2 d 4 /* swizzled int C */
-                                0000 0 0 4 &UIC2 e 4 /* swizzled int D */>;
+                                0x0 0x0 0x0 0x1 &UIC2 0xb 0x4 /* swizzled int A */
+                                0x0 0x0 0x0 0x2 &UIC2 0xc 0x4 /* swizzled int B */
+                                0x0 0x0 0x0 0x3 &UIC2 0xd 0x4 /* swizzled int C */
+                                0x0 0x0 0x0 0x4 &UIC2 0xe 0x4 /* swizzled int D */>;
                 };
         };
 };
diff --git a/arch/powerpc/boot/dts/ksi8560.dts b/arch/powerpc/boot/dts/ksi8560.dts
index f869ce3ca0b7..49737589ffc8 100644
--- a/arch/powerpc/boot/dts/ksi8560.dts
+++ b/arch/powerpc/boot/dts/ksi8560.dts
@@ -40,6 +40,7 @@
                         timebase-frequency = <0>;               /* From U-boot */
                         bus-frequency = <0>;                    /* From U-boot */
                         clock-frequency = <0>;                  /* From U-boot */
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -58,16 +59,16 @@
                 memory-controller@2000 {
                         compatible = "fsl,8540-memory-controller";
                         reg = <0x2000 0x1000>;
-                        interrupt-parent = <&MPIC>;
+                        interrupt-parent = <&mpic>;
                         interrupts = <0x12 0x2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8540-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <0x20>;               /* 32 bytes */
                         cache-size = <0x40000>;                 /* L2, 256K */
-                        interrupt-parent = <&MPIC>;
+                        interrupt-parent = <&mpic>;
                         interrupts = <0x10 0x2>;
                 };
 
@@ -78,10 +79,51 @@
                         compatible = "fsl-i2c";
                         reg = <0x3000 0x100>;
                         interrupts = <0x2b 0x2>;
-                        interrupt-parent = <&MPIC>;
+                        interrupt-parent = <&mpic>;
                         dfsrr;
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8560-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {                                    /* For TSECs */
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -89,13 +131,13 @@
                         reg = <0x24520 0x20>;
 
                         PHY1: ethernet-phy@1 {
-                                interrupt-parent = <&MPIC>;
+                                interrupt-parent = <&mpic>;
                                 reg = <0x1>;
                                 device_type = "ethernet-phy";
                         };
 
                         PHY2: ethernet-phy@2 {
-                                interrupt-parent = <&MPIC>;
+                                interrupt-parent = <&mpic>;
                                 reg = <0x2>;
                                 device_type = "ethernet-phy";
                         };
@@ -109,7 +151,7 @@
                         /* Mac address filled in by bootwrapper */
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
-                        interrupt-parent = <&MPIC>;
+                        interrupt-parent = <&mpic>;
                         phy-handle = <&PHY1>;
                 };
 
@@ -121,11 +163,11 @@
                         /* Mac address filled in by bootwrapper */
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
-                        interrupt-parent = <&MPIC>;
+                        interrupt-parent = <&mpic>;
                         phy-handle = <&PHY2>;
                 };
 
-                MPIC: pic@40000 {
+                mpic: pic@40000 {
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         interrupt-controller;
@@ -164,7 +206,7 @@
                                 #interrupt-cells = <2>;
                                 interrupt-controller;
                                 interrupts = <0x2e 0x2>;
-                                interrupt-parent = <&MPIC>;
+                                interrupt-parent = <&mpic>;
                                 reg = <0x90c00 0x80>;
                                 compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
                         };
@@ -202,7 +244,7 @@
                                 fsl,mdc-pin = <25>;
 
                                 PHY0: ethernet-phy@0 {
-                                        interrupt-parent = <&MPIC>;
+                                        interrupt-parent = <&mpic>;
                                         reg = <0x0>;
                                         device_type = "ethernet-phy";
                                 };
diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts
index 84cc5e72ddd8..945508c7e7d8 100644
--- a/arch/powerpc/boot/dts/makalu.dts
+++ b/arch/powerpc/boot/dts/makalu.dts
@@ -8,12 +8,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <1>;
         #size-cells = <1>;
         model = "amcc,makalu";
         compatible = "amcc,makalu";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC0;
@@ -29,13 +31,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,405EX";
-                        reg = <0>;
+                        reg = <0x00000000>;
                         clock-frequency = <0>; /* Filled in by U-Boot */
                         timebase-frequency = <0>; /* Filled in by U-Boot */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <4000>; /* 16 kB */
-                        d-cache-size = <4000>; /* 16 kB */
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <16384>; /* 16 kB */
+                        d-cache-size = <16384>; /* 16 kB */
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -43,14 +45,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0>; /* Filled in by U-Boot */
+                reg = <0x00000000 0x00000000>; /* Filled in by U-Boot */
         };
 
         UIC0: interrupt-controller {
                 compatible = "ibm,uic-405ex", "ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -60,11 +62,11 @@
                 compatible = "ibm,uic-405ex","ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -72,11 +74,11 @@
                 compatible = "ibm,uic-405ex","ibm,uic";
                 interrupt-controller;
                 cell-index = <2>;
-                dcr-reg = <0e0 009>;
+                dcr-reg = <0x0e0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1c 4 1d 4>; /* cascade */
+                interrupts = <0x1c 0x4 0x1d 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -89,72 +91,72 @@
 
                 SDRAM0: memory-controller {
                         compatible = "ibm,sdram-405ex";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-405ex", "ibm,mcmal2";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <2>;
                         num-rx-chans = <2>;
                         interrupt-parent = <&MAL0>;
-                        interrupts = <0 1 2 3 4>;
+                        interrupts = <0x0 0x1 0x2 0x3 0x4>;
                         #interrupt-cells = <1>;
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-                                        /*RXEOB*/ 1 &UIC0 b 4
-                                        /*SERR*/  2 &UIC1 0 4
-                                        /*TXDE*/  3 &UIC1 1 4
-                                        /*RXDE*/  4 &UIC1 2 4>;
-                        interrupt-map-mask = <ffffffff>;
+                        interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4
+                                        /*RXEOB*/ 0x1 &UIC0 0xb 0x4
+                                        /*SERR*/  0x2 &UIC1 0x0 0x4
+                                        /*TXDE*/  0x3 &UIC1 0x1 0x4
+                                        /*RXDE*/  0x4 &UIC1 0x2 0x4>;
+                        interrupt-map-mask = <0xffffffff>;
                 };
 
                 POB0: opb {
                         compatible = "ibm,opb-405ex", "ibm,opb";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges = <80000000 80000000 10000000
-                                  ef600000 ef600000 a00000
-                                  f0000000 f0000000 10000000>;
-                        dcr-reg = <0a0 5>;
+                        ranges = <0x80000000 0x80000000 0x10000000
+                                  0xef600000 0xef600000 0x00a00000
+                                  0xf0000000 0xf0000000 0x10000000>;
+                        dcr-reg = <0x0a0 0x005>;
                         clock-frequency = <0>; /* Filled in by U-Boot */
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-405ex", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 /* ranges property is supplied by U-Boot */
-                                interrupts = <5 1>;
+                                interrupts = <0x5 0x1>;
                                 interrupt-parent = <&UIC1>;
 
                                 nor_flash@0,0 {
                                         compatible = "amd,s29gl512n", "cfi-flash";
                                         bank-width = <2>;
-                                        reg = <0 000000 4000000>;
+                                        reg = <0x00000000 0x00000000 0x04000000>;
                                         #address-cells = <1>;
                                         #size-cells = <1>;
                                         partition@0 {
                                                 label = "kernel";
-                                                reg = <0 200000>;
+                                                reg = <0x00000000 0x00200000>;
                                         };
                                         partition@200000 {
                                                 label = "root";
-                                                reg = <200000 200000>;
+                                                reg = <0x00200000 0x00200000>;
                                         };
                                         partition@400000 {
                                                 label = "user";
-                                                reg = <400000 3b60000>;
+                                                reg = <0x00400000 0x03b60000>;
                                         };
                                         partition@3f60000 {
                                                 label = "env";
-                                                reg = <3f60000 40000>;
+                                                reg = <0x03f60000 0x00040000>;
                                         };
                                         partition@3fa0000 {
                                                 label = "u-boot";
-                                                reg = <3fa0000 60000>;
+                                                reg = <0x03fa0000 0x00060000>;
                                         };
                                 };
                         };
@@ -162,68 +164,68 @@
                         UART0: serial@ef600200 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600200 8>;
-                                virtual-reg = <ef600200>;
+                                reg = <0xef600200 0x00000008>;
+                                virtual-reg = <0xef600200>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1a 4>;
+                                interrupts = <0x1a 0x4>;
                         };
 
                         UART1: serial@ef600300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600300 8>;
-                                virtual-reg = <ef600300>;
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
                                 clock-frequency = <0>; /* Filled in by U-Boot */
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         IIC0: i2c@ef600400 {
                                 compatible = "ibm,iic-405ex", "ibm,iic";
-                                reg = <ef600400 14>;
+                                reg = <0xef600400 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
 
                         IIC1: i2c@ef600500 {
                                 compatible = "ibm,iic-405ex", "ibm,iic";
-                                reg = <ef600500 14>;
+                                reg = <0xef600500 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <7 4>;
+                                interrupts = <0x7 0x4>;
                         };
 
 
                         RGMII0: emac-rgmii@ef600b00 {
                                 compatible = "ibm,rgmii-405ex", "ibm,rgmii";
-                                reg = <ef600b00 104>;
+                                reg = <0xef600b00 0x00000104>;
                                 has-mdio;
                         };
 
                         EMAC0: ethernet@ef600900 {
-                                linux,network-index = <0>;
+                                linux,network-index = <0x0>;
                                 device_type = "network";
-                                compatible = "ibm,emac-405ex", "ibm,emac4";
+                                compatible = "ibm,emac-405ex", "ibm,emac4sync";
                                 interrupt-parent = <&EMAC0>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC0 18 4
-                                                /*Wake*/  1 &UIC1 1d 4>;
-                                reg = <ef600900 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4
+                                                /*Wake*/  0x1 &UIC1 0x1d 0x4>;
+                                reg = <0xef600900 0x000000c4>;
                                 local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <0000003f>;   /* Start at 6 */
+                                phy-map = <0x0000003f>; /* Start at 6 */
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <0>;
                                 has-inverted-stacr-oc;
@@ -231,27 +233,27 @@
                         };
 
                         EMAC1: ethernet@ef600a00 {
-                                linux,network-index = <1>;
+                                linux,network-index = <0x1>;
                                 device_type = "network";
-                                compatible = "ibm,emac-405ex", "ibm,emac4";
+                                compatible = "ibm,emac-405ex", "ibm,emac4sync";
                                 interrupt-parent = <&EMAC1>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC0 19 4
-                                                /*Wake*/  1 &UIC1 1f 4>;
-                                reg = <ef600a00 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4
+                                                /*Wake*/  0x1 &UIC1 0x1f 0x4>;
+                                reg = <0xef600a00 0x000000c4>;
                                 local-mac-address = [000000000000]; /* Filled in by U-Boot */
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <1>;
                                 mal-rx-channel = <1>;
                                 cell-index = <1>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <1>;
                                 has-inverted-stacr-oc;
@@ -266,23 +268,23 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex";
                         primary;
-                        port = <0>; /* port number */
-                        reg = <a0000000 20000000        /* Config space access */
-                               ef000000 00001000>;      /* Registers */
-                        dcr-reg = <040 020>;
-                        sdr-base = <400>;
+                        port = <0x0>; /* port number */
+                        reg = <0xa0000000 0x20000000    /* Config space access */
+                               0xef000000 0x00001000>;  /* Registers */
+                        dcr-reg = <0x040 0x020>;
+                        sdr-base = <0x400>;
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 90000000 0 08000000
-                                  01000000 0 00000000 e0000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x90000000 0x00000000 0x08000000
+                                  0x01000000 0x00000000 0x00000000 0xe0000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 0x00 to 0x3f */
-                        bus-range = <00 3f>;
+                        bus-range = <0x0 0x3f>;
 
                         /* Legacy interrupts (note the weird polarity, the bridge seems
                          * to invert PCIe legacy interrupts).
@@ -292,12 +294,12 @@
                          * below are basically de-swizzled numbers.
                          * The real slot is on idsel 0, so the swizzling is 1:1
                          */
-                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                         interrupt-map = <
-                                0000 0 0 1 &UIC2 0 4 /* swizzled int A */
-                                0000 0 0 2 &UIC2 1 4 /* swizzled int B */
-                                0000 0 0 3 &UIC2 2 4 /* swizzled int C */
-                                0000 0 0 4 &UIC2 3 4 /* swizzled int D */>;
+                                0x0 0x0 0x0 0x1 &UIC2 0x0 0x4 /* swizzled int A */
+                                0x0 0x0 0x0 0x2 &UIC2 0x1 0x4 /* swizzled int B */
+                                0x0 0x0 0x0 0x3 &UIC2 0x2 0x4 /* swizzled int C */
+                                0x0 0x0 0x0 0x4 &UIC2 0x3 0x4 /* swizzled int D */>;
                 };
 
                 PCIE1: pciex@0c0000000 {
@@ -307,23 +309,23 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb-pciex-405ex", "ibm,plb-pciex";
                         primary;
-                        port = <1>; /* port number */
-                        reg = <c0000000 20000000        /* Config space access */
-                               ef001000 00001000>;      /* Registers */
-                        dcr-reg = <060 020>;
-                        sdr-base = <440>;
+                        port = <0x1>; /* port number */
+                        reg = <0xc0000000 0x20000000    /* Config space access */
+                               0xef001000 0x00001000>;  /* Registers */
+                        dcr-reg = <0x060 0x020>;
+                        sdr-base = <0x440>;
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 98000000 0 08000000
-                                  01000000 0 00000000 e0010000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x98000000 0x00000000 0x08000000
+                                  0x01000000 0x00000000 0x00000000 0xe0010000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* This drives busses 0x40 to 0x7f */
-                        bus-range = <40 7f>;
+                        bus-range = <0x40 0x7f>;
 
                         /* Legacy interrupts (note the weird polarity, the bridge seems
                          * to invert PCIe legacy interrupts).
@@ -333,12 +335,12 @@
                          * below are basically de-swizzled numbers.
                          * The real slot is on idsel 0, so the swizzling is 1:1
                          */
-                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x7>;
                         interrupt-map = <
-                                0000 0 0 1 &UIC2 b 4 /* swizzled int A */
-                                0000 0 0 2 &UIC2 c 4 /* swizzled int B */
-                                0000 0 0 3 &UIC2 d 4 /* swizzled int C */
-                                0000 0 0 4 &UIC2 e 4 /* swizzled int D */>;
+                                0x0 0x0 0x0 0x1 &UIC2 0xb 0x4 /* swizzled int A */
+                                0x0 0x0 0x0 0x2 &UIC2 0xc 0x4 /* swizzled int B */
+                                0x0 0x0 0x0 0x3 &UIC2 0xd 0x4 /* swizzled int C */
+                                0x0 0x0 0x0 0x4 &UIC2 0xe 0x4 /* swizzled int D */>;
                 };
         };
 };
diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
index 94ad7b2b241e..1f9036c317b4 100644
--- a/arch/powerpc/boot/dts/mpc5121ads.dts
+++ b/arch/powerpc/boot/dts/mpc5121ads.dts
@@ -1,7 +1,7 @@
 /*
- * MPC5121E MDS Device Tree Source
+ * MPC5121E ADS Device Tree Source
  *
- * Copyright 2007 Freescale Semiconductor Inc.
+ * Copyright 2007,2008 Freescale Semiconductor Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under  the terms of  the GNU General  Public License as published by the
@@ -17,6 +17,10 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                pci = &pci;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -39,8 +43,41 @@
                 reg = <0x00000000 0x10000000>;  // 256MB at 0
         };
 
+        mbx@20000000 {
+                compatible = "fsl,mpc5121-mbx";
+                reg = <0x20000000 0x4000>;
+                interrupts = <66 0x8>;
+                interrupt-parent = < &ipic >;
+        };
+
+        sram@30000000 {
+                compatible = "fsl,mpc5121-sram";
+                reg = <0x30000000 0x20000>;             // 128K at 0x30000000
+        };
+
+        nfc@40000000 {
+                compatible = "fsl,mpc5121-nfc";
+                reg = <0x40000000 0x100000>;    // 1M at 0x40000000
+                interrupts = <6 8>;
+                interrupt-parent = < &ipic >;
+                #address-cells = <1>;
+                #size-cells = <1>;
+                bank-width = <1>;
+                // ADS has two Hynix 512MB Nand flash chips in a single
+                // stacked package .
+                chips = <2>;
+                nand0@0 {
+                        label = "nand0";
+                        reg = <0x00000000 0x02000000>;  // first 32 MB of chip 0
+                };
+                nand1@20000000 {
+                        label = "nand1";
+                        reg = <0x20000000 0x02000000>;  // first 32 MB of chip 1
+                };
+        };
+
         localbus@80000020 {
-                compatible = "fsl,mpc5121ads-localbus";
+                compatible = "fsl,mpc5121-localbus";
                 #address-cells = <2>;
                 #size-cells = <1>;
                 reg = <0x80000020 0x40>;
@@ -51,14 +88,51 @@
                 flash@0,0 {
                         compatible = "cfi-flash";
                         reg = <0 0x0 0x4000000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         bank-width = <4>;
-                        device-width = <1>;
+                        device-width = <2>;
+                        protected@0 {
+                                label = "protected";
+                                reg = <0x00000000 0x00040000>;  // first sector is protected
+                                read-only;
+                        };
+                        filesystem@40000 {
+                                label = "filesystem";
+                                reg = <0x00040000 0x03c00000>;  // 60M for filesystem
+                        };
+                        kernel@3c40000 {
+                                label = "kernel";
+                                reg = <0x03c40000 0x00280000>;  // 2.5M for kernel
+                        };
+                        device-tree@3ec0000 {
+                                label = "device-tree";
+                                reg = <0x03ec0000 0x00040000>;  // one sector for device tree
+                        };
+                        u-boot@3f00000 {
+                                label = "u-boot";
+                                reg = <0x03f00000 0x00100000>;  // 1M for u-boot
+                                read-only;
+                        };
                 };
 
                 board-control@2,0 {
                         compatible = "fsl,mpc5121ads-cpld";
                         reg = <0x2 0x0 0x8000>;
                 };
+
+                cpld_pic: pic@2,a {
+                        compatible = "fsl,mpc5121ads-cpld-pic";
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                        reg = <0x2 0xa 0x5>;
+                        interrupt-parent = < &ipic >;
+                        // irq routing
+                        //      all irqs but touch screen are routed to irq0 (ipic 48)
+                        //      touch screen is statically routed to irq1 (ipic 17)
+                        //      so don't use it here
+                        interrupts = <48 0x8>;
+                };
         };
 
         soc@80000000 {
@@ -85,38 +159,252 @@
                         reg = <0xc00 0x100>;
                 };
 
-                // 512x PSCs are not 52xx PSCs compatible
+                rtc@a00 {       // Real time clock
+                        compatible = "fsl,mpc5121-rtc";
+                        reg = <0xa00 0x100>;
+                        interrupts = <79 0x8 80 0x8>;
+                        interrupt-parent = < &ipic >;
+                };
+
+                clock@f00 {     // Clock control
+                        compatible = "fsl,mpc5121-clock";
+                        reg = <0xf00 0x100>;
+                };
+
+                pmc@1000{  //Power Management Controller
+                        compatible = "fsl,mpc5121-pmc";
+                        reg = <0x1000 0x100>;
+                        interrupts = <83 0x2>;
+                        interrupt-parent = < &ipic >;
+                };
+
+                gpio@1100 {
+                        compatible = "fsl,mpc5121-gpio";
+                        reg = <0x1100 0x100>;
+                        interrupts = <78 0x8>;
+                        interrupt-parent = < &ipic >;
+                };
+
+                mscan@1300 {
+                        compatible = "fsl,mpc5121-mscan";
+                        cell-index = <0>;
+                        interrupts = <12 0x8>;
+                        interrupt-parent = < &ipic >;
+                        reg = <0x1300 0x80>;
+                };
+
+                mscan@1380 {
+                        compatible = "fsl,mpc5121-mscan";
+                        cell-index = <1>;
+                        interrupts = <13 0x8>;
+                        interrupt-parent = < &ipic >;
+                        reg = <0x1380 0x80>;
+                };
+
+                i2c@1700 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5121-i2c", "fsl-i2c";
+                        cell-index = <0>;
+                        reg = <0x1700 0x20>;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = < &ipic >;
+                        fsl5200-clocking;
+                };
+
+                i2c@1720 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5121-i2c", "fsl-i2c";
+                        cell-index = <1>;
+                        reg = <0x1720 0x20>;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = < &ipic >;
+                        fsl5200-clocking;
+                };
+
+                i2c@1740 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5121-i2c", "fsl-i2c";
+                        cell-index = <2>;
+                        reg = <0x1740 0x20>;
+                        interrupts = <11 0x8>;
+                        interrupt-parent = < &ipic >;
+                        fsl5200-clocking;
+                };
+
+                i2ccontrol@1760 {
+                        compatible = "fsl,mpc5121-i2c-ctrl";
+                        reg = <0x1760 0x8>;
+                };
+
+                axe@2000 {
+                        compatible = "fsl,mpc5121-axe";
+                        reg = <0x2000 0x100>;
+                        interrupts = <42 0x8>;
+                        interrupt-parent = < &ipic >;
+                };
+
+                display@2100 {
+                        compatible = "fsl,mpc5121-diu", "fsl-diu";
+                        reg = <0x2100 0x100>;
+                        interrupts = <64 0x8>;
+                        interrupt-parent = < &ipic >;
+                };
+
+                mdio@2800 {
+                        compatible = "fsl,mpc5121-fec-mdio";
+                        reg = <0x2800 0x800>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        phy: ethernet-phy@0 {
+                                reg = <1>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                ethernet@2800 {
+                        device_type = "network";
+                        compatible = "fsl,mpc5121-fec";
+                        reg = <0x2800 0x800>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <4 0x8>;
+                        interrupt-parent = < &ipic >;
+                        phy-handle = < &phy >;
+                        fsl,align-tx-packets = <4>;
+                };
+
+                // 5121e has two dr usb modules
+                // mpc5121_ads only uses USB0
+
+                // USB1 using external ULPI PHY
+                //usb@3000 {
+                //      compatible = "fsl,mpc5121-usb2-dr", "fsl-usb2-dr";
+                //      reg = <0x3000 0x1000>;
+                //      #address-cells = <1>;
+                //      #size-cells = <0>;
+                //      interrupt-parent = < &ipic >;
+                //      interrupts = <43 0x8>;
+                //      dr_mode = "otg";
+                //      phy_type = "ulpi";
+                //      port1;
+                //};
+
+                // USB0 using internal UTMI PHY
+                usb@4000 {
+                        compatible = "fsl,mpc5121-usb2-dr", "fsl-usb2-dr";
+                        reg = <0x4000 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        interrupt-parent = < &ipic >;
+                        interrupts = <44 0x8>;
+                        dr_mode = "otg";
+                        phy_type = "utmi_wide";
+                        port0;
+                };
+
+                // IO control
+                ioctl@a000 {
+                        compatible = "fsl,mpc5121-ioctl";
+                        reg = <0xA000 0x1000>;
+                };
+
+                pata@10200 {
+                        compatible = "fsl,mpc5121-pata";
+                        reg = <0x10200 0x100>;
+                        interrupts = <5 0x8>;
+                        interrupt-parent = < &ipic >;
+                };
+
+                // 512x PSCs are not 52xx PSC compatible
                 // PSC3 serial port A aka ttyPSC0
                 serial@11300 {
                         device_type = "serial";
-                        compatible = "fsl,mpc5121-psc-uart";
+                        compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
                         // Logical port assignment needed until driver
                         // learns to use aliases
                         port-number = <0>;
                         cell-index = <3>;
                         reg = <0x11300 0x100>;
-                        interrupts = <0x28 0x8>; // actually the fifo irq
+                        interrupts = <40 0x8>;
                         interrupt-parent = < &ipic >;
+                        rx-fifo-size = <16>;
+                        tx-fifo-size = <16>;
                 };
 
                 // PSC4 serial port B aka ttyPSC1
                 serial@11400 {
                         device_type = "serial";
-                        compatible = "fsl,mpc5121-psc-uart";
+                        compatible = "fsl,mpc5121-psc-uart", "fsl,mpc5121-psc";
                         // Logical port assignment needed until driver
                         // learns to use aliases
                         port-number = <1>;
                         cell-index = <4>;
                         reg = <0x11400 0x100>;
-                        interrupts = <0x28 0x8>; // actually the fifo irq
+                        interrupts = <40 0x8>;
                         interrupt-parent = < &ipic >;
+                        rx-fifo-size = <16>;
+                        tx-fifo-size = <16>;
                 };
 
-                pscsfifo@11f00 {
+                // PSC5 in ac97 mode
+                ac97@11500 {
+                        compatible = "fsl,mpc5121-psc-ac97", "fsl,mpc5121-psc";
+                        cell-index = <5>;
+                        reg = <0x11500 0x100>;
+                        interrupts = <40 0x8>;
+                        interrupt-parent = < &ipic >;
+                        fsl,mode = "ac97-slave";
+                        rx-fifo-size = <384>;
+                        tx-fifo-size = <384>;
+                };
+
+                pscfifo@11f00 {
                         compatible = "fsl,mpc5121-psc-fifo";
                         reg = <0x11f00 0x100>;
-                        interrupts = <0x28 0x8>;
+                        interrupts = <40 0x8>;
                         interrupt-parent = < &ipic >;
                 };
+
+                dma@14000 {
+                        compatible = "fsl,mpc5121-dma2";
+                        reg = <0x14000 0x1800>;
+                        interrupts = <65 0x8>;
+                        interrupt-parent = < &ipic >;
+                };
+
+        };
+
+        pci: pci@80008500 {
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                                // IDSEL 0x15 - Slot 1 PCI
+                                 0xa800 0x0 0x0 0x1 &cpld_pic 0x0 0x8
+                                 0xa800 0x0 0x0 0x2 &cpld_pic 0x1 0x8
+                                 0xa800 0x0 0x0 0x3 &cpld_pic 0x2 0x8
+                                 0xa800 0x0 0x0 0x4 &cpld_pic 0x3 0x8
+
+                                // IDSEL 0x16 - Slot 2 MiniPCI
+                                 0xb000 0x0 0x0 0x1 &cpld_pic 0x4 0x8
+                                 0xb000 0x0 0x0 0x2 &cpld_pic 0x5 0x8
+
+                                // IDSEL 0x17 - Slot 3 MiniPCI
+                                 0xb800 0x0 0x0 0x1 &cpld_pic 0x6 0x8
+                                 0xb800 0x0 0x0 0x2 &cpld_pic 0x7 0x8
+                                >;
+                interrupt-parent = < &ipic >;
+                interrupts = <1 0x8>;
+                bus-range = <0 0>;
+                ranges = <0x42000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
+                          0x02000000 0x0 0xb0000000 0xb0000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0x84000000 0x0 0x01000000>;
+                clock-frequency = <0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0x80008500 0x100>;
+                compatible = "fsl,mpc5121-pci";
+                device_type = "pci";
         };
 };
diff --git a/arch/powerpc/boot/dts/mpc7448hpc2.dts b/arch/powerpc/boot/dts/mpc7448hpc2.dts
index 4936349b87cd..705c23c14f32 100644
--- a/arch/powerpc/boot/dts/mpc7448hpc2.dts
+++ b/arch/powerpc/boot/dts/mpc7448hpc2.dts
@@ -124,14 +124,12 @@
                 };
 
                 mpic: pic@7400 {
-                        clock-frequency = <0>;
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x7400 0x400>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
-                        big-endian;
                 };
                 pci@1000 {
                         compatible = "tsi108-pci";
diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts
index 46e2da30c3dd..2a1929acaabd 100644
--- a/arch/powerpc/boot/dts/mpc8272ads.dts
+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -217,6 +217,17 @@
                                 linux,network-index = <1>;
                                 fsl,cpm-command = <0x16200300>;
                         };
+
+                        i2c@11860 {
+                                compatible = "fsl,mpc8272-i2c",
+                                             "fsl,cpm2-i2c";
+                                reg = <0x11860 0x20 0x8afc 0x2>;
+                                interrupts = <1 8>;
+                                interrupt-parent = <&PIC>;
+                                fsl,cpm-command = <0x29600000>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
                 };
 
                 PIC: interrupt-controller@10c00 {
@@ -226,22 +237,15 @@
                         compatible = "fsl,mpc8272-pic", "fsl,cpm2-pic";
                 };
 
-/* May need to remove if on a part without crypto engine */
                 crypto@30000 {
-                        device_type = "crypto";
-                        model = "SEC2";
-                        compatible = "fsl,mpc8272-talitos-sec2",
-                                     "fsl,talitos-sec2",
-                                     "fsl,talitos",
-                                     "talitos";
-                        reg = <0x30000 0x10000>;
-                        interrupts = <11 8>;
+                        compatible = "fsl,sec1.0";
+                        reg = <0x40000 0x13000>;
+                        interrupts = <47 0x8>;
                         interrupt-parent = <&PIC>;
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x7e>;
-/* desc mask is for rev1.x, we need runtime fixup for >=2.x */
-                        descriptor-types-mask = <0x1010ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x7e>;
+                        fsl,descriptor-types-mask = <0x1010415>;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index e1f0dca8ac39..3664fb584026 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -144,6 +144,41 @@
                         mode = "cpu";
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8313-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
                 usb@23000 {
                         compatible = "fsl-usb2-dr";
@@ -219,17 +254,14 @@
                 };
 
                 crypto@30000 {
-                        device_type = "crypto";
-                        model = "SEC2";
-                        compatible = "talitos";
-                        reg = <0x30000 0x7000>;
+                        compatible = "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        /* Rev. 2.2 */
-                        num-channels = <1>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x0000004c>;
-                        descriptor-types-mask = <0x0122003f>;
+                        fsl,num-channels = <1>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x4c>;
+                        fsl,descriptor-types-mask = <0x0122003f>;
                 };
 
                 /* IPIC
diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
index d7a1ececa30f..f704513fb930 100644
--- a/arch/powerpc/boot/dts/mpc8315erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8315erdb.dts
@@ -132,6 +132,41 @@
                         mode = "cpu";
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8315-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 usb@23000 {
                         compatible = "fsl-usb2-dr";
                         reg = <0x23000 0x1000>;
@@ -206,17 +241,16 @@
                 };
 
                 crypto@30000 {
-                        model = "SEC3";
-                        device_type = "crypto";
-                        compatible = "talitos";
+                        compatible = "fsl,sec3.3", "fsl,sec3.1", "fsl,sec3.0",
+                                     "fsl,sec2.4", "fsl,sec2.2", "fsl,sec2.1",
+                                     "fsl,sec2.0";
                         reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        /* Rev. 3.0 geometry */
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x000001fe>;
-                        descriptor-types-mask = <0x03ab0ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x97c>;
+                        fsl,descriptor-types-mask = <0x3ab0abf>;
                 };
 
                 sata@18000 {
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 539e02fb3526..7345743d3d96 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -114,18 +114,50 @@
                         interrupt-parent = <&ipic>;
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8323-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 crypto@30000 {
-                        device_type = "crypto";
-                        model = "SEC2";
-                        compatible = "talitos";
-                        reg = <0x30000 0x7000>;
+                        compatible = "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        /* Rev. 2.2 */
-                        num-channels = <1>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x0000004c>;
-                        descriptor-types-mask = <0x0122003f>;
+                        fsl,num-channels = <1>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x4c>;
+                        fsl,descriptor-types-mask = <0x0122003f>;
                 };
 
                 ipic: pic@700 {
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 179c81c6a7ac..e74c045a0f8c 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -68,7 +68,7 @@
                         compatible = "fsl-i2c";
                         reg = <0x3000 0x100>;
                         interrupts = <14 0x8>;
-                        interrupt-parent = <&pic>;
+                        interrupt-parent = <&ipic>;
                         dfsrr;
                 };
 
@@ -79,7 +79,7 @@
                         reg = <0x4500 0x100>;
                         clock-frequency = <0>;
                         interrupts = <9 0x8>;
-                        interrupt-parent = <&pic>;
+                        interrupt-parent = <&ipic>;
                 };
 
                 serial1: serial@4600 {
@@ -89,24 +89,56 @@
                         reg = <0x4600 0x100>;
                         clock-frequency = <0>;
                         interrupts = <10 0x8>;
-                        interrupt-parent = <&pic>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8323-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
                 };
 
                 crypto@30000 {
-                        device_type = "crypto";
-                        model = "SEC2";
-                        compatible = "talitos";
-                        reg = <0x30000 0x7000>;
+                        compatible = "fsl,sec2.2", "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
-                        interrupt-parent = <&pic>;
-                        /* Rev. 2.2 */
-                        num-channels = <1>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x0000004c>;
-                        descriptor-types-mask = <0x0122003f>;
+                        interrupt-parent = <&ipic>;
+                        fsl,num-channels = <1>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x4c>;
+                        fsl,descriptor-types-mask = <0x0122003f>;
                 };
 
-                pic:pic@700 {
+                ipic:pic@700 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
@@ -240,13 +272,13 @@
                         compatible = "fsl,ucc-mdio";
 
                         phy00:ethernet-phy@00 {
-                                interrupt-parent = <&pic>;
+                                interrupt-parent = <&ipic>;
                                 interrupts = <0>;
                                 reg = <0x0>;
                                 device_type = "ethernet-phy";
                         };
                         phy04:ethernet-phy@04 {
-                                interrupt-parent = <&pic>;
+                                interrupt-parent = <&ipic>;
                                 interrupts = <0>;
                                 reg = <0x4>;
                                 device_type = "ethernet-phy";
@@ -261,7 +293,7 @@
                         reg = <0x80 0x80>;
                         big-endian;
                         interrupts = <32 0x8 33 0x8>; //high:32 low:33
-                        interrupt-parent = <&pic>;
+                        interrupt-parent = <&ipic>;
                 };
         };
 
@@ -270,21 +302,21 @@
                 interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                                 /* IDSEL 0x10 AD16 (USB) */
-                                 0x8000 0x0 0x0 0x1 &pic 17 0x8
+                                 0x8000 0x0 0x0 0x1 &ipic 17 0x8
 
                                 /* IDSEL 0x11 AD17 (Mini1)*/
-                                 0x8800 0x0 0x0 0x1 &pic 18 0x8
-                                 0x8800 0x0 0x0 0x2 &pic 19 0x8
-                                 0x8800 0x0 0x0 0x3 &pic 20 0x8
-                                 0x8800 0x0 0x0 0x4 &pic 48 0x8
+                                 0x8800 0x0 0x0 0x1 &ipic 18 0x8
+                                 0x8800 0x0 0x0 0x2 &ipic 19 0x8
+                                 0x8800 0x0 0x0 0x3 &ipic 20 0x8
+                                 0x8800 0x0 0x0 0x4 &ipic 48 0x8
 
                                 /* IDSEL 0x12 AD18 (PCI/Mini2) */
-                                 0x9000 0x0 0x0 0x1 &pic 19 0x8
-                                 0x9000 0x0 0x0 0x2 &pic 20 0x8
-                                 0x9000 0x0 0x0 0x3 &pic 48 0x8
-                                 0x9000 0x0 0x0 0x4 &pic 17 0x8>;
+                                 0x9000 0x0 0x0 0x1 &ipic 19 0x8
+                                 0x9000 0x0 0x0 0x2 &ipic 20 0x8
+                                 0x9000 0x0 0x0 0x3 &ipic 48 0x8
+                                 0x9000 0x0 0x0 0x4 &ipic 17 0x8>;
 
-                interrupt-parent = <&pic>;
+                interrupt-parent = <&ipic>;
                 interrupts = <66 0x8>;
                 bus-range = <0x0 0x0>;
                 ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 9426676b0b7d..8dfab5662585 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -93,6 +93,41 @@
                         mode = "cpu";
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 usb@22000 {
                         compatible = "fsl-usb2-mph";
                         reg = <0x22000 0x1000>;
@@ -178,16 +213,14 @@
                 };
 
                 crypto@30000 {
-                        device_type = "crypto";
-                        model = "SEC2";
-                        compatible = "talitos";
+                        compatible = "fsl,sec2.0";
                         reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x0000007e>;
-                        descriptor-types-mask = <0x01010ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x7e>;
+                        fsl,descriptor-types-mask = <0x01010ebf>;
                 };
 
                 ipic: pic@700 {
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index f81d735e6e72..49ca3497eefb 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -91,6 +91,41 @@
                         mode = "cpu";
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 usb@23000 {
                         compatible = "fsl-usb2-dr";
                         reg = <0x23000 0x1000>;
@@ -151,16 +186,14 @@
                 };
 
                 crypto@30000 {
-                        device_type = "crypto";
-                        model = "SEC2";
-                        compatible = "talitos";
+                        compatible = "fsl,sec2.0";
                         reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x0000007e>;
-                        descriptor-types-mask = <0x01010ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x7e>;
+                        fsl,descriptor-types-mask = <0x01010ebf>;
                 };
 
                 ipic: pic@700 {
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 0199c5c548d8..ba586cb7afbb 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -103,6 +103,41 @@
                         mode = "cpu";
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 /* phy type (ULPI or SERIAL) are only types supported for MPH */
                 /* port = 0 or 1 */
                 usb@22000 {
@@ -193,20 +228,15 @@
                         interrupt-parent = <&ipic>;
                 };
 
-                /* May need to remove if on a part without crypto engine */
                 crypto@30000 {
-                        device_type = "crypto";
-                        model = "SEC2";
-                        compatible = "talitos";
+                        compatible = "fsl,sec2.0";
                         reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x0000007e>;
-                        /* desc mask is for rev2.0,
-                         * we need runtime fixup for >2.0 */
-                        descriptor-types-mask = <0x01010ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x7e>;
+                        fsl,descriptor-types-mask = <0x01010ebf>;
                 };
 
                 /* IPIC
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 8160ff24e87e..3701dae1ee02 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -118,18 +118,50 @@
                         interrupt-parent = <&ipic>;
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8360-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 crypto@30000 {
-                        device_type = "crypto";
-                        model = "SEC2";
-                        compatible = "talitos";
+                        compatible = "fsl,sec2.0";
                         reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x0000007e>;
-                        /* desc mask is for rev1.x, we need runtime fixup for >=2.x */
-                        descriptor-types-mask = <0x01010ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x7e>;
+                        fsl,descriptor-types-mask = <0x01010ebf>;
                 };
 
                 ipic: pic@700 {
diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts
new file mode 100644
index 000000000000..8acd1d6577f2
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc836x_rdk.dts
@@ -0,0 +1,432 @@
+/*
+ * MPC8360E RDK Device Tree Source
+ *
+ * Copyright 2006 Freescale Semiconductor Inc.
+ * Copyright 2007-2008 MontaVista Software, Inc.
+ *
+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
+ *
+ * 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.
+ */
+
+/dts-v1/;
+
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "fsl,mpc8360rdk";
+
+        aliases {
+                serial0 = &serial0;
+                serial1 = &serial1;
+                serial2 = &serial2;
+                serial3 = &serial3;
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                ethernet3 = &enet3;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8360@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <32768>;
+                        i-cache-size = <32768>;
+                        /* filled by u-boot */
+                        timebase-frequency = <0>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                /* filled by u-boot */
+                reg = <0 0>;
+        };
+
+        soc@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "fsl,mpc8360-immr", "fsl,immr", "fsl,soc",
+                             "simple-bus";
+                ranges = <0 0xe0000000 0x200000>;
+                reg = <0xe0000000 0x200>;
+                /* filled by u-boot */
+                bus-frequency = <0>;
+
+                wdt@200 {
+                        compatible = "mpc83xx_wdt";
+                        reg = <0x200 0x100>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <14 8>;
+                        interrupt-parent = <&ipic>;
+                        dfsrr;
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <16 8>;
+                        interrupt-parent = <&ipic>;
+                        dfsrr;
+                };
+
+                serial0: serial@4500 {
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        interrupts = <9 8>;
+                        interrupt-parent = <&ipic>;
+                        /* filled by u-boot */
+                        clock-frequency = <0>;
+                };
+
+                serial1: serial@4600 {
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        interrupts = <10 8>;
+                        interrupt-parent = <&ipic>;
+                        /* filled by u-boot */
+                        clock-frequency = <0>;
+                };
+
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8360-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
+                crypto@30000 {
+                        compatible = "fsl,sec2-crypto";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <11 8>;
+                        interrupt-parent = <&ipic>;
+                        num-channels = <4>;
+                        channel-fifo-len = <24>;
+                        exec-units-mask = <0x7e>;
+                        /*
+                         * desc mask is for rev1.x, we need runtime fixup
+                         * for >=2.x
+                         */
+                        descriptor-types-mask = <0x1010ebf>;
+                };
+
+                ipic: interrupt-controller@700 {
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        compatible = "fsl,pq2pro-pic", "fsl,ipic";
+                        interrupt-controller;
+                        reg = <0x700 0x100>;
+                };
+
+                qe_pio_b: gpio-controller@1418 {
+                        #gpio-cells = <2>;
+                        compatible = "fsl,mpc8360-qe-pario-bank",
+                                     "fsl,mpc8323-qe-pario-bank";
+                        reg = <0x1418 0x18>;
+                        gpio-controller;
+                };
+
+                qe_pio_e: gpio-controller@1460 {
+                        #gpio-cells = <2>;
+                        compatible = "fsl,mpc8360-qe-pario-bank",
+                                     "fsl,mpc8323-qe-pario-bank";
+                        reg = <0x1460 0x18>;
+                        gpio-controller;
+                };
+
+                qe@100000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        device_type = "qe";
+                        compatible = "fsl,qe", "simple-bus";
+                        ranges = <0 0x100000 0x100000>;
+                        reg = <0x100000 0x480>;
+                        /* filled by u-boot */
+                        clock-frequency = <0>;
+                        bus-frequency = <0>;
+                        brg-frequency = <0>;
+
+                        muram@10000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "fsl,qe-muram", "fsl,cpm-muram";
+                                ranges = <0 0x10000 0xc000>;
+
+                                data-only@0 {
+                                        compatible = "fsl,qe-muram-data",
+                                                     "fsl,cpm-muram-data";
+                                        reg = <0 0xc000>;
+                                };
+                        };
+
+                        timer@440 {
+                                compatible = "fsl,mpc8360-qe-gtm",
+                                             "fsl,qe-gtm", "fsl,gtm";
+                                reg = <0x440 0x40>;
+                                interrupts = <12 13 14 15>;
+                                interrupt-parent = <&qeic>;
+                                /* filled by u-boot */
+                                clock-frequency = <0>;
+                        };
+
+                        spi@4c0 {
+                                cell-index = <0>;
+                                compatible = "fsl,spi";
+                                reg = <0x4c0 0x40>;
+                                interrupts = <2>;
+                                interrupt-parent = <&qeic>;
+                                mode = "cpu-qe";
+                        };
+
+                        spi@500 {
+                                cell-index = <1>;
+                                compatible = "fsl,spi";
+                                reg = <0x500 0x40>;
+                                interrupts = <1>;
+                                interrupt-parent = <&qeic>;
+                                mode = "cpu-qe";
+                        };
+
+                        enet0: ucc@2000 {
+                                device_type = "network";
+                                compatible = "ucc_geth";
+                                cell-index = <1>;
+                                reg = <0x2000 0x200>;
+                                interrupts = <32>;
+                                interrupt-parent = <&qeic>;
+                                rx-clock-name = "none";
+                                tx-clock-name = "clk9";
+                                phy-handle = <&phy2>;
+                                phy-connection-type = "rgmii-rxid";
+                                /* filled by u-boot */
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                        };
+
+                        enet1: ucc@3000 {
+                                device_type = "network";
+                                compatible = "ucc_geth";
+                                cell-index = <2>;
+                                reg = <0x3000 0x200>;
+                                interrupts = <33>;
+                                interrupt-parent = <&qeic>;
+                                rx-clock-name = "none";
+                                tx-clock-name = "clk4";
+                                phy-handle = <&phy4>;
+                                phy-connection-type = "rgmii-rxid";
+                                /* filled by u-boot */
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                        };
+
+                        enet2: ucc@2600 {
+                                device_type = "network";
+                                compatible = "ucc_geth";
+                                cell-index = <7>;
+                                reg = <0x2600 0x200>;
+                                interrupts = <42>;
+                                interrupt-parent = <&qeic>;
+                                rx-clock-name = "clk20";
+                                tx-clock-name = "clk19";
+                                phy-handle = <&phy1>;
+                                phy-connection-type = "mii";
+                                /* filled by u-boot */
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                        };
+
+                        enet3: ucc@3200 {
+                                device_type = "network";
+                                compatible = "ucc_geth";
+                                cell-index = <4>;
+                                reg = <0x3200 0x200>;
+                                interrupts = <35>;
+                                interrupt-parent = <&qeic>;
+                                rx-clock-name = "clk8";
+                                tx-clock-name = "clk7";
+                                phy-handle = <&phy3>;
+                                phy-connection-type = "mii";
+                                /* filled by u-boot */
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                        };
+
+                        mdio@2120 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,ucc-mdio";
+                                reg = <0x2120 0x18>;
+
+                                phy1: ethernet-phy@1 {
+                                        device_type = "ethernet-phy";
+                                        compatible = "national,DP83848VV";
+                                        reg = <1>;
+                                };
+
+                                phy2: ethernet-phy@2 {
+                                        device_type = "ethernet-phy";
+                                        compatible = "broadcom,BCM5481UA2KMLG";
+                                        reg = <2>;
+                                };
+
+                                phy3: ethernet-phy@3 {
+                                        device_type = "ethernet-phy";
+                                        compatible = "national,DP83848VV";
+                                        reg = <3>;
+                                };
+
+                                phy4: ethernet-phy@4 {
+                                        device_type = "ethernet-phy";
+                                        compatible = "broadcom,BCM5481UA2KMLG";
+                                        reg = <4>;
+                                };
+                        };
+
+                        serial2: ucc@2400 {
+                                device_type = "serial";
+                                compatible = "ucc_uart";
+                                reg = <0x2400 0x200>;
+                                cell-index = <5>;
+                                port-number = <0>;
+                                rx-clock-name = "brg7";
+                                tx-clock-name = "brg8";
+                                interrupts = <40>;
+                                interrupt-parent = <&qeic>;
+                                soft-uart;
+                        };
+
+                        serial3: ucc@3400 {
+                                device_type = "serial";
+                                compatible = "ucc_uart";
+                                reg = <0x3400 0x200>;
+                                cell-index = <6>;
+                                port-number = <1>;
+                                rx-clock-name = "brg13";
+                                tx-clock-name = "brg14";
+                                interrupts = <41>;
+                                interrupt-parent = <&qeic>;
+                                soft-uart;
+                        };
+
+                        qeic: interrupt-controller@80 {
+                                #address-cells = <0>;
+                                #interrupt-cells = <1>;
+                                compatible = "fsl,qe-ic";
+                                interrupt-controller;
+                                reg = <0x80 0x80>;
+                                big-endian;
+                                interrupts = <32 8 33 8>;
+                                interrupt-parent = <&ipic>;
+                        };
+                };
+        };
+
+        localbus@e0005000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8360-localbus", "fsl,pq2pro-localbus",
+                             "simple-bus";
+                reg = <0xe0005000 0xd8>;
+                ranges = <0 0 0xff800000 0x0800000
+                          1 0 0x60000000 0x0001000
+                          2 0 0x70000000 0x4000000>;
+
+                flash@0,0 {
+                        compatible = "intel,PC28F640P30T85", "cfi-flash";
+                        reg = <0 0 0x800000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+
+                display@2,0 {
+                        device_type = "display";
+                        compatible = "fujitsu,MB86277", "fujitsu,mint";
+                        reg = <2 0 0x4000000>;
+                        fujitsu,sh3;
+                        little-endian;
+                        /* filled by u-boot */
+                        address = <0>;
+                        depth = <0>;
+                        width = <0>;
+                        height = <0>;
+                        linebytes = <0>;
+                        /* linux,opened; - added by uboot */
+                };
+        };
+
+        pci0: pci@e0008500 {
+                #address-cells = <3>;
+                #size-cells = <2>;
+                #interrupt-cells = <1>;
+                device_type = "pci";
+                compatible = "fsl,mpc8360-pci", "fsl,mpc8349-pci";
+                reg = <0xe0008500 0x100>;
+                ranges = <0x02000000 0 0x90000000 0x90000000 0 0x10000000
+                          0x42000000 0 0x80000000 0x80000000 0 0x10000000
+                          0x01000000 0 0xe0300000 0xe0300000 0 0x00100000>;
+                interrupts = <66 8>;
+                interrupt-parent = <&ipic>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = </* miniPCI0 IDSEL 0x14 AD20 */
+                                 0xa000 0 0 1 &ipic 18 8
+                                 0xa000 0 0 2 &ipic 19 8
+
+                                 /* PCI1 IDSEL 0x15 AD21 */
+                                 0xa800 0 0 1 &ipic 19 8
+                                 0xa800 0 0 2 &ipic 20 8
+                                 0xa800 0 0 3 &ipic 21 8
+                                 0xa800 0 0 4 &ipic 18 8>;
+                /* filled by u-boot */
+                bus-range = <0 0>;
+                clock-frequency = <0>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
index fea592574004..0a700cb5f611 100644
--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -233,41 +233,6 @@
                         interrupt-parent = <&ipic>;
                 };
 
-                crypto@30000 {
-                        model = "SEC3";
-                        compatible = "talitos";
-                        reg = <0x30000 0x10000>;
-                        interrupts = <11 0x8>;
-                        interrupt-parent = <&ipic>;
-                        /* Rev. 3.0 geometry */
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x000001fe>;
-                        descriptor-types-mask = <0x03ab0ebf>;
-                };
-
-                sdhc@2e000 {
-                        model = "eSDHC";
-                        compatible = "fsl,esdhc";
-                        reg = <0x2e000 0x1000>;
-                        interrupts = <42 0x8>;
-                        interrupt-parent = <&ipic>;
-                };
-
-                sata@18000 {
-                        compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
-                        reg = <0x18000 0x1000>;
-                        interrupts = <44 0x8>;
-                        interrupt-parent = <&ipic>;
-                };
-
-                sata@19000 {
-                        compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
-                        reg = <0x19000 0x1000>;
-                        interrupts = <45 0x8>;
-                        interrupt-parent = <&ipic>;
-                };
-
                 dma@82a8 {
                         #address-cells = <1>;
                         #size-cells = <1>;
@@ -303,6 +268,40 @@
                         };
                 };
 
+                crypto@30000 {
+                        compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                     "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <11 0x8>;
+                        interrupt-parent = <&ipic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x9fe>;
+                        fsl,descriptor-types-mask = <0x3ab0ebf>;
+                };
+
+                sdhc@2e000 {
+                        model = "eSDHC";
+                        compatible = "fsl,esdhc";
+                        reg = <0x2e000 0x1000>;
+                        interrupts = <42 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                sata@18000 {
+                        compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
+                        reg = <0x18000 0x1000>;
+                        interrupts = <44 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                sata@19000 {
+                        compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
+                        reg = <0x19000 0x1000>;
+                        interrupts = <45 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
                 /* IPIC
                  * interrupts cell = <intr #, sense>
                  * sense values match linux IORESOURCE_IRQ_* defines:
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts
index f3083c779b66..ed137aa83d5f 100644
--- a/arch/powerpc/boot/dts/mpc8377_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts
@@ -143,6 +143,41 @@
                         mode = "cpu";
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8377-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 usb@23000 {
                         compatible = "fsl-usb2-dr";
                         reg = <0x23000 0x1000>;
@@ -213,17 +248,15 @@
                 };
 
                 crypto@30000 {
-                        model = "SEC3";
-                        device_type = "crypto";
-                        compatible = "talitos";
+                        compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                     "fsl,sec2.1", "fsl,sec2.0";
                         reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        /* Rev. 3.0 geometry */
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x000001fe>;
-                        descriptor-types-mask = <0x03ab0ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x9fe>;
+                        fsl,descriptor-types-mask = <0x3ab0ebf>;
                 };
 
                 sata@18000 {
diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts
index 1d6ea080ad73..29c8c76a58f7 100644
--- a/arch/powerpc/boot/dts/mpc8378_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8378_mds.dts
@@ -157,6 +157,41 @@
                         mode = "cpu";
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8378-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 usb@23000 {
                         compatible = "fsl-usb2-dr";
                         reg = <0x23000 0x1000>;
@@ -234,16 +269,15 @@
                 };
 
                 crypto@30000 {
-                        model = "SEC3";
-                        compatible = "talitos";
+                        compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                     "fsl,sec2.1", "fsl,sec2.0";
                         reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        /* Rev. 3.0 geometry */
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x000001fe>;
-                        descriptor-types-mask = <0x03ab0ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x9fe>;
+                        fsl,descriptor-types-mask = <0x3ab0ebf>;
                 };
 
                 sdhc@2e000 {
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
index 0e872a60e091..34a7f2f935e1 100644
--- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -143,6 +143,41 @@
                         mode = "cpu";
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8378-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 usb@23000 {
                         compatible = "fsl-usb2-dr";
                         reg = <0x23000 0x1000>;
@@ -213,17 +248,15 @@
                 };
 
                 crypto@30000 {
-                        model = "SEC3";
-                        device_type = "crypto";
-                        compatible = "talitos";
+                        compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                     "fsl,sec2.1", "fsl,sec2.0";
                         reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        /* Rev. 3.0 geometry */
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x000001fe>;
-                        descriptor-types-mask = <0x03ab0ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x9fe>;
+                        fsl,descriptor-types-mask = <0x3ab0ebf>;
                 };
 
                 /* IPIC
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts
index 6f78a9fd9826..d641a8985ea3 100644
--- a/arch/powerpc/boot/dts/mpc8379_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8379_mds.dts
@@ -157,6 +157,41 @@
                         mode = "cpu";
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8379-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 usb@23000 {
                         compatible = "fsl-usb2-dr";
                         reg = <0x23000 0x1000>;
@@ -234,16 +269,15 @@
                 };
 
                 crypto@30000 {
-                        model = "SEC3";
-                        compatible = "talitos";
+                        compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                     "fsl,sec2.1", "fsl,sec2.0";
                         reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        /* Rev. 3.0 geometry */
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x000001fe>;
-                        descriptor-types-mask = <0x03ab0ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x9fe>;
+                        fsl,descriptor-types-mask = <0x3ab0ebf>;
                 };
 
                 sdhc@2e000 {
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts
index 1eb8defaff6f..e4d7030d50e5 100644
--- a/arch/powerpc/boot/dts/mpc8379_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
@@ -143,6 +143,41 @@
                         mode = "cpu";
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8379-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 usb@23000 {
                         compatible = "fsl-usb2-dr";
                         reg = <0x23000 0x1000>;
@@ -213,17 +248,15 @@
                 };
 
                 crypto@30000 {
-                        model = "SEC3";
-                        device_type = "crypto";
-                        compatible = "talitos";
+                        compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                     "fsl,sec2.1", "fsl,sec2.0";
                         reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        /* Rev. 3.0 geometry */
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x000001fe>;
-                        descriptor-types-mask = <0x03ab0ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x9fe>;
+                        fsl,descriptor-types-mask = <0x3ab0ebf>;
                 };
 
                 sata@18000 {
diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts
new file mode 100644
index 000000000000..02cfa24a1695
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8536ds.dts
@@ -0,0 +1,432 @@
+/*
+ * MPC8536 DS Device Tree Source
+ *
+ * Copyright 2008 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "fsl,mpc8536ds";
+        compatible = "fsl,mpc8536ds";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+                pci2 = &pci2;
+                pci3 = &pci3;
+        };
+
+        cpus {
+                #cpus = <1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8536@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        next-level-cache = <&L2>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <00000000 00000000>;      // Filled by U-Boot
+        };
+
+        soc@ffe00000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xffe00000 0x100000>;
+                reg = <0xffe00000 0x1000>;
+                bus-frequency = <0>;            // Filled out by uboot.
+
+                memory-controller@2000 {
+                        compatible = "fsl,mpc8536-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <18 0x2>;
+                };
+
+                L2: l2-cache-controller@20000 {
+                        compatible = "fsl,mpc8536-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <16 0x2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 0x2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <43 0x2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                        rtc@68 {
+                                compatible = "dallas,ds3232";
+                                reg = <0x68>;
+                        };
+                };
+
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8536-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 4>;
+                        ranges = <0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8536-dma-channel",
+                                             "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <14 0x2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8536-dma-channel",
+                                             "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <15 0x2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8536-dma-channel",
+                                             "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <16 0x2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8536-dma-channel",
+                                             "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <17 0x2>;
+                        };
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
+                        phy0: ethernet-phy@0 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <10 0x1>;
+                                reg = <0>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy1: ethernet-phy@1 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <10 0x1>;
+                                reg = <1>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                usb@22000 {
+                        compatible = "fsl,mpc8536-usb2-mph", "fsl-usb2-mph";
+                        reg = <0x22000 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <28 0x2>;
+                        phy_type = "ulpi";
+                };
+
+                usb@23000 {
+                        compatible = "fsl,mpc8536-usb2-mph", "fsl-usb2-mph";
+                        reg = <0x23000 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <46 0x2>;
+                        phy_type = "ulpi";
+                };
+
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2 30 2 34 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy1>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                enet1: ethernet@26000 {
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x26000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <31 2 32 2 33 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy0>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                usb@2b000 {
+                        compatible = "fsl,mpc8536-usb2-dr", "fsl-usb2-dr";
+                        reg = <0x2b000 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <60 0x2>;
+                        dr_mode = "peripheral";
+                        phy_type = "ulpi";
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <42 0x2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <42 0x2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                crypto@30000 {
+                        compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                     "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2 58 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x9fe>;
+                        fsl,descriptor-types-mask = <0x3ab0ebf>;
+                };
+
+                sata@18000 {
+                        compatible = "fsl,mpc8536-sata", "fsl,pq-sata";
+                        reg = <0x18000 0x1000>;
+                        cell-index = <1>;
+                        interrupts = <74 0x2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                sata@19000 {
+                        compatible = "fsl,mpc8536-sata", "fsl,pq-sata";
+                        reg = <0x19000 0x1000>;
+                        cell-index = <2>;
+                        interrupts = <41 0x2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                global-utilities@e0000 {        //global utilities block
+                        compatible = "fsl,mpc8548-guts";
+                        reg = <0xe0000 0x1000>;
+                        fsl,has-rstcr;
+                };
+
+                mpic: pic@40000 {
+                        clock-frequency = <0>;
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                        big-endian;
+                };
+
+                msi@41600 {
+                        compatible = "fsl,mpc8536-msi", "fsl,mpic-msi";
+                        reg = <0x41600 0x80>;
+                        msi-available-ranges = <0 0x100>;
+                        interrupts = <
+                                0xe0 0
+                                0xe1 0
+                                0xe2 0
+                                0xe3 0
+                                0xe4 0
+                                0xe5 0
+                                0xe6 0
+                                0xe7 0>;
+                        interrupt-parent = <&mpic>;
+                };
+        };
+
+        pci0: pci@ffe08000 {
+                cell-index = <0>;
+                compatible = "fsl,mpc8540-pci";
+                device_type = "pci";
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+
+                        /* IDSEL 0x11 J17 Slot 1 */
+                        0x8800 0 0 1 &mpic 1 1
+                        0x8800 0 0 2 &mpic 2 1
+                        0x8800 0 0 3 &mpic 3 1
+                        0x8800 0 0 4 &mpic 4 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <24 0x2>;
+                bus-range = <0 0xff>;
+                ranges = <0x02000000 0 0x80000000 0x80000000 0 0x10000000
+                          0x01000000 0 0x00000000 0xffc00000 0 0x00010000>;
+                clock-frequency = <66666666>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xffe08000 0x1000>;
+        };
+
+        pci1: pcie@ffe09000 {
+                cell-index = <1>;
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xffe09000 0x1000>;
+                bus-range = <0 0xff>;
+                ranges = <0x02000000 0 0x98000000 0x98000000 0 0x08000000
+                          0x01000000 0 0x00000000 0xffc20000 0 0x00010000>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <25 0x2>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0 0 1 &mpic 4 1
+                        0000 0 0 2 &mpic 5 1
+                        0000 0 0 3 &mpic 6 1
+                        0000 0 0 4 &mpic 7 1
+                        >;
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x02000000 0 0x98000000
+                                  0x02000000 0 0x98000000
+                                  0 0x08000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        pci2: pcie@ffe0a000 {
+                cell-index = <2>;
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xffe0a000 0x1000>;
+                bus-range = <0 0xff>;
+                ranges = <0x02000000 0 0x90000000 0x90000000 0 0x08000000
+                          0x01000000 0 0x00000000 0xffc10000 0 0x00010000>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <26 0x2>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0 0 1 &mpic 0 1
+                        0000 0 0 2 &mpic 1 1
+                        0000 0 0 3 &mpic 2 1
+                        0000 0 0 4 &mpic 3 1
+                        >;
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x02000000 0 0x90000000
+                                  0x02000000 0 0x90000000
+                                  0 0x08000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00010000>;
+                };
+        };
+
+        pci3: pcie@ffe0b000 {
+                cell-index = <3>;
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xffe0b000 0x1000>;
+                bus-range = <0 0xff>;
+                ranges = <0x02000000 0 0xa0000000 0xa0000000 0 0x20000000
+                          0x01000000 0 0x00000000 0xffc30000 0 0x00010000>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <27 0x2>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0 0 1 &mpic 8 1
+                        0000 0 0 2 &mpic 9 1
+                        0000 0 0 3 &mpic 10 1
+                        0000 0 0 4 &mpic 11 1
+                        >;
+
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x02000000 0 0xa0000000
+                                  0x02000000 0 0xa0000000
+                                  0 0x20000000
+
+                                  0x01000000 0 0x00000000
+                                  0x01000000 0 0x00000000
+                                  0 0x00100000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index 18033ed0b535..f2273a872b11 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -40,6 +40,7 @@
                         timebase-frequency = <0>;       //  33 MHz, from uboot
                         bus-frequency = <0>;    // 166 MHz
                         clock-frequency = <0>;  // 825 MHz, from uboot
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -63,7 +64,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8540-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>; // 32 bytes
@@ -83,6 +84,47 @@
                         dfsrr;
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8540-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8540-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8540-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8540-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8540-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -165,14 +207,12 @@
                         interrupt-parent = <&mpic>;
                 };
                 mpic: pic@40000 {
-                        clock-frequency = <0>;
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
-                        big-endian;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts
index 663c7c50ca45..c4469f19ff82 100644
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -40,6 +40,7 @@
                         timebase-frequency = <0>;       //  33 MHz, from uboot
                         bus-frequency = <0>;    // 166 MHz
                         clock-frequency = <0>;  // 825 MHz, from uboot
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -63,7 +64,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8541-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>; // 32 bytes
@@ -83,6 +84,47 @@
                         dfsrr;
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8541-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8541-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8541-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8541-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8541-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -147,15 +189,24 @@
                         interrupt-parent = <&mpic>;
                 };
 
+                crypto@30000 {
+                        compatible = "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x7e>;
+                        fsl,descriptor-types-mask = <0x01010ebf>;
+                };
+
                 mpic: pic@40000 {
-                        clock-frequency = <0>;
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
-                        big-endian;
                 };
 
                 cpm@919c0 {
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts
index 6a0d8db96d97..7d3829d3495e 100644
--- a/arch/powerpc/boot/dts/mpc8544ds.dts
+++ b/arch/powerpc/boot/dts/mpc8544ds.dts
@@ -41,6 +41,7 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -65,7 +66,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8544-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>; // 32 bytes
@@ -209,15 +210,40 @@
                         fsl,has-rstcr;
                 };
 
+                crypto@30000 {
+                        compatible = "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0xfe>;
+                        fsl,descriptor-types-mask = <0x12b0ebf>;
+                };
+
                 mpic: pic@40000 {
-                        clock-frequency = <0>;
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
-                        big-endian;
+                };
+
+                msi@41600 {
+                        compatible = "fsl,mpc8544-msi", "fsl,mpic-msi";
+                        reg = <0x41600 0x80>;
+                        msi-available-ranges = <0 0x100>;
+                        interrupts = <
+                                0xe0 0
+                                0xe1 0
+                                0xe2 0
+                                0xe3 0
+                                0xe4 0
+                                0xe5 0
+                                0xe6 0
+                                0xe7 0>;
+                        interrupt-parent = <&mpic>;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts
index 4811b8107415..d84466bb7eca 100644
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -45,6 +45,7 @@
                         timebase-frequency = <0>;       //  33 MHz, from uboot
                         bus-frequency = <0>;    // 166 MHz
                         clock-frequency = <0>;  // 825 MHz, from uboot
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -68,7 +69,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8548-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>; // 32 bytes
@@ -99,6 +100,47 @@
                         dfsrr;
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8548-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -207,15 +249,24 @@
                         fsl,has-rstcr;
                 };
 
+                crypto@30000 {
+                        compatible = "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0xfe>;
+                        fsl,descriptor-types-mask = <0x12b0ebf>;
+                };
+
                 mpic: pic@40000 {
-                        clock-frequency = <0>;
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
-                        big-endian;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index b025c566c10d..e03a78006283 100644
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -40,6 +40,7 @@
                         timebase-frequency = <0>;       //  33 MHz, from uboot
                         bus-frequency = <0>;    // 166 MHz
                         clock-frequency = <0>;  // 825 MHz, from uboot
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -63,7 +64,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8555-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>; // 32 bytes
@@ -83,6 +84,47 @@
                         dfsrr;
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8555-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8555-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8555-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8555-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8555-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -147,15 +189,24 @@
                         interrupt-parent = <&mpic>;
                 };
 
+                crypto@30000 {
+                        compatible = "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x7e>;
+                        fsl,descriptor-types-mask = <0x01010ebf>;
+                };
+
                 mpic: pic@40000 {
-                        clock-frequency = <0>;
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
-                        big-endian;
                 };
 
                 cpm@919c0 {
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 0cc16ab305d1..ba8159de040b 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -64,7 +64,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8540-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>; // 32 bytes
@@ -73,6 +73,47 @@
                         interrupts = <16 2>;
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8560-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -134,6 +175,7 @@
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
                         device_type = "open-pic";
                 };
 
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index a025a8ededc5..9c30a34821dc 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -42,6 +42,7 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -70,7 +71,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8568-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>; // 32 bytes
@@ -106,6 +107,47 @@
                         dfsrr;
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8568-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8568-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8568-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8568-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8568-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -189,27 +231,23 @@
                 };
 
                 crypto@30000 {
-                        device_type = "crypto";
-                        model = "SEC2";
-                        compatible = "talitos";
-                        reg = <0x30000 0xf000>;
+                        compatible = "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
                         interrupts = <45 2>;
                         interrupt-parent = <&mpic>;
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0xfe>;
-                        descriptor-types-mask = <0x12b0ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0xfe>;
+                        fsl,descriptor-types-mask = <0x12b0ebf>;
                 };
 
                 mpic: pic@40000 {
-                        clock-frequency = <0>;
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
-                        big-endian;
                 };
 
                 par_io@e0100 {
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
index 66f27ab613a2..08c61e3daecc 100644
--- a/arch/powerpc/boot/dts/mpc8572ds.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -42,6 +42,7 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
+                        next-level-cache = <&L2>;
                 };
 
                 PowerPC,8572@1 {
@@ -54,6 +55,7 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -84,7 +86,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,mpc8572-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>; // 32 bytes
@@ -115,6 +117,88 @@
                         dfsrr;
                 };
 
+                dma@c300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8572-dma", "fsl,eloplus-dma";
+                        reg = <0xc300 0x4>;
+                        ranges = <0x0 0xc100 0x200>;
+                        cell-index = <1>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8572-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <76 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8572-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <77 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8572-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <78 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8572-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <79 2>;
+                        };
+                };
+
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8572-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8572-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8572-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8572-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8572-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -221,15 +305,41 @@
                         fsl,has-rstcr;
                 };
 
+                msi@41600 {
+                        compatible = "fsl,mpc8572-msi", "fsl,mpic-msi";
+                        reg = <0x41600 0x80>;
+                        msi-available-ranges = <0 0x100>;
+                        interrupts = <
+                                0xe0 0
+                                0xe1 0
+                                0xe2 0
+                                0xe3 0
+                                0xe4 0
+                                0xe5 0
+                                0xe6 0
+                                0xe7 0>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                crypto@30000 {
+                        compatible = "fsl,sec3.0", "fsl,sec2.4", "fsl,sec2.2",
+                                     "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2 58 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x9fe>;
+                        fsl,descriptor-types-mask = <0x3ab0ebf>;
+                };
+
                 mpic: pic@40000 {
-                        clock-frequency = <0>;
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
-                        big-endian;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index fa9b6bbeb5af..981941e5d7a5 100644
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -172,14 +172,28 @@
                 };
 
                 mpic: interrupt-controller@40000 {
-                        clock-frequency = <0>;
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
-                        big-endian;
+                };
+
+                msi@41600 {
+                        compatible = "fsl,mpc8610-msi", "fsl,mpic-msi";
+                        reg = <0x41600 0x80>;
+                        msi-available-ranges = <0 0x100>;
+                        interrupts = <
+                                0xe0 0
+                                0xe1 0
+                                0xe2 0
+                                0xe3 0
+                                0xe4 0
+                                0xe5 0
+                                0xe6 0
+                                0xe7 0>;
+                        interrupt-parent = <&mpic>;
                 };
 
                 global-utilities@e0000 {
@@ -349,7 +363,7 @@
                         0xe000 0 0 4 &mpic 1 1
 
                         /* IDSEL 0x1f */
-                        0xf800 0 0 1 &mpic 3 0
+                        0xf800 0 0 1 &mpic 3 2
                         0xf800 0 0 2 &mpic 0 1
                 >;
 
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 1e4bfe9cadb9..ae08761ffff1 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -134,6 +134,47 @@
                         dfsrr;
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8641-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -239,14 +280,12 @@
                 };
 
                 mpic: pic@40000 {
-                        clock-frequency = <0>;
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
-                        big-endian;
                 };
 
                 global-utilities@e0000 {
diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts
index 765e43c997da..bd700651f360 100644
--- a/arch/powerpc/boot/dts/mpc866ads.dts
+++ b/arch/powerpc/boot/dts/mpc866ads.dts
@@ -171,6 +171,17 @@
                                 fsl,cpm-command = <0000>;
                                 linux,network-index = <1>;
                         };
+
+                        i2c@860 {
+                                compatible = "fsl,mpc866-i2c",
+                                             "fsl,cpm1-i2c";
+                                reg = <0x860 0x20 0x3c80 0x30>;
+                                interrupts = <16>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-command = <0x10>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/mpc885ads.dts b/arch/powerpc/boot/dts/mpc885ads.dts
index 9895043722b9..b123e9f7a5a8 100644
--- a/arch/powerpc/boot/dts/mpc885ads.dts
+++ b/arch/powerpc/boot/dts/mpc885ads.dts
@@ -215,6 +215,17 @@
                                 fsl,cpm-command = <0x80>;
                                 linux,network-index = <2>;
                         };
+
+                        i2c@860 {
+                                compatible = "fsl,mpc885-i2c",
+                                             "fsl,cpm1-i2c";
+                                reg = <0x860 0x20 0x3c80 0x30>;
+                                interrupts = <16>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-command = <0x10>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/ps3.dts b/arch/powerpc/boot/dts/ps3.dts
index 379ded282d5e..96ba5b512afe 100644
--- a/arch/powerpc/boot/dts/ps3.dts
+++ b/arch/powerpc/boot/dts/ps3.dts
@@ -18,6 +18,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+/dts-v1/;
+
 / {
         model = "SonyPS3";
         compatible = "sony,ps3";
@@ -34,7 +36,7 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0 0 0>;
+                reg = <0x00000000 0x00000000 0x00000000 0x00000000>;
         };
 
         /*
@@ -55,14 +57,14 @@
 
                 cpu@0 {
                         device_type = "cpu";
-                        reg = <0>;
-                        ibm,ppc-interrupt-server#s = <0 1>;
+                        reg = <0x00000000>;
+                        ibm,ppc-interrupt-server#s = <0x0 0x1>;
                         clock-frequency = <0>;
                         timebase-frequency = <0>;
-                        i-cache-size = <8000>;
-                        d-cache-size = <8000>;
-                        i-cache-line-size = <80>;
-                        d-cache-line-size = <80>;
+                        i-cache-size = <32768>;
+                        d-cache-size = <32768>;
+                        i-cache-line-size = <128>;
+                        d-cache-line-size = <128>;
                 };
         };
 };
diff --git a/arch/powerpc/boot/dts/rainier.dts b/arch/powerpc/boot/dts/rainier.dts
index 6a8fa7089ea2..9684c80e4093 100644
--- a/arch/powerpc/boot/dts/rainier.dts
+++ b/arch/powerpc/boot/dts/rainier.dts
@@ -12,12 +12,14 @@
  *
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,rainier";
         compatible = "amcc,rainier";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC0;
@@ -35,13 +37,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,440GRx";
-                        reg = <0>;
+                        reg = <0x00000000>;
                         clock-frequency = <0>; /* Filled in by zImage */
                         timebase-frequency = <0>; /* Filled in by zImage */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <8000>;
-                        d-cache-size = <8000>;
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <32768>;
+                        d-cache-size = <32768>;
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -49,14 +51,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0 0>; /* Filled in by zImage */
+                reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */
         };
 
         UIC0: interrupt-controller0 {
                 compatible = "ibm,uic-440grx","ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -66,11 +68,11 @@
                 compatible = "ibm,uic-440grx","ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -78,22 +80,22 @@
                 compatible = "ibm,uic-440grx","ibm,uic";
                 interrupt-controller;
                 cell-index = <2>;
-                dcr-reg = <0e0 009>;
+                dcr-reg = <0x0e0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1c 4 1d 4>; /* cascade */
+                interrupts = <0x1c 0x4 0x1d 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
         SDR0: sdr {
                 compatible = "ibm,sdr-440grx", "ibm,sdr-440ep";
-                dcr-reg = <00e 002>;
+                dcr-reg = <0x00e 0x002>;
         };
 
         CPR0: cpr {
                 compatible = "ibm,cpr-440grx", "ibm,cpr-440ep";
-                dcr-reg = <00c 002>;
+                dcr-reg = <0x00c 0x002>;
         };
 
         plb {
@@ -105,80 +107,80 @@
 
                 SDRAM0: sdram {
                         compatible = "ibm,sdram-440grx", "ibm,sdram-44x-ddr2denali";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 DMA0: dma {
                         compatible = "ibm,dma-440grx", "ibm,dma-4xx";
-                        dcr-reg = <100 027>;
+                        dcr-reg = <0x100 0x027>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-440grx", "ibm,mcmal2";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <2>;
                         num-rx-chans = <2>;
                         interrupt-parent = <&MAL0>;
-                        interrupts = <0 1 2 3 4>;
+                        interrupts = <0x0 0x1 0x2 0x3 0x4>;
                         #interrupt-cells = <1>;
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-                                        /*RXEOB*/ 1 &UIC0 b 4
-                                        /*SERR*/  2 &UIC1 0 4
-                                        /*TXDE*/  3 &UIC1 1 4
-                                        /*RXDE*/  4 &UIC1 2 4>;
-                        interrupt-map-mask = <ffffffff>;
+                        interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4
+                                        /*RXEOB*/ 0x1 &UIC0 0xb 0x4
+                                        /*SERR*/  0x2 &UIC1 0x0 0x4
+                                        /*TXDE*/  0x3 &UIC1 0x1 0x4
+                                        /*RXDE*/  0x4 &UIC1 0x2 0x4>;
+                        interrupt-map-mask = <0xffffffff>;
                 };
 
                 POB0: opb {
                         compatible = "ibm,opb-440grx", "ibm,opb";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges = <00000000 1 00000000 80000000
-                                  80000000 1 80000000 80000000>;
+                        ranges = <0x00000000 0x00000001 0x00000000 0x80000000
+                                  0x80000000 0x00000001 0x80000000 0x80000000>;
                         interrupt-parent = <&UIC1>;
-                        interrupts = <7 4>;
+                        interrupts = <0x7 0x4>;
                         clock-frequency = <0>; /* Filled in by zImage */
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-440grx", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                interrupts = <5 1>;
+                                interrupts = <0x5 0x1>;
                                 interrupt-parent = <&UIC1>;
 
                                 nor_flash@0,0 {
                                         compatible = "amd,s29gl256n", "cfi-flash";
                                         bank-width = <2>;
-                                        reg = <0 000000 4000000>;
+                                        reg = <0x00000000 0x00000000 0x04000000>;
                                         #address-cells = <1>;
                                         #size-cells = <1>;
                                         partition@0 {
                                                 label = "Kernel";
-                                                reg = <0 180000>;
+                                                reg = <0x00000000 0x00180000>;
                                         };
                                         partition@180000 {
                                                 label = "ramdisk";
-                                                reg = <180000 200000>;
+                                                reg = <0x00180000 0x00200000>;
                                         };
                                         partition@380000 {
                                                 label = "file system";
-                                                reg = <380000 3aa0000>;
+                                                reg = <0x00380000 0x03aa0000>;
                                         };
                                         partition@3e20000 {
                                                 label = "kozio";
-                                                reg = <3e20000 140000>;
+                                                reg = <0x03e20000 0x00140000>;
                                         };
                                         partition@3f60000 {
                                                 label = "env";
-                                                reg = <3f60000 40000>;
+                                                reg = <0x03f60000 0x00040000>;
                                         };
                                         partition@3fa0000 {
                                                 label = "u-boot";
-                                                reg = <3fa0000 60000>;
+                                                reg = <0x03fa0000 0x00060000>;
                                         };
                                 };
 
@@ -187,69 +189,69 @@
                         UART0: serial@ef600300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600300 8>;
-                                virtual-reg = <ef600300>;
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                current-speed = <1c200>;
+                                current-speed = <115200>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <0 4>;
+                                interrupts = <0x0 0x4>;
                         };
 
                         UART1: serial@ef600400 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600400 8>;
-                                virtual-reg = <ef600400>;
+                                reg = <0xef600400 0x00000008>;
+                                virtual-reg = <0xef600400>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         UART2: serial@ef600500 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600500 8>;
-                                virtual-reg = <ef600500>;
+                                reg = <0xef600500 0x00000008>;
+                                virtual-reg = <0xef600500>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <3 4>;
+                                interrupts = <0x3 0x4>;
                         };
 
                         UART3: serial@ef600600 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600600 8>;
-                                virtual-reg = <ef600600>;
+                                reg = <0xef600600 0x00000008>;
+                                virtual-reg = <0xef600600>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <4 4>;
+                                interrupts = <0x4 0x4>;
                         };
 
                         IIC0: i2c@ef600700 {
                                 compatible = "ibm,iic-440grx", "ibm,iic";
-                                reg = <ef600700 14>;
+                                reg = <0xef600700 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
 
                         IIC1: i2c@ef600800 {
                                 compatible = "ibm,iic-440grx", "ibm,iic";
-                                reg = <ef600800 14>;
+                                reg = <0xef600800 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <7 4>;
+                                interrupts = <0x7 0x4>;
                         };
 
                         ZMII0: emac-zmii@ef600d00 {
                                 compatible = "ibm,zmii-440grx", "ibm,zmii";
-                                reg = <ef600d00 c>;
+                                reg = <0xef600d00 0x0000000c>;
                         };
 
                         RGMII0: emac-rgmii@ef601000 {
                                 compatible = "ibm,rgmii-440grx", "ibm,rgmii";
-                                reg = <ef601000 8>;
+                                reg = <0xef601000 0x00000008>;
                                 has-mdio;
                         };
 
@@ -257,23 +259,23 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4";
                                 interrupt-parent = <&EMAC0>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC0 18 4
-                                                /*Wake*/  1 &UIC1 1d 4>;
-                                reg = <ef600e00 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4
+                                                /*Wake*/  0x1 &UIC1 0x1d 0x4>;
+                                reg = <0xef600e00 0x00000074>;
                                 local-mac-address = [000000000000];
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <0>;
                                 rgmii-device = <&RGMII0>;
@@ -286,23 +288,23 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4";
                                 interrupt-parent = <&EMAC1>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC0 19 4
-                                                /*Wake*/  1 &UIC1 1f 4>;
-                                reg = <ef600f00 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4
+                                                /*Wake*/  0x1 &UIC1 0x1f 0x4>;
+                                reg = <0xef600f00 0x00000074>;
                                 local-mac-address = [000000000000];
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <1>;
                                 mal-rx-channel = <1>;
                                 cell-index = <1>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <1>;
                                 rgmii-device = <&RGMII0>;
@@ -319,24 +321,25 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb440grx-pci", "ibm,plb-pci";
                         primary;
-                        reg = <1 eec00000 8     /* Config space access */
-                               1 eed00000 4     /* IACK */
-                               1 eed00000 4     /* Special cycle */
-                               1 ef400000 40>;  /* Internal registers */
+                        reg = <0x00000001 0xeec00000 0x00000008 /* Config space access */
+                               0x00000001 0xeed00000 0x00000004 /* IACK */
+                               0x00000001 0xeed00000 0x00000004 /* Special cycle */
+                               0x00000001 0xef400000 0x00000040>;       /* Internal registers */
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed. Chip supports a second
                          * IO range but we don't use it for now
                          */
-                        ranges = <02000000 0 80000000 1 80000000 0 10000000
-                                01000000 0 00000000 1 e8000000 0 00100000>;
+                        ranges = <0x02000000 0x0 0x80000000 0x1 0x80000000 0x0 0x40000000
+                                0x01000000 0x0 0x00000000 0x1 0xe8000000 0x0 0x00010000
+                                0x01000000 0x0 0x00000000 0x1 0xe8800000 0x0 0x03800000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* All PCI interrupts are routed to IRQ 67 */
-                        interrupt-map-mask = <0000 0 0 0>;
-                        interrupt-map = < 0000 0 0 0 &UIC2 3 8 >;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x0>;
+                        interrupt-map = < 0x0 0x0 0x0 0x0 &UIC2 0x3 0x8 >;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/sam440ep.dts b/arch/powerpc/boot/dts/sam440ep.dts
new file mode 100644
index 000000000000..f0663be10421
--- /dev/null
+++ b/arch/powerpc/boot/dts/sam440ep.dts
@@ -0,0 +1,293 @@
+/*
+ * Device Tree Source for ACube Sam440ep  based off bamboo.dts code 
+ * original copyrights below 
+ *
+ * Copyright (c) 2006, 2007 IBM Corp.
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * Modified from bamboo.dts for sam440ep:
+ * Copyright 2008 Giuseppe Coviello <gicoviello@gmail.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+/ {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        model = "acube,sam440ep";
+        compatible = "acube,sam440ep";
+
+        aliases {
+                ethernet0 = &EMAC0;
+                ethernet1 = &EMAC1;
+                serial0 = &UART0;
+                serial1 = &UART1;
+                serial2 = &UART2;
+                serial3 = &UART3;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        model = "PowerPC,440EP";
+                        reg = <0>;
+                        clock-frequency = <0>; /* Filled in by zImage */
+                        timebase-frequency = <0>; /* Filled in by zImage */
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <32768>;
+                        d-cache-size = <32768>;
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0 0>; /* Filled in by zImage */
+        };
+
+        UIC0: interrupt-controller0 {
+                compatible = "ibm,uic-440ep","ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0x0c0 9>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+
+        UIC1: interrupt-controller1 {
+                compatible = "ibm,uic-440ep","ibm,uic";
+                interrupt-controller;
+                cell-index = <1>;
+                dcr-reg = <0x0d0 9>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <0x1e 4 0x1f 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        SDR0: sdr {
+                compatible = "ibm,sdr-440ep";
+                dcr-reg = <0x00e 2>;
+        };
+
+        CPR0: cpr {
+                compatible = "ibm,cpr-440ep";
+                dcr-reg = <0x00c 2>;
+        };
+
+        plb {
+                compatible = "ibm,plb-440ep", "ibm,plb-440gp", "ibm,plb4";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by zImage */
+
+                SDRAM0: sdram {
+                        compatible = "ibm,sdram-440ep", "ibm,sdram-405gp";
+                        dcr-reg = <0x010 2>;
+                };
+
+                DMA0: dma {
+                        compatible = "ibm,dma-440ep", "ibm,dma-440gp";
+                        dcr-reg = <0x100 0x027>;
+                };
+
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal";
+                        dcr-reg = <0x180 0x062>;
+                        num-tx-chans = <4>;
+                        num-rx-chans = <2>;
+                        interrupt-parent = <&MAL0>;
+                        interrupts = <0 1 2 3 4>;
+                        #interrupt-cells = <1>;
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        interrupt-map = </*TXEOB*/ 0 &UIC0 10 4
+                                        /*RXEOB*/ 1 &UIC0 11 4
+                                        /*SERR*/  2 &UIC1 0 4
+                                        /*TXDE*/  3 &UIC1 1 4
+                                        /*RXDE*/  4 &UIC1 2 4>;
+                };
+
+                POB0: opb {
+                        compatible = "ibm,opb-440ep", "ibm,opb-440gp", "ibm,opb";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        /* Bamboo is oddball in the 44x world and doesn't use the ERPN
+                         * bits.
+                         */
+                        ranges = <0x00000000 0 0x00000000 0x80000000
+                                  0x80000000 0 0x80000000 0x80000000>;
+                        interrupt-parent = <&UIC1>;
+                        interrupts = <7 4>;
+                        clock-frequency = <0>; /* Filled in by zImage */
+
+                        EBC0: ebc {
+                                compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc";
+                                dcr-reg = <0x012 2>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                interrupts = <5 1>;
+                                interrupt-parent = <&UIC1>;
+                        };
+
+                        UART0: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <0xef600300 8>;
+                                virtual-reg = <0xef600300>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                current-speed = <0x1c200>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <0 4>;
+                        };
+
+                        UART1: serial@ef600400 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <0xef600400 8>;
+                                virtual-reg = <0xef600400>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+
+                        UART2: serial@ef600500 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <0xef600500 8>;
+                                virtual-reg = <0xef600500>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <3 4>;
+                        };
+
+                        UART3: serial@ef600600 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <0xef600600 8>;
+                                virtual-reg = <0xef600600>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <4 4>;
+                        };
+
+                        IIC0: i2c@ef600700 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
+                                index = <0>;
+                                reg = <0xef600700 0x14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                                rtc@68 {
+                                        compatible = "stm,m41t80";
+                                        reg = <0x68>;
+                                };
+                        };
+
+                        IIC1: i2c@ef600800 {
+                                compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
+                                index = <5>;
+                                reg = <0xef600800 0x14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <7 4>;
+                        };
+
+                        ZMII0: emac-zmii@ef600d00 {
+                                compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii";
+                                reg = <0xef600d00 0xc>;
+                        };
+
+                        EMAC0: ethernet@ef600e00 {
+                                linux,network-index = <0>;
+                                device_type = "network";
+                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <0x1c 4 0x1d 4>;
+                                reg = <0xef600e00 0x70>;
+                                local-mac-address = [000000000000];
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <0 1>;
+                                mal-rx-channel = <0>;
+                                cell-index = <0>;
+                                max-frame-size = <0x5dc>;
+                                rx-fifo-size = <0x1000>;
+                                tx-fifo-size = <0x800>;
+                                phy-mode = "rmii";
+                                phy-map = <00000000>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <0>;
+                        };
+
+                        EMAC1: ethernet@ef600f00 {
+                                linux,network-index = <1>;
+                                device_type = "network";
+                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <0x1e 4 0x1f 4>;
+                                reg = <0xef600f00 0x70>;
+                                local-mac-address = [000000000000];
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <2 3>;
+                                mal-rx-channel = <1>;
+                                cell-index = <1>;
+                                max-frame-size = <0x5dc>;
+                                rx-fifo-size = <0x1000>;
+                                tx-fifo-size = <0x800>;
+                                phy-mode = "rmii";
+                                phy-map = <00000000>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <1>;
+                        };
+                        usb@ef601000 {
+                                compatible = "ohci-be";
+                                reg = <0xef601000 0x80>;
+                                interrupts = <8 4 9 4>;
+                                interrupt-parent = <&UIC1>;
+                        };      
+                };
+
+                PCI0: pci@ec000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "ibm,plb440ep-pci", "ibm,plb-pci";
+                        primary;
+                        reg = <0 0xeec00000 8      /* Config space access */
+                               0 0xeed00000 4      /* IACK */
+                               0 0xeed00000 4      /* Special cycle */
+                               0 0xef400000 0x40>; /* Internal registers */
+
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed. Chip supports a second
+                         * IO range but we don't use it for now
+                         */
+                        ranges = <0x02000000 0 0xa0000000 0 0xa0000000 0 0x20000000
+                                  0x01000000 0 0x00000000 0 0xe8000000 0 0x00010000>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <0x42000000 0 0 0 0 0 0x80000000>;
+                };
+        };
+
+        chosen {
+                linux,stdout-path = "/plb/opb/serial@ef600300";
+        };
+};
diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts
index 3839d4b7d6a7..45f789b56709 100644
--- a/arch/powerpc/boot/dts/sbc8349.dts
+++ b/arch/powerpc/boot/dts/sbc8349.dts
@@ -95,6 +95,41 @@
                         mode = "cpu";
                 };
 
+                dma@82a8 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8349-dma", "fsl,elo-dma";
+                        reg = <0x82a8 4>;
+                        ranges = <0 0x8100 0x1a8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <71 8>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
+                                reg = <0x180 0x28>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <71 8>;
+                        };
+                };
+
                 /* phy type (ULPI or SERIAL) are only types supported for MPH */
                 /* port = 0 or 1 */
                 usb@22000 {
@@ -186,19 +221,15 @@
                         interrupt-parent = <&ipic>;
                 };
 
-                /* May need to remove if on a part without crypto engine */
                 crypto@30000 {
-                        model = "SEC2";
-                        compatible = "talitos";
+                        compatible = "fsl,sec2.0";
                         reg = <0x30000 0x10000>;
                         interrupts = <11 0x8>;
                         interrupt-parent = <&ipic>;
-                        num-channels = <4>;
-                        channel-fifo-len = <24>;
-                        exec-units-mask = <0x0000007e>;
-                        /* desc mask is for rev2.0,
-                         * we need runtime fixup for >2.0 */
-                        descriptor-types-mask = <0x01010ebf>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x7e>;
+                        fsl,descriptor-types-mask = <0x01010ebf>;
                 };
 
                 /* IPIC
diff --git a/arch/powerpc/boot/dts/sbc8548.dts b/arch/powerpc/boot/dts/sbc8548.dts
index 22d967178fe9..333552b4e90d 100644
--- a/arch/powerpc/boot/dts/sbc8548.dts
+++ b/arch/powerpc/boot/dts/sbc8548.dts
@@ -44,6 +44,7 @@
                         timebase-frequency = <0>;       // From uboot
                         bus-frequency = <0>;
                         clock-frequency = <0>;
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -161,7 +162,7 @@
                         interrupts = <0x12 0x2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8548-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <0x20>;       // 32 bytes
@@ -192,6 +193,47 @@
                         dfsrr;
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8548-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -262,15 +304,24 @@
                         fsl,has-rstcr;
                 };
 
+                crypto@30000 {
+                        compatible = "fsl,sec2.1", "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0xfe>;
+                        fsl,descriptor-types-mask = <0x12b0ebf>;
+                };
+
                 mpic: pic@40000 {
                         interrupt-controller;
                         #address-cells = <0>;
-                        #size-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
-                        big-endian;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/sbc8560.dts b/arch/powerpc/boot/dts/sbc8560.dts
index 0476802fba60..db3632ef9888 100644
--- a/arch/powerpc/boot/dts/sbc8560.dts
+++ b/arch/powerpc/boot/dts/sbc8560.dts
@@ -43,6 +43,7 @@
                         timebase-frequency = <0>;       // From uboot
                         bus-frequency = <0>;
                         clock-frequency = <0>;
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -66,7 +67,7 @@
                         interrupts = <0x12 0x2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8560-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <0x20>;       // 32 bytes
@@ -97,6 +98,47 @@
                         dfsrr;
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8560-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -155,8 +197,8 @@
                 mpic: pic@40000 {
                         interrupt-controller;
                         #address-cells = <0>;
-                        #size-cells = <0>;
                         #interrupt-cells = <2>;
+                        compatible = "chrp,open-pic";
                         reg = <0x40000 0x40000>;
                         device_type = "open-pic";
                 };
diff --git a/arch/powerpc/boot/dts/sbc8641d.dts b/arch/powerpc/boot/dts/sbc8641d.dts
index 3eebeec157b3..9652456158fb 100644
--- a/arch/powerpc/boot/dts/sbc8641d.dts
+++ b/arch/powerpc/boot/dts/sbc8641d.dts
@@ -151,6 +151,47 @@
                         dfsrr;
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8641-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 72d67564bdfc..72d15f075d34 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -12,12 +12,14 @@
  *
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,sequoia";
         compatible = "amcc,sequoia";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC0;
@@ -35,13 +37,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,440EPx";
-                        reg = <0>;
+                        reg = <0x00000000>;
                         clock-frequency = <0>; /* Filled in by zImage */
                         timebase-frequency = <0>; /* Filled in by zImage */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <8000>;
-                        d-cache-size = <8000>;
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <32768>;
+                        d-cache-size = <32768>;
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -49,14 +51,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0 0>; /* Filled in by zImage */
+                reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */
         };
 
         UIC0: interrupt-controller0 {
                 compatible = "ibm,uic-440epx","ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -66,11 +68,11 @@
                 compatible = "ibm,uic-440epx","ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
@@ -78,22 +80,22 @@
                 compatible = "ibm,uic-440epx","ibm,uic";
                 interrupt-controller;
                 cell-index = <2>;
-                dcr-reg = <0e0 009>;
+                dcr-reg = <0x0e0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1c 4 1d 4>; /* cascade */
+                interrupts = <0x1c 0x4 0x1d 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
         SDR0: sdr {
                 compatible = "ibm,sdr-440epx", "ibm,sdr-440ep";
-                dcr-reg = <00e 002>;
+                dcr-reg = <0x00e 0x002>;
         };
 
         CPR0: cpr {
                 compatible = "ibm,cpr-440epx", "ibm,cpr-440ep";
-                dcr-reg = <00c 002>;
+                dcr-reg = <0x00c 0x002>;
         };
 
         plb {
@@ -105,44 +107,44 @@
 
                 SDRAM0: sdram {
                         compatible = "ibm,sdram-440epx", "ibm,sdram-44x-ddr2denali";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 DMA0: dma {
                         compatible = "ibm,dma-440epx", "ibm,dma-4xx";
-                        dcr-reg = <100 027>;
+                        dcr-reg = <0x100 0x027>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-440epx", "ibm,mcmal2";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <2>;
                         num-rx-chans = <2>;
                         interrupt-parent = <&MAL0>;
-                        interrupts = <0 1 2 3 4>;
+                        interrupts = <0x0 0x1 0x2 0x3 0x4>;
                         #interrupt-cells = <1>;
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-                                        /*RXEOB*/ 1 &UIC0 b 4
-                                        /*SERR*/  2 &UIC1 0 4
-                                        /*TXDE*/  3 &UIC1 1 4
-                                        /*RXDE*/  4 &UIC1 2 4>;
-                        interrupt-map-mask = <ffffffff>;
+                        interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4
+                                        /*RXEOB*/ 0x1 &UIC0 0xb 0x4
+                                        /*SERR*/  0x2 &UIC1 0x0 0x4
+                                        /*TXDE*/  0x3 &UIC1 0x1 0x4
+                                        /*RXDE*/  0x4 &UIC1 0x2 0x4>;
+                        interrupt-map-mask = <0xffffffff>;
                 };
 
                 USB1: usb@e0000400 {
                         compatible = "ohci-be";
-                        reg = <0 e0000400 60>;
+                        reg = <0x00000000 0xe0000400 0x00000060>;
                         interrupt-parent = <&UIC0>;
-                        interrupts = <15 8>;
+                        interrupts = <0x15 0x8>;
                 };
 
                 USB0: ehci@e0000300 {
                         compatible = "ibm,usb-ehci-440epx", "usb-ehci";
                         interrupt-parent = <&UIC0>;
-                        interrupts = <1a 4>;
-                        reg = <0 e0000300 90 0 e0000390 70>;
+                        interrupts = <0x1a 0x4>;
+                        reg = <0x00000000 0xe0000300 0x00000090 0x00000000 0xe0000390 0x00000070>;
                         big-endian;
                 };
 
@@ -150,50 +152,50 @@
                         compatible = "ibm,opb-440epx", "ibm,opb";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges = <00000000 1 00000000 80000000
-                                  80000000 1 80000000 80000000>;
+                        ranges = <0x00000000 0x00000001 0x00000000 0x80000000
+                                  0x80000000 0x00000001 0x80000000 0x80000000>;
                         interrupt-parent = <&UIC1>;
-                        interrupts = <7 4>;
+                        interrupts = <0x7 0x4>;
                         clock-frequency = <0>; /* Filled in by zImage */
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-440epx", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                interrupts = <5 1>;
+                                interrupts = <0x5 0x1>;
                                 interrupt-parent = <&UIC1>;
 
                                 nor_flash@0,0 {
                                         compatible = "amd,s29gl256n", "cfi-flash";
                                         bank-width = <2>;
-                                        reg = <0 000000 4000000>;
+                                        reg = <0x00000000 0x00000000 0x04000000>;
                                         #address-cells = <1>;
                                         #size-cells = <1>;
                                         partition@0 {
                                                 label = "Kernel";
-                                                reg = <0 180000>;
+                                                reg = <0x00000000 0x00180000>;
                                         };
                                         partition@180000 {
                                                 label = "ramdisk";
-                                                reg = <180000 200000>;
+                                                reg = <0x00180000 0x00200000>;
                                         };
                                         partition@380000 {
                                                 label = "file system";
-                                                reg = <380000 3aa0000>;
+                                                reg = <0x00380000 0x03aa0000>;
                                         };
                                         partition@3e20000 {
                                                 label = "kozio";
-                                                reg = <3e20000 140000>;
+                                                reg = <0x03e20000 0x00140000>;
                                         };
                                         partition@3f60000 {
                                                 label = "env";
-                                                reg = <3f60000 40000>;
+                                                reg = <0x03f60000 0x00040000>;
                                         };
                                         partition@3fa0000 {
                                                 label = "u-boot";
-                                                reg = <3fa0000 60000>;
+                                                reg = <0x03fa0000 0x00060000>;
                                         };
                                 };
 
@@ -202,69 +204,69 @@
                         UART0: serial@ef600300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600300 8>;
-                                virtual-reg = <ef600300>;
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                current-speed = <1c200>;
+                                current-speed = <115200>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <0 4>;
+                                interrupts = <0x0 0x4>;
                         };
 
                         UART1: serial@ef600400 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600400 8>;
-                                virtual-reg = <ef600400>;
+                                reg = <0xef600400 0x00000008>;
+                                virtual-reg = <0xef600400>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         UART2: serial@ef600500 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600500 8>;
-                                virtual-reg = <ef600500>;
+                                reg = <0xef600500 0x00000008>;
+                                virtual-reg = <0xef600500>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <3 4>;
+                                interrupts = <0x3 0x4>;
                         };
 
                         UART3: serial@ef600600 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600600 8>;
-                                virtual-reg = <ef600600>;
+                                reg = <0xef600600 0x00000008>;
+                                virtual-reg = <0xef600600>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <4 4>;
+                                interrupts = <0x4 0x4>;
                         };
 
                         IIC0: i2c@ef600700 {
                                 compatible = "ibm,iic-440epx", "ibm,iic";
-                                reg = <ef600700 14>;
+                                reg = <0xef600700 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
 
                         IIC1: i2c@ef600800 {
                                 compatible = "ibm,iic-440epx", "ibm,iic";
-                                reg = <ef600800 14>;
+                                reg = <0xef600800 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <7 4>;
+                                interrupts = <0x7 0x4>;
                         };
 
                         ZMII0: emac-zmii@ef600d00 {
                                 compatible = "ibm,zmii-440epx", "ibm,zmii";
-                                reg = <ef600d00 c>;
+                                reg = <0xef600d00 0x0000000c>;
                         };
 
                         RGMII0: emac-rgmii@ef601000 {
                                 compatible = "ibm,rgmii-440epx", "ibm,rgmii";
-                                reg = <ef601000 8>;
+                                reg = <0xef601000 0x00000008>;
                                 has-mdio;
                         };
 
@@ -272,23 +274,23 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-440epx", "ibm,emac4";
                                 interrupt-parent = <&EMAC0>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC0 18 4
-                                                /*Wake*/  1 &UIC1 1d 4>;
-                                reg = <ef600e00 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC0 0x18 0x4
+                                                /*Wake*/  0x1 &UIC1 0x1d 0x4>;
+                                reg = <0xef600e00 0x00000074>;
                                 local-mac-address = [000000000000];
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <0>;
                                 rgmii-device = <&RGMII0>;
@@ -301,23 +303,23 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-440epx", "ibm,emac4";
                                 interrupt-parent = <&EMAC1>;
-                                interrupts = <0 1>;
+                                interrupts = <0x0 0x1>;
                                 #interrupt-cells = <1>;
                                 #address-cells = <0>;
                                 #size-cells = <0>;
-                                interrupt-map = </*Status*/ 0 &UIC0 19 4
-                                                /*Wake*/  1 &UIC1 1f 4>;
-                                reg = <ef600f00 70>;
+                                interrupt-map = </*Status*/ 0x0 &UIC0 0x19 0x4
+                                                /*Wake*/  0x1 &UIC1 0x1f 0x4>;
+                                reg = <0xef600f00 0x00000074>;
                                 local-mac-address = [000000000000];
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <1>;
                                 mal-rx-channel = <1>;
                                 cell-index = <1>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <1>;
                                 rgmii-device = <&RGMII0>;
@@ -334,10 +336,10 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb440epx-pci", "ibm,plb-pci";
                         primary;
-                        reg = <1 eec00000 8     /* Config space access */
-                               1 eed00000 4     /* IACK */
-                               1 eed00000 4     /* Special cycle */
-                               1 ef400000 40>;  /* Internal registers */
+                        reg = <0x00000001 0xeec00000 0x00000008 /* Config space access */
+                               0x00000001 0xeed00000 0x00000004 /* IACK */
+                               0x00000001 0xeed00000 0x00000004 /* Special cycle */
+                               0x00000001 0xef400000 0x00000040>;       /* Internal registers */
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed. Chip supports a second
@@ -347,16 +349,16 @@
                          * I/O              1 E800 0000     1 E800 FFFF     64KB
                          * I/O              1 E880 0000     1 EBFF FFFF     56MB
                          */
-                        ranges = <02000000 0 80000000 1 80000000 0 40000000
-                                01000000 0 00000000 1 e8000000 0 00010000
-                                01000000 0 00000000 1 e8800000 0 03800000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x00000001 0x80000000 0x00000000 0x40000000
+                                0x01000000 0x00000000 0x00000000 0x00000001 0xe8000000 0x00000000 0x00010000
+                                0x01000000 0x00000000 0x00000000 0x00000001 0xe8800000 0x00000000 0x03800000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* All PCI interrupts are routed to IRQ 67 */
-                        interrupt-map-mask = <0000 0 0 0>;
-                        interrupt-map = < 0000 0 0 0 &UIC2 3 8 >;
+                        interrupt-map-mask = <0x0 0x0 0x0 0x0>;
+                        interrupt-map = < 0x0 0x0 0x0 0x0 &UIC2 0x3 0x8 >;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/storcenter.dts b/arch/powerpc/boot/dts/storcenter.dts
index 5893816c0bce..eab680ce10da 100644
--- a/arch/powerpc/boot/dts/storcenter.dts
+++ b/arch/powerpc/boot/dts/storcenter.dts
@@ -95,6 +95,7 @@
 
                 mpic: interrupt-controller@40000 {
                         #interrupt-cells = <2>;
+                        #address-cells = <0>;
                         device_type = "open-pic";
                         compatible = "chrp,open-pic";
                         interrupt-controller;
diff --git a/arch/powerpc/boot/dts/stx_gp3_8560.dts b/arch/powerpc/boot/dts/stx_gp3_8560.dts
index f81fd7fdb29e..fcd1db6ca0a8 100644
--- a/arch/powerpc/boot/dts/stx_gp3_8560.dts
+++ b/arch/powerpc/boot/dts/stx_gp3_8560.dts
@@ -38,6 +38,7 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -62,7 +63,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8540-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>;
@@ -82,6 +83,47 @@
                         dfsrr;
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8560-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -131,6 +173,7 @@
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
                         device_type = "open-pic";
                 };
 
diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts
index e808e1c5593a..058438f9629b 100644
--- a/arch/powerpc/boot/dts/taishan.dts
+++ b/arch/powerpc/boot/dts/taishan.dts
@@ -10,12 +10,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,taishan";
         compatible = "amcc,taishan";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC2;
@@ -31,13 +33,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,440GX";
-                        reg = <0>;
-                        clock-frequency = <2FAF0800>; // 800MHz
+                        reg = <0x00000000>;
+                        clock-frequency = <800000000>; // 800MHz
                         timebase-frequency = <0>; // Filled in by zImage
-                        i-cache-line-size = <32>;
-                        d-cache-line-size = <32>;
-                        i-cache-size = <8000>; /* 32 kB */
-                        d-cache-size = <8000>; /* 32 kB */
+                        i-cache-line-size = <50>;
+                        d-cache-line-size = <50>;
+                        i-cache-size = <32768>; /* 32 kB */
+                        d-cache-size = <32768>; /* 32 kB */
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -45,7 +47,7 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0 0>; // Filled in by zImage
+                reg = <0x00000000 0x00000000 0x00000000>; // Filled in by zImage
         };
 
 
@@ -53,7 +55,7 @@
                 compatible = "ibm,uic-440gx", "ibm,uic";
                 interrupt-controller;
                 cell-index = <3>;
-                dcr-reg = <200 009>;
+                dcr-reg = <0x200 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -64,11 +66,11 @@
                 compatible = "ibm,uic-440gx", "ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <01 4 00 4>; /* cascade - first non-critical */
+                interrupts = <0x1 0x4 0x0 0x4>; /* cascade - first non-critical */
                 interrupt-parent = <&UICB0>;
 
         };
@@ -77,11 +79,11 @@
                 compatible = "ibm,uic-440gx", "ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <03 4 02 4>; /* cascade */
+                interrupts = <0x3 0x4 0x2 0x4>; /* cascade */
                 interrupt-parent = <&UICB0>;
         };
 
@@ -89,29 +91,29 @@
                 compatible = "ibm,uic-440gx", "ibm,uic";
                 interrupt-controller;
                 cell-index = <2>; /* was 1 */
-                dcr-reg = <210 009>;
+                dcr-reg = <0x210 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <05 4 04 4>; /* cascade */
+                interrupts = <0x5 0x4 0x4 0x4>; /* cascade */
                 interrupt-parent = <&UICB0>;
         };
 
 
         CPC0: cpc {
                 compatible = "ibm,cpc-440gp";
-                dcr-reg = <0b0 003 0e0 010>;
+                dcr-reg = <0x0b0 0x003 0x0e0 0x010>;
                 // FIXME: anything else?
         };
 
         L2C0: l2c {
                 compatible = "ibm,l2-cache-440gx", "ibm,l2-cache";
-                dcr-reg = <20 8                 /* Internal SRAM DCR's */
-                           30 8>;               /* L2 cache DCR's */
-                cache-line-size = <20>;         /* 32 bytes */
-                cache-size = <40000>;           /* L2, 256K */
+                dcr-reg = <0x020 0x008                  /* Internal SRAM DCR's */
+                           0x030 0x008>;                /* L2 cache DCR's */
+                cache-line-size = <32>;         /* 32 bytes */
+                cache-size = <262144>;          /* L2, 256K */
                 interrupt-parent = <&UIC2>;
-                interrupts = <17 1>;
+                interrupts = <0x17 0x1>;
         };
 
         plb {
@@ -119,41 +121,41 @@
                 #address-cells = <2>;
                 #size-cells = <1>;
                 ranges;
-                clock-frequency = <9896800>; // 160MHz
+                clock-frequency = <160000000>; // 160MHz
 
                 SDRAM0: memory-controller {
                         compatible = "ibm,sdram-440gp";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                         // FIXME: anything else?
                 };
 
                 SRAM0: sram {
                         compatible = "ibm,sram-440gp";
-                        dcr-reg = <020 8 00a 1>;
+                        dcr-reg = <0x020 0x008 0x00a 0x001>;
                 };
 
                 DMA0: dma {
                         // FIXME: ???
                         compatible = "ibm,dma-440gp";
-                        dcr-reg = <100 027>;
+                        dcr-reg = <0x100 0x027>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-440gx", "ibm,mcmal2";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <4>;
                         num-rx-chans = <4>;
                         interrupt-parent = <&MAL0>;
-                        interrupts = <0 1 2 3 4>;
+                        interrupts = <0x0 0x1 0x2 0x3 0x4>;
                         #interrupt-cells = <1>;
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-                                         /*RXEOB*/ 1 &UIC0 b 4
-                                         /*SERR*/  2 &UIC1 0 4
-                                         /*TXDE*/  3 &UIC1 1 4
-                                         /*RXDE*/  4 &UIC1 2 4>;
-                        interrupt-map-mask = <ffffffff>;
+                        interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4
+                                         /*RXEOB*/ 0x1 &UIC0 0xb 0x4
+                                         /*SERR*/  0x2 &UIC1 0x0 0x4
+                                         /*TXDE*/  0x3 &UIC1 0x1 0x4
+                                         /*RXDE*/  0x4 &UIC1 0x2 0x4>;
+                        interrupt-map-mask = <0xffffffff>;
                 };
 
                 POB0: opb {
@@ -162,29 +164,56 @@
                         #size-cells = <1>;
                         /* Wish there was a nicer way of specifying a full 32-bit
                            range */
-                        ranges = <00000000 1 00000000 80000000
-                                  80000000 1 80000000 80000000>;
-                        dcr-reg = <090 00b>;
+                        ranges = <0x00000000 0x00000001 0x00000000 0x80000000
+                                  0x80000000 0x00000001 0x80000000 0x80000000>;
+                        dcr-reg = <0x090 0x00b>;
                         interrupt-parent = <&UIC1>;
-                        interrupts = <7 4>;
-                        clock-frequency = <4C4B400>; // 80MHz
+                        interrupts = <0x7 0x4>;
+                        clock-frequency = <80000000>; // 80MHz
 
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-440gx", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
-                                clock-frequency = <4C4B400>; // 80MHz
+                                clock-frequency = <80000000>; // 80MHz
 
                                 /* ranges property is supplied by zImage
                                  * based on firmware's configuration of the
                                  * EBC bridge */
 
-                                interrupts = <5 4>;
+                                interrupts = <0x5 0x4>;
                                 interrupt-parent = <&UIC1>;
 
-                                /* TODO: Add other EBC devices */
+                                nor_flash@0,0 {
+                                        compatible = "cfi-flash";
+                                        bank-width = <4>;
+                                        device-width = <2>;
+                                        reg = <0x0 0x0 0x4000000>;
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+                                        partition@0 {
+                                                label = "kernel";
+                                                reg = <0x0 0x180000>;
+                                        };
+                                        partition@180000 {
+                                                label = "root";
+                                                reg = <0x180000 0x200000>;
+                                        };
+                                        partition@380000 {
+                                                label = "user";
+                                                reg = <0x380000 0x3bc0000>;
+                                        };
+                                        partition@3f40000 {
+                                                label = "env";
+                                                reg = <0x3f40000 0x80000>;
+                                        };
+                                        partition@3fc0000 {
+                                                label = "u-boot";
+                                                reg = <0x3fc0000 0x40000>;
+                                        };
+                                };
                         };
 
 
@@ -192,103 +221,103 @@
                         UART0: serial@40000200 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <40000200 8>;
-                                virtual-reg = <e0000200>;
-                                clock-frequency = <A8C000>;
-                                current-speed = <1C200>; /* 115200 */
+                                reg = <0x40000200 0x00000008>;
+                                virtual-reg = <0xe0000200>;
+                                clock-frequency = <11059200>;
+                                current-speed = <115200>; /* 115200 */
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <0 4>;
+                                interrupts = <0x0 0x4>;
                         };
 
                         UART1: serial@40000300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <40000300 8>;
-                                virtual-reg = <e0000300>;
-                                clock-frequency = <A8C000>;
-                                current-speed = <1C200>; /* 115200 */
+                                reg = <0x40000300 0x00000008>;
+                                virtual-reg = <0xe0000300>;
+                                clock-frequency = <11059200>;
+                                current-speed = <115200>; /* 115200 */
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         IIC0: i2c@40000400 {
                                 /* FIXME */
                                 compatible = "ibm,iic-440gp", "ibm,iic";
-                                reg = <40000400 14>;
+                                reg = <0x40000400 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
                         IIC1: i2c@40000500 {
                                 /* FIXME */
                                 compatible = "ibm,iic-440gp", "ibm,iic";
-                                reg = <40000500 14>;
+                                reg = <0x40000500 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <3 4>;
+                                interrupts = <0x3 0x4>;
                         };
 
                         GPIO0: gpio@40000700 {
                                 /* FIXME */
                                 compatible = "ibm,gpio-440gp";
-                                reg = <40000700 20>;
+                                reg = <0x40000700 0x00000020>;
                         };
 
                         ZMII0: emac-zmii@40000780 {
                                 compatible = "ibm,zmii-440gx", "ibm,zmii";
-                                reg = <40000780 c>;
+                                reg = <0x40000780 0x0000000c>;
                         };
 
                         RGMII0: emac-rgmii@40000790 {
                                 compatible = "ibm,rgmii";
-                                reg = <40000790 8>;
+                                reg = <0x40000790 0x00000008>;
                         };
 
                         TAH0: emac-tah@40000b50 {
                                 compatible = "ibm,tah-440gx", "ibm,tah";
-                                reg = <40000b50 30>;
+                                reg = <0x40000b50 0x00000030>;
                         };
 
                         TAH1: emac-tah@40000d50 {
                                 compatible = "ibm,tah-440gx", "ibm,tah";
-                                reg = <40000d50 30>;
+                                reg = <0x40000d50 0x00000030>;
                         };
 
                         EMAC0: ethernet@40000800 {
-                                unused = <1>;
+                                unused = <0x1>;
                                 device_type = "network";
                                 compatible = "ibm,emac-440gx", "ibm,emac4";
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1c 4 1d 4>;
-                                reg = <40000800 70>;
+                                interrupts = <0x1c 0x4 0x1d 0x4>;
+                                reg = <0x40000800 0x00000074>;
                                 local-mac-address = [000000000000]; // Filled in by zImage
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <5dc>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <1500>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rmii";
-                                phy-map = <00000001>;
+                                phy-map = <0x00000001>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <0>;
                         };
                         EMAC1: ethernet@40000900 {
-                                unused = <1>;
+                                unused = <0x1>;
                                 device_type = "network";
                                 compatible = "ibm,emac-440gx", "ibm,emac4";
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1e 4 1f 4>;
-                                reg = <40000900 70>;
+                                interrupts = <0x1e 0x4 0x1f 0x4>;
+                                reg = <0x40000900 0x00000074>;
                                 local-mac-address = [000000000000]; // Filled in by zImage
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <1>;
                                 mal-rx-channel = <1>;
                                 cell-index = <1>;
-                                max-frame-size = <5dc>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <1500>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rmii";
-                                phy-map = <00000001>;
+                                phy-map = <0x00000001>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <1>;
                         };
@@ -297,18 +326,18 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-440gx", "ibm,emac4";
                                 interrupt-parent = <&UIC2>;
-                                interrupts = <0 4 1 4>;
-                                reg = <40000c00 70>;
+                                interrupts = <0x0 0x4 0x1 0x4>;
+                                reg = <0x40000c00 0x00000074>;
                                 local-mac-address = [000000000000]; // Filled in by zImage
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <2>;
                                 mal-rx-channel = <2>;
                                 cell-index = <2>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000001>;
+                                phy-map = <0x00000001>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <0>;
                                 zmii-device = <&ZMII0>;
@@ -321,18 +350,18 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-440gx", "ibm,emac4";
                                 interrupt-parent = <&UIC2>;
-                                interrupts = <2 4 3 4>;
-                                reg = <40000e00 70>;
+                                interrupts = <0x2 0x4 0x3 0x4>;
+                                reg = <0x40000e00 0x00000074>;
                                 local-mac-address = [000000000000]; // Filled in by zImage
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <3>;
                                 mal-rx-channel = <3>;
                                 cell-index = <3>;
-                                max-frame-size = <2328>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rgmii";
-                                phy-map = <00000003>;
+                                phy-map = <0x00000003>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <1>;
                                 zmii-device = <&ZMII0>;
@@ -344,9 +373,9 @@
 
                         GPT0: gpt@40000a00 {
                                 /* FIXME */
-                                reg = <40000a00 d4>;
+                                reg = <0x40000a00 0x000000d4>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <12 4 13 4 14 4 15 4 16 4>;
+                                interrupts = <0x12 0x4 0x13 0x4 0x14 0x4 0x15 0x4 0x16 0x4>;
                         };
 
                 };
@@ -360,34 +389,34 @@
                         primary;
                         large-inbound-windows;
                         enable-msi-hole;
-                        reg = <2 0ec00000   8   /* Config space access */
-                               0 0 0            /* no IACK cycles */
-                               2 0ed00000   4   /* Special cycles */
-                               2 0ec80000 100   /* Internal registers */
-                               2 0ec80100  fc>; /* Internal messaging registers */
+                        reg = <0x00000002 0x0ec00000   0x00000008       /* Config space access */
+                               0x00000000 0x00000000 0x00000000         /* no IACK cycles */
+                               0x00000002 0x0ed00000   0x00000004   /* Special cycles */
+                               0x00000002 0x0ec80000 0x00000100 /* Internal registers */
+                               0x00000002 0x0ec80100  0x000000fc>;      /* Internal messaging registers */
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed
                          */
-                        ranges = <02000000 0 80000000 00000003 80000000 0 80000000
-                                  01000000 0 00000000 00000002 08000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x00000003 0x80000000 0x00000000 0x80000000
+                                  0x01000000 0x00000000 0x00000000 0x00000002 0x08000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
-                        interrupt-map-mask = <f800 0 0 7>;
+                        interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                         interrupt-map = <
                                 /* IDSEL 1 */
-                                0800 0 0 1 &UIC0 17 8
-                                0800 0 0 2 &UIC0 18 8
-                                0800 0 0 3 &UIC0 19 8
-                                0800 0 0 4 &UIC0 1a 8
+                                0x800 0x0 0x0 0x1 &UIC0 0x17 0x8
+                                0x800 0x0 0x0 0x2 &UIC0 0x18 0x8
+                                0x800 0x0 0x0 0x3 &UIC0 0x19 0x8
+                                0x800 0x0 0x0 0x4 &UIC0 0x1a 0x8
 
                                 /* IDSEL 2 */
-                                1000 0 0 1 &UIC0 18 8
-                                1000 0 0 2 &UIC0 19 8
-                                1000 0 0 3 &UIC0 1a 8
-                                1000 0 0 4 &UIC0 17 8
+                                0x1000 0x0 0x0 0x1 &UIC0 0x18 0x8
+                                0x1000 0x0 0x0 0x2 &UIC0 0x19 0x8
+                                0x1000 0x0 0x0 0x3 &UIC0 0x1a 0x8
+                                0x1000 0x0 0x0 0x4 &UIC0 0x17 0x8
                         >;
                 };
         };
diff --git a/arch/powerpc/boot/dts/tqm5200.dts b/arch/powerpc/boot/dts/tqm5200.dts
index 773a68e00058..3008bf8830c1 100644
--- a/arch/powerpc/boot/dts/tqm5200.dts
+++ b/arch/powerpc/boot/dts/tqm5200.dts
@@ -70,6 +70,20 @@
                         fsl,has-wdt;
                 };
 
+                can@900 {
+                        compatible = "fsl,mpc5200-mscan";
+                        interrupts = <2 17 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                        reg = <0x900 0x80>;
+                };
+
+                can@980 {
+                        compatible = "fsl,mpc5200-mscan";
+                        interrupts = <2 18 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                        reg = <0x980 0x80>;
+                };
+
                 gpio@b00 {
                         compatible = "fsl,mpc5200-gpio";
                         reg = <0xb00 0x40>;
diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts
index 1addb3ae719e..e1d260b9085e 100644
--- a/arch/powerpc/boot/dts/tqm8540.dts
+++ b/arch/powerpc/boot/dts/tqm8540.dts
@@ -12,8 +12,8 @@
 /dts-v1/;
 
 / {
-        model = "tqm,8540";
-        compatible = "tqm,8540", "tqm,85xx";
+        model = "tqc,tqm8540";
+        compatible = "tqc,tqm8540";
         #address-cells = <1>;
         #size-cells = <1>;
 
@@ -40,6 +40,7 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -64,7 +65,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8540-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>;
@@ -89,6 +90,47 @@
                         };
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8540-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8540-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8540-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8540-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8540-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -177,6 +219,7 @@
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         device_type = "open-pic";
+                        compatible = "chrp,open-pic";
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts
index 9e01093f496e..d76441ec5dc7 100644
--- a/arch/powerpc/boot/dts/tqm8541.dts
+++ b/arch/powerpc/boot/dts/tqm8541.dts
@@ -12,8 +12,8 @@
 /dts-v1/;
 
 / {
-        model = "tqm,8541";
-        compatible = "tqm,8541", "tqm,85xx";
+        model = "tqc,tqm8541";
+        compatible = "tqc,tqm8541";
         #address-cells = <1>;
         #size-cells = <1>;
 
@@ -39,6 +39,7 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -63,7 +64,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8540-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>;
@@ -88,6 +89,47 @@
                         };
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8541-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8541-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8541-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8541-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8541-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -158,12 +200,24 @@
                         interrupt-parent = <&mpic>;
                 };
 
+                crypto@30000 {
+                        compatible = "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x7e>;
+                        fsl,descriptor-types-mask = <0x01010ebf>;
+                };
+
                 mpic: pic@40000 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         device_type = "open-pic";
+                        compatible = "chrp,open-pic";
                 };
 
                 cpm@919c0 {
diff --git a/arch/powerpc/boot/dts/tqm8548-bigflash.dts b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
new file mode 100644
index 000000000000..64d2d5bbcdf1
--- /dev/null
+++ b/arch/powerpc/boot/dts/tqm8548-bigflash.dts
@@ -0,0 +1,406 @@
+/*
+ * TQM8548 Device Tree Source
+ *
+ * Copyright 2006 Freescale Semiconductor Inc.
+ * Copyright 2008 Wolfgang Grandegger <wg@denx.de>
+ *
+ * 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.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "tqc,tqm8548";
+        compatible = "tqc,tqm8548";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                ethernet3 = &enet3;
+
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8548@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <32>;       // 32 bytes
+                        i-cache-line-size = <32>;       // 32 bytes
+                        d-cache-size = <0x8000>;        // L1, 32K
+                        i-cache-size = <0x8000>;        // L1, 32K
+                        next-level-cache = <&L2>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x00000000>;  // Filled in by U-Boot
+        };
+
+        soc8548@a0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xa0000000 0x100000>;
+                reg = <0xa0000000 0x1000>;      // CCSRBAR
+                bus-frequency = <0>;
+
+                memory-controller@2000 {
+                        compatible = "fsl,mpc8548-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <18 2>;
+                };
+
+                L2: l2-cache-controller@20000 {
+                        compatible = "fsl,mpc8548-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <32>; // 32 bytes
+                        cache-size = <0x80000>; // L2, 512K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <16 2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8548-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
+                        phy1: ethernet-phy@0 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <1>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy2: ethernet-phy@1 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <2>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy3: ethernet-phy@3 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <3>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy4: ethernet-phy@4 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <4>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy5: ethernet-phy@5 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <5>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2 30 2 34 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy2>;
+                };
+
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x25000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <35 2 36 2 40 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy1>;
+                };
+
+                enet2: ethernet@26000 {
+                        cell-index = <2>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x26000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <31 2 32 2 33 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy3>;
+                };
+
+                enet3: ethernet@27000 {
+                        cell-index = <3>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x27000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <37 2 38 2 39 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy4>;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;   // reg base, size
+                        clock-frequency = <0>;  // should we fill in in uboot?
+                        current-speed = <115200>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;   // reg base, size
+                        clock-frequency = <0>;  // should we fill in in uboot?
+                        current-speed = <115200>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                global-utilities@e0000 {        // global utilities reg
+                        compatible = "fsl,mpc8548-guts";
+                        reg = <0xe0000 0x1000>;
+                        fsl,has-rstcr;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                };
+        };
+
+        localbus@a0005000 {
+                compatible = "fsl,mpc8548-localbus", "fsl,pq3-localbus",
+                             "simple-bus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <0xa0005000 0x100>;       // BRx, ORx, etc.
+
+                ranges = <
+                        0 0x0 0xfc000000 0x04000000     // NOR FLASH bank 1
+                        1 0x0 0xf8000000 0x08000000     // NOR FLASH bank 0
+                        2 0x0 0xa3000000 0x00008000     // CAN (2 x i82527)
+                        3 0x0 0xa3010000 0x00008000     // NAND FLASH
+
+                >;
+
+                flash@1,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <1 0x0 0x8000000>;
+                        bank-width = <4>;
+                        device-width = <1>;
+
+                        partition@0 {
+                                label = "kernel";
+                                reg = <0x00000000 0x00200000>;
+                        };
+                        partition@200000 {
+                                label = "root";
+                                reg = <0x00200000 0x00300000>;
+                        };
+                        partition@500000 {
+                                label = "user";
+                                reg = <0x00500000 0x07a00000>;
+                        };
+                        partition@7f00000 {
+                                label = "env1";
+                                reg = <0x07f00000 0x00040000>;
+                        };
+                        partition@7f40000 {
+                                label = "env2";
+                                reg = <0x07f40000 0x00040000>;
+                        };
+                        partition@7f80000 {
+                                label = "u-boot";
+                                reg = <0x07f80000 0x00080000>;
+                                read-only;
+                        };
+                };
+
+                /* Note: CAN support needs be enabled in U-Boot */
+                can0@2,0 {
+                        compatible = "intel,82527"; // Bosch CC770
+                        reg = <2 0x0 0x100>;
+                        interrupts = <4 0>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                can1@2,100 {
+                        compatible = "intel,82527"; // Bosch CC770
+                        reg = <2 0x100 0x100>;
+                        interrupts = <4 0>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                /* Note: NAND support needs to be enabled in U-Boot */
+                upm@3,0 {
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        compatible = "fsl,upm-nand";
+                        reg = <3 0x0 0x800>;
+                        fsl,upm-addr-offset = <0x10>;
+                        fsl,upm-cmd-offset = <0x08>;
+                        chip-delay = <25>; // in micro-seconds
+
+                        nand@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+
+                                partition@0 {
+                                            label = "fs";
+                                            reg = <0x00000000 0x01000000>;
+                                };
+                        };
+                };
+        };
+
+        pci0: pci@a0008000 {
+                cell-index = <0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+                device_type = "pci";
+                reg = <0xa0008000 0x1000>;
+                clock-frequency = <33333333>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                                /* IDSEL 28 */
+                                 0xe000 0 0 1 &mpic 2 1
+                                 0xe000 0 0 2 &mpic 3 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <24 2>;
+                bus-range = <0 0>;
+                ranges = <0x02000000 0 0x80000000 0x80000000 0 0x20000000
+                          0x01000000 0 0x00000000 0xa2000000 0 0x01000000>;
+        };
+
+        pci1: pcie@a000a000 {
+                cell-index = <2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 (PEX) */
+                        0x00000 0 0 1 &mpic 0 1
+                        0x00000 0 0 2 &mpic 1 1
+                        0x00000 0 0 3 &mpic 2 1
+                        0x00000 0 0 4 &mpic 3 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <26 2>;
+                bus-range = <0 0xff>;
+                ranges = <0x02000000 0 0xb0000000 0xb0000000 0 0x10000000
+                          0x01000000 0 0x00000000 0xaf000000 0 0x08000000>;
+                clock-frequency = <33333333>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xa000a000 0x1000>;
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x02000000 0 0xb0000000 0x02000000 0
+                                  0xb0000000 0 0x10000000
+                                  0x01000000 0 0x00000000 0x01000000 0
+                                  0x00000000 0 0x08000000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/tqm8548.dts b/arch/powerpc/boot/dts/tqm8548.dts
new file mode 100644
index 000000000000..2563112cabd3
--- /dev/null
+++ b/arch/powerpc/boot/dts/tqm8548.dts
@@ -0,0 +1,411 @@
+/*
+ * TQM8548 Device Tree Source
+ *
+ * Copyright 2006 Freescale Semiconductor Inc.
+ * Copyright 2008 Wolfgang Grandegger <wg@denx.de>
+ *
+ * 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.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "tqc,tqm8548";
+        compatible = "tqc,tqm8548";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                ethernet3 = &enet3;
+
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8548@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <32>;       // 32 bytes
+                        i-cache-line-size = <32>;       // 32 bytes
+                        d-cache-size = <0x8000>;        // L1, 32K
+                        i-cache-size = <0x8000>;        // L1, 32K
+                        next-level-cache = <&L2>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x00000000>;  // Filled in by U-Boot
+        };
+
+        soc8548@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xe0000000 0x100000>;
+                reg = <0xe0000000 0x1000>;      // CCSRBAR
+                bus-frequency = <0>;
+
+                memory-controller@2000 {
+                        compatible = "fsl,mpc8548-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <18 2>;
+                };
+
+                L2: l2-cache-controller@20000 {
+                        compatible = "fsl,mpc8548-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <32>; // 32 bytes
+                        cache-size = <0x80000>; // L2, 512K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <16 2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1337";
+                                reg = <0x68>;
+                        };
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8548-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8548-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
+                        phy1: ethernet-phy@0 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <1>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy2: ethernet-phy@1 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <2>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy3: ethernet-phy@3 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <3>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy4: ethernet-phy@4 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <4>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy5: ethernet-phy@5 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <5>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2 30 2 34 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy2>;
+                };
+
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x25000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <35 2 36 2 40 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy1>;
+                };
+
+                enet2: ethernet@26000 {
+                        cell-index = <2>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x26000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <31 2 32 2 33 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy3>;
+                };
+
+                enet3: ethernet@27000 {
+                        cell-index = <3>;
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x27000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <37 2 38 2 39 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy4>;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;   // reg base, size
+                        clock-frequency = <0>;  // should we fill in in uboot?
+                        current-speed = <115200>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;   // reg base, size
+                        clock-frequency = <0>;  // should we fill in in uboot?
+                        current-speed = <115200>;
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                global-utilities@e0000 {        // global utilities reg
+                        compatible = "fsl,mpc8548-guts";
+                        reg = <0xe0000 0x1000>;
+                        fsl,has-rstcr;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                };
+        };
+
+        localbus@e0005000 {
+                compatible = "fsl,mpc8548-localbus", "fsl,pq3-localbus",
+                             "simple-bus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <0xe0005000 0x100>;       // BRx, ORx, etc.
+
+                ranges = <
+                        0 0x0 0xfc000000 0x04000000     // NOR FLASH bank 1
+                        1 0x0 0xf8000000 0x08000000     // NOR FLASH bank 0
+                        2 0x0 0xe3000000 0x00008000     // CAN (2 x i82527)
+                        3 0x0 0xe3010000 0x00008000     // NAND FLASH
+
+                >;
+
+                flash@1,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <1 0x0 0x8000000>;
+                        bank-width = <4>;
+                        device-width = <1>;
+
+                        partition@0 {
+                                label = "kernel";
+                                reg = <0x00000000 0x00200000>;
+                        };
+                        partition@200000 {
+                                label = "root";
+                                reg = <0x00200000 0x00300000>;
+                        };
+                        partition@500000 {
+                                label = "user";
+                                reg = <0x00500000 0x07a00000>;
+                        };
+                        partition@7f00000 {
+                                label = "env1";
+                                reg = <0x07f00000 0x00040000>;
+                        };
+                        partition@7f40000 {
+                                label = "env2";
+                                reg = <0x07f40000 0x00040000>;
+                        };
+                        partition@7f80000 {
+                                label = "u-boot";
+                                reg = <0x07f80000 0x00080000>;
+                                read-only;
+                        };
+                };
+
+                /* Note: CAN support needs be enabled in U-Boot */
+                can0@2,0 {
+                        compatible = "intel,82527"; // Bosch CC770
+                        reg = <2 0x0 0x100>;
+                        interrupts = <4 0>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                can1@2,100 {
+                        compatible = "intel,82527"; // Bosch CC770
+                        reg = <2 0x100 0x100>;
+                        interrupts = <4 0>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                /* Note: NAND support needs to be enabled in U-Boot */
+                upm@3,0 {
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        compatible = "fsl,upm-nand";
+                        reg = <3 0x0 0x800>;
+                        fsl,upm-addr-offset = <0x10>;
+                        fsl,upm-cmd-offset = <0x08>;
+                        chip-delay = <25>; // in micro-seconds
+
+                        nand@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+
+                                partition@0 {
+                                            label = "fs";
+                                            reg = <0x00000000 0x01000000>;
+                                };
+                        };
+                };
+        };
+
+        pci0: pci@e0008000 {
+                cell-index = <0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+                device_type = "pci";
+                reg = <0xe0008000 0x1000>;
+                clock-frequency = <33333333>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                                /* IDSEL 28 */
+                                 0xe000 0 0 1 &mpic 2 1
+                                 0xe000 0 0 2 &mpic 3 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <24 2>;
+                bus-range = <0 0>;
+                ranges = <0x02000000 0 0x80000000 0x80000000 0 0x20000000
+                          0x01000000 0 0x00000000 0xe2000000 0 0x01000000>;
+        };
+
+        pci1: pcie@e000a000 {
+                cell-index = <2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 (PEX) */
+                        0x00000 0 0 1 &mpic 0 1
+                        0x00000 0 0 2 &mpic 1 1
+                        0x00000 0 0 3 &mpic 2 1
+                        0x00000 0 0 4 &mpic 3 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <26 2>;
+                bus-range = <0 0xff>;
+                ranges = <0x02000000 0 0xc0000000 0xc0000000 0 0x20000000
+                          0x01000000 0 0x00000000 0xef000000 0 0x08000000>;
+                clock-frequency = <33333333>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe000a000 0x1000>;
+                compatible = "fsl,mpc8548-pcie";
+                device_type = "pci";
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x02000000 0 0xc0000000 0x02000000 0
+                                  0xc0000000 0 0x20000000
+                                  0x01000000 0 0x00000000 0x01000000 0
+                                  0x00000000 0 0x08000000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts
index a20eb06c482f..6f7ea59c4846 100644
--- a/arch/powerpc/boot/dts/tqm8555.dts
+++ b/arch/powerpc/boot/dts/tqm8555.dts
@@ -12,8 +12,8 @@
 /dts-v1/;
 
 / {
-        model = "tqm,8555";
-        compatible = "tqm,8555", "tqm,85xx";
+        model = "tqc,tqm8555";
+        compatible = "tqc,tqm8555";
         #address-cells = <1>;
         #size-cells = <1>;
 
@@ -39,6 +39,7 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -63,7 +64,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8540-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>;
@@ -88,6 +89,47 @@
                         };
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8555-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8555-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8555-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8555-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8555-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -158,12 +200,24 @@
                         interrupt-parent = <&mpic>;
                 };
 
+                crypto@30000 {
+                        compatible = "fsl,sec2.0";
+                        reg = <0x30000 0x10000>;
+                        interrupts = <45 2>;
+                        interrupt-parent = <&mpic>;
+                        fsl,num-channels = <4>;
+                        fsl,channel-fifo-len = <24>;
+                        fsl,exec-units-mask = <0x7e>;
+                        fsl,descriptor-types-mask = <0x01010ebf>;
+                };
+
                 mpic: pic@40000 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         device_type = "open-pic";
+                        compatible = "chrp,open-pic";
                 };
 
                 cpm@919c0 {
diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts
index b9ac6c943b89..3fe35208907b 100644
--- a/arch/powerpc/boot/dts/tqm8560.dts
+++ b/arch/powerpc/boot/dts/tqm8560.dts
@@ -2,6 +2,7 @@
  * TQM 8560 Device Tree Source
  *
  * Copyright 2008 Freescale Semiconductor Inc.
+ * Copyright 2008 Wolfgang Grandegger <wg@grandegger.com>
  *
  * 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
@@ -12,8 +13,8 @@
 /dts-v1/;
 
 / {
-        model = "tqm,8560";
-        compatible = "tqm,8560", "tqm,85xx";
+        model = "tqc,tqm8560";
+        compatible = "tqc,tqm8560";
         #address-cells = <1>;
         #size-cells = <1>;
 
@@ -40,6 +41,7 @@
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
+                        next-level-cache = <&L2>;
                 };
         };
 
@@ -64,7 +66,7 @@
                         interrupts = <18 2>;
                 };
 
-                l2-cache-controller@20000 {
+                L2: l2-cache-controller@20000 {
                         compatible = "fsl,8540-l2-cache-controller";
                         reg = <0x20000 0x1000>;
                         cache-line-size = <32>;
@@ -89,6 +91,47 @@
                         };
                 };
 
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8560-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8560-dma-channel",
+                                                "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -145,6 +188,7 @@
                         #interrupt-cells = <2>;
                         reg = <0x40000 0x40000>;
                         device_type = "open-pic";
+                        compatible = "chrp,open-pic";
                 };
 
                 cpm@919c0 {
@@ -221,6 +265,70 @@
                 };
         };
 
+        localbus@e0005000 {
+                compatible = "fsl,mpc8560-localbus", "fsl,pq3-localbus",
+                             "simple-bus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <0xe0005000 0x100>;       // BRx, ORx, etc.
+
+                ranges = <
+                        0 0x0 0xfc000000 0x04000000     // NOR FLASH bank 1
+                        1 0x0 0xf8000000 0x08000000     // NOR FLASH bank 0
+                        2 0x0 0xe3000000 0x00008000     // CAN (2 x i82527)
+                >;
+
+                flash@1,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <1 0x0 0x8000000>;
+                        bank-width = <4>;
+                        device-width = <1>;
+
+                        partition@0 {
+                                label = "kernel";
+                                reg = <0x00000000 0x00200000>;
+                        };
+                        partition@200000 {
+                                label = "root";
+                                reg = <0x00200000 0x00300000>;
+                        };
+                        partition@500000 {
+                                label = "user";
+                                reg = <0x00500000 0x07a00000>;
+                        };
+                        partition@7f00000 {
+                                label = "env1";
+                                reg = <0x07f00000 0x00040000>;
+                        };
+                        partition@7f40000 {
+                                label = "env2";
+                                reg = <0x07f40000 0x00040000>;
+                        };
+                        partition@7f80000 {
+                                label = "u-boot";
+                                reg = <0x07f80000 0x00080000>;
+                                read-only;
+                        };
+                };
+
+                /* Note: CAN support needs be enabled in U-Boot */
+                can0@2,0 {
+                        compatible = "intel,82527"; // Bosch CC770
+                        reg = <2 0x0 0x100>;
+                        interrupts = <4 0>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                can1@2,100 {
+                        compatible = "intel,82527"; // Bosch CC770
+                        reg = <2 0x100 0x100>;
+                        interrupts = <4 0>;
+                        interrupt-parent = <&mpic>;
+                };
+        };
+
         pci0: pci@e0008000 {
                 cell-index = <0>;
                 #interrupt-cells = <1>;
diff --git a/arch/powerpc/boot/dts/virtex440-ml507.dts b/arch/powerpc/boot/dts/virtex440-ml507.dts
new file mode 100644
index 000000000000..dc8e78e2dceb
--- /dev/null
+++ b/arch/powerpc/boot/dts/virtex440-ml507.dts
@@ -0,0 +1,296 @@
+/*
+ * This file supports the Xilinx ML507 board with the 440 processor.
+ * A reference design for the FPGA is provided at http://git.xilinx.com.
+ *
+ * (C) Copyright 2008 Xilinx, Inc.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        compatible = "xlnx,virtex440";
+        dcr-parent = <&ppc440_0>;
+        model = "testing";
+        DDR2_SDRAM: memory@0 {
+                device_type = "memory";
+                reg = < 0 0x10000000 >;
+        } ;
+        chosen {
+                bootargs = "console=ttyS0 ip=on root=/dev/ram";
+                linux,stdout-path = "/plb@0/serial@83e00000";
+        } ;
+        cpus {
+                #address-cells = <1>;
+                #cpus = <1>;
+                #size-cells = <0>;
+                ppc440_0: cpu@0 {
+                        clock-frequency = <400000000>;
+                        compatible = "PowerPC,440", "ibm,ppc440";
+                        d-cache-line-size = <0x20>;
+                        d-cache-size = <0x8000>;
+                        dcr-access-method = "native";
+                        dcr-controller ;
+                        device_type = "cpu";
+                        i-cache-line-size = <0x20>;
+                        i-cache-size = <0x8000>;
+                        model = "PowerPC,440";
+                        reg = <0>;
+                        timebase-frequency = <400000000>;
+                        xlnx,apu-control = <1>;
+                        xlnx,apu-udi-0 = <0>;
+                        xlnx,apu-udi-1 = <0>;
+                        xlnx,apu-udi-10 = <0>;
+                        xlnx,apu-udi-11 = <0>;
+                        xlnx,apu-udi-12 = <0>;
+                        xlnx,apu-udi-13 = <0>;
+                        xlnx,apu-udi-14 = <0>;
+                        xlnx,apu-udi-15 = <0>;
+                        xlnx,apu-udi-2 = <0>;
+                        xlnx,apu-udi-3 = <0>;
+                        xlnx,apu-udi-4 = <0>;
+                        xlnx,apu-udi-5 = <0>;
+                        xlnx,apu-udi-6 = <0>;
+                        xlnx,apu-udi-7 = <0>;
+                        xlnx,apu-udi-8 = <0>;
+                        xlnx,apu-udi-9 = <0>;
+                        xlnx,dcr-autolock-enable = <1>;
+                        xlnx,dcu-rd-ld-cache-plb-prio = <0>;
+                        xlnx,dcu-rd-noncache-plb-prio = <0>;
+                        xlnx,dcu-rd-touch-plb-prio = <0>;
+                        xlnx,dcu-rd-urgent-plb-prio = <0>;
+                        xlnx,dcu-wr-flush-plb-prio = <0>;
+                        xlnx,dcu-wr-store-plb-prio = <0>;
+                        xlnx,dcu-wr-urgent-plb-prio = <0>;
+                        xlnx,dma0-control = <0>;
+                        xlnx,dma0-plb-prio = <0>;
+                        xlnx,dma0-rxchannelctrl = <0x1010000>;
+                        xlnx,dma0-rxirqtimer = <0x3ff>;
+                        xlnx,dma0-txchannelctrl = <0x1010000>;
+                        xlnx,dma0-txirqtimer = <0x3ff>;
+                        xlnx,dma1-control = <0>;
+                        xlnx,dma1-plb-prio = <0>;
+                        xlnx,dma1-rxchannelctrl = <0x1010000>;
+                        xlnx,dma1-rxirqtimer = <0x3ff>;
+                        xlnx,dma1-txchannelctrl = <0x1010000>;
+                        xlnx,dma1-txirqtimer = <0x3ff>;
+                        xlnx,dma2-control = <0>;
+                        xlnx,dma2-plb-prio = <0>;
+                        xlnx,dma2-rxchannelctrl = <0x1010000>;
+                        xlnx,dma2-rxirqtimer = <0x3ff>;
+                        xlnx,dma2-txchannelctrl = <0x1010000>;
+                        xlnx,dma2-txirqtimer = <0x3ff>;
+                        xlnx,dma3-control = <0>;
+                        xlnx,dma3-plb-prio = <0>;
+                        xlnx,dma3-rxchannelctrl = <0x1010000>;
+                        xlnx,dma3-rxirqtimer = <0x3ff>;
+                        xlnx,dma3-txchannelctrl = <0x1010000>;
+                        xlnx,dma3-txirqtimer = <0x3ff>;
+                        xlnx,endian-reset = <0>;
+                        xlnx,generate-plb-timespecs = <1>;
+                        xlnx,icu-rd-fetch-plb-prio = <0>;
+                        xlnx,icu-rd-spec-plb-prio = <0>;
+                        xlnx,icu-rd-touch-plb-prio = <0>;
+                        xlnx,interconnect-imask = <0xffffffff>;
+                        xlnx,mplb-allow-lock-xfer = <1>;
+                        xlnx,mplb-arb-mode = <0>;
+                        xlnx,mplb-awidth = <0x20>;
+                        xlnx,mplb-counter = <0x500>;
+                        xlnx,mplb-dwidth = <0x80>;
+                        xlnx,mplb-max-burst = <8>;
+                        xlnx,mplb-native-dwidth = <0x80>;
+                        xlnx,mplb-p2p = <0>;
+                        xlnx,mplb-prio-dcur = <2>;
+                        xlnx,mplb-prio-dcuw = <3>;
+                        xlnx,mplb-prio-icu = <4>;
+                        xlnx,mplb-prio-splb0 = <1>;
+                        xlnx,mplb-prio-splb1 = <0>;
+                        xlnx,mplb-read-pipe-enable = <1>;
+                        xlnx,mplb-sync-tattribute = <0>;
+                        xlnx,mplb-wdog-enable = <1>;
+                        xlnx,mplb-write-pipe-enable = <1>;
+                        xlnx,mplb-write-post-enable = <1>;
+                        xlnx,num-dma = <1>;
+                        xlnx,pir = <0xf>;
+                        xlnx,ppc440mc-addr-base = <0>;
+                        xlnx,ppc440mc-addr-high = <0xfffffff>;
+                        xlnx,ppc440mc-arb-mode = <0>;
+                        xlnx,ppc440mc-bank-conflict-mask = <0xc00000>;
+                        xlnx,ppc440mc-control = <0xf810008f>;
+                        xlnx,ppc440mc-max-burst = <8>;
+                        xlnx,ppc440mc-prio-dcur = <2>;
+                        xlnx,ppc440mc-prio-dcuw = <3>;
+                        xlnx,ppc440mc-prio-icu = <4>;
+                        xlnx,ppc440mc-prio-splb0 = <1>;
+                        xlnx,ppc440mc-prio-splb1 = <0>;
+                        xlnx,ppc440mc-row-conflict-mask = <0x3ffe00>;
+                        xlnx,ppcdm-asyncmode = <0>;
+                        xlnx,ppcds-asyncmode = <0>;
+                        xlnx,user-reset = <0>;
+                        DMA0: sdma@80 {
+                                compatible = "xlnx,ll-dma-1.00.a";
+                                dcr-reg = < 0x80 0x11 >;
+                                interrupt-parent = <&xps_intc_0>;
+                                interrupts = < 9 2 0xa 2 >;
+                        } ;
+                } ;
+        } ;
+        plb_v46_0: plb@0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "xlnx,plb-v46-1.02.a", "simple-bus";
+                ranges ;
+                DIP_Switches_8Bit: gpio@81460000 {
+                        compatible = "xlnx,xps-gpio-1.00.a";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 6 2 >;
+                        reg = < 0x81460000 0x10000 >;
+                        xlnx,all-inputs = <1>;
+                        xlnx,all-inputs-2 = <0>;
+                        xlnx,dout-default = <0>;
+                        xlnx,dout-default-2 = <0>;
+                        xlnx,family = "virtex5";
+                        xlnx,gpio-width = <8>;
+                        xlnx,interrupt-present = <1>;
+                        xlnx,is-bidir = <1>;
+                        xlnx,is-bidir-2 = <1>;
+                        xlnx,is-dual = <0>;
+                        xlnx,tri-default = <0xffffffff>;
+                        xlnx,tri-default-2 = <0xffffffff>;
+                } ;
+                Hard_Ethernet_MAC: xps-ll-temac@81c00000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "xlnx,compound";
+                        ethernet@81c00000 {
+                                compatible = "xlnx,xps-ll-temac-1.01.b";
+                                device_type = "network";
+                                interrupt-parent = <&xps_intc_0>;
+                                interrupts = < 5 2 >;
+                                llink-connected = <&DMA0>;
+                                local-mac-address = [ 02 00 00 00 00 00 ];
+                                reg = < 0x81c00000 0x40 >;
+                                xlnx,bus2core-clk-ratio = <1>;
+                                xlnx,phy-type = <1>;
+                                xlnx,phyaddr = <1>;
+                                xlnx,rxcsum = <1>;
+                                xlnx,rxfifo = <0x1000>;
+                                xlnx,temac-type = <0>;
+                                xlnx,txcsum = <1>;
+                                xlnx,txfifo = <0x1000>;
+                        } ;
+                } ;
+                LEDs_8Bit: gpio@81400000 {
+                        compatible = "xlnx,xps-gpio-1.00.a";
+                        reg = < 0x81400000 0x10000 >;
+                        xlnx,all-inputs = <0>;
+                        xlnx,all-inputs-2 = <0>;
+                        xlnx,dout-default = <0>;
+                        xlnx,dout-default-2 = <0>;
+                        xlnx,family = "virtex5";
+                        xlnx,gpio-width = <8>;
+                        xlnx,interrupt-present = <0>;
+                        xlnx,is-bidir = <1>;
+                        xlnx,is-bidir-2 = <1>;
+                        xlnx,is-dual = <0>;
+                        xlnx,tri-default = <0xffffffff>;
+                        xlnx,tri-default-2 = <0xffffffff>;
+                } ;
+                LEDs_Positions: gpio@81420000 {
+                        compatible = "xlnx,xps-gpio-1.00.a";
+                        reg = < 0x81420000 0x10000 >;
+                        xlnx,all-inputs = <0>;
+                        xlnx,all-inputs-2 = <0>;
+                        xlnx,dout-default = <0>;
+                        xlnx,dout-default-2 = <0>;
+                        xlnx,family = "virtex5";
+                        xlnx,gpio-width = <5>;
+                        xlnx,interrupt-present = <0>;
+                        xlnx,is-bidir = <1>;
+                        xlnx,is-bidir-2 = <1>;
+                        xlnx,is-dual = <0>;
+                        xlnx,tri-default = <0xffffffff>;
+                        xlnx,tri-default-2 = <0xffffffff>;
+                } ;
+                Push_Buttons_5Bit: gpio@81440000 {
+                        compatible = "xlnx,xps-gpio-1.00.a";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 7 2 >;
+                        reg = < 0x81440000 0x10000 >;
+                        xlnx,all-inputs = <1>;
+                        xlnx,all-inputs-2 = <0>;
+                        xlnx,dout-default = <0>;
+                        xlnx,dout-default-2 = <0>;
+                        xlnx,family = "virtex5";
+                        xlnx,gpio-width = <5>;
+                        xlnx,interrupt-present = <1>;
+                        xlnx,is-bidir = <1>;
+                        xlnx,is-bidir-2 = <1>;
+                        xlnx,is-dual = <0>;
+                        xlnx,tri-default = <0xffffffff>;
+                        xlnx,tri-default-2 = <0xffffffff>;
+                } ;
+                RS232_Uart_1: serial@83e00000 {
+                        clock-frequency = <100000000>;
+                        compatible = "xlnx,xps-uart16550-2.00.a", "ns16550";
+                        current-speed = <0x2580>;
+                        device_type = "serial";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 8 2 >;
+                        reg = < 0x83e00000 0x10000 >;
+                        reg-offset = <3>;
+                        reg-shift = <2>;
+                        xlnx,family = "virtex5";
+                        xlnx,has-external-rclk = <0>;
+                        xlnx,has-external-xin = <0>;
+                        xlnx,is-a-16550 = <1>;
+                } ;
+                SysACE_CompactFlash: sysace@83600000 {
+                        compatible = "xlnx,xps-sysace-1.00.a";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 4 2 >;
+                        reg = < 0x83600000 0x10000 >;
+                        xlnx,family = "virtex5";
+                        xlnx,mem-width = <0x10>;
+                } ;
+                xps_bram_if_cntlr_1: xps-bram-if-cntlr@ffff0000 {
+                        compatible = "xlnx,xps-bram-if-cntlr-1.00.a";
+                        reg = < 0xffff0000 0x10000 >;
+                        xlnx,family = "virtex5";
+                } ;
+                xps_intc_0: interrupt-controller@81800000 {
+                        #interrupt-cells = <2>;
+                        compatible = "xlnx,xps-intc-1.00.a";
+                        interrupt-controller ;
+                        reg = < 0x81800000 0x10000 >;
+                        xlnx,num-intr-inputs = <0xb>;
+                } ;
+                xps_timebase_wdt_1: xps-timebase-wdt@83a00000 {
+                        compatible = "xlnx,xps-timebase-wdt-1.00.b";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 2 0 1 2 >;
+                        reg = < 0x83a00000 0x10000 >;
+                        xlnx,family = "virtex5";
+                        xlnx,wdt-enable-once = <0>;
+                        xlnx,wdt-interval = <0x1e>;
+                } ;
+                xps_timer_1: timer@83c00000 {
+                        compatible = "xlnx,xps-timer-1.00.a";
+                        interrupt-parent = <&xps_intc_0>;
+                        interrupts = < 3 2 >;
+                        reg = < 0x83c00000 0x10000 >;
+                        xlnx,count-width = <0x20>;
+                        xlnx,family = "virtex5";
+                        xlnx,gen0-assert = <1>;
+                        xlnx,gen1-assert = <1>;
+                        xlnx,one-timer-only = <1>;
+                        xlnx,trig0-assert = <1>;
+                        xlnx,trig1-assert = <1>;
+                } ;
+        } ;
+}  ;
diff --git a/arch/powerpc/boot/dts/walnut.dts b/arch/powerpc/boot/dts/walnut.dts
index a328607c8f84..4a9f726ada13 100644
--- a/arch/powerpc/boot/dts/walnut.dts
+++ b/arch/powerpc/boot/dts/walnut.dts
@@ -9,12 +9,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <1>;
         #size-cells = <1>;
         model = "ibm,walnut";
         compatible = "ibm,walnut";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC;
@@ -29,13 +31,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,405GP";
-                        reg = <0>;
-                        clock-frequency = <bebc200>; /* Filled in by zImage */
+                        reg = <0x00000000>;
+                        clock-frequency = <200000000>; /* Filled in by zImage */
                         timebase-frequency = <0>; /* Filled in by zImage */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <4000>;
-                        d-cache-size = <4000>;
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <16384>;
+                        d-cache-size = <16384>;
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -43,14 +45,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0>; /* Filled in by zImage */
+                reg = <0x00000000 0x00000000>; /* Filled in by zImage */
         };
 
         UIC0: interrupt-controller {
                 compatible = "ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 9>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -65,63 +67,63 @@
 
                 SDRAM0: memory-controller {
                         compatible = "ibm,sdram-405gp";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 MAL: mcmal {
                         compatible = "ibm,mcmal-405gp", "ibm,mcmal";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <1>;
                         num-rx-chans = <1>;
                         interrupt-parent = <&UIC0>;
                         interrupts = <
-                                b 4 /* TXEOB */
-                                c 4 /* RXEOB */
-                                a 4 /* SERR */
-                                d 4 /* TXDE */
-                                e 4 /* RXDE */>;
+                                0xb 0x4 /* TXEOB */
+                                0xc 0x4 /* RXEOB */
+                                0xa 0x4 /* SERR */
+                                0xd 0x4 /* TXDE */
+                                0xe 0x4 /* RXDE */>;
                 };
 
                 POB0: opb {
                         compatible = "ibm,opb-405gp", "ibm,opb";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges = <ef600000 ef600000 a00000>;
-                        dcr-reg = <0a0 5>;
+                        ranges = <0xef600000 0xef600000 0x00a00000>;
+                        dcr-reg = <0x0a0 0x005>;
                         clock-frequency = <0>; /* Filled in by zImage */
 
                         UART0: serial@ef600300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600300 8>;
-                                virtual-reg = <ef600300>;
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                current-speed = <2580>;
+                                current-speed = <9600>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <0 4>;
+                                interrupts = <0x0 0x4>;
                         };
 
                         UART1: serial@ef600400 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600400 8>;
-                                virtual-reg = <ef600400>;
+                                reg = <0xef600400 0x00000008>;
+                                virtual-reg = <0xef600400>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                current-speed = <2580>;
+                                current-speed = <9600>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         IIC: i2c@ef600500 {
                                 compatible = "ibm,iic-405gp", "ibm,iic";
-                                reg = <ef600500 11>;
+                                reg = <0xef600500 0x00000011>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
 
                         GPIO: gpio@ef600700 {
                                 compatible = "ibm,gpio-405gp";
-                                reg = <ef600700 20>;
+                                reg = <0xef600700 0x00000020>;
                         };
 
                         EMAC: ethernet@ef600800 {
@@ -129,26 +131,26 @@
                                 compatible = "ibm,emac-405gp", "ibm,emac";
                                 interrupt-parent = <&UIC0>;
                                 interrupts = <
-                                        f 4 /* Ethernet */
-                                        9 4 /* Ethernet Wake Up */>;
+                                        0xf 0x4 /* Ethernet */
+                                        0x9 0x4 /* Ethernet Wake Up */>;
                                 local-mac-address = [000000000000]; /* Filled in by zImage */
-                                reg = <ef600800 70>;
+                                reg = <0xef600800 0x00000070>;
                                 mal-device = <&MAL>;
                                 mal-tx-channel = <0>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <5dc>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <1500>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rmii";
-                                phy-map = <00000001>;
+                                phy-map = <0x00000001>;
                         };
 
                 };
 
                 EBC0: ebc {
                         compatible = "ibm,ebc-405gp", "ibm,ebc";
-                        dcr-reg = <012 2>;
+                        dcr-reg = <0x012 0x002>;
                         #address-cells = <2>;
                         #size-cells = <1>;
                         /* The ranges property is supplied by the bootwrapper
@@ -158,18 +160,18 @@
                         clock-frequency = <0>; /* Filled in by zImage */
 
                         sram@0,0 {
-                                reg = <0 0 80000>;
+                                reg = <0x00000000 0x00000000 0x00080000>;
                         };
 
                         flash@0,80000 {
                                 compatible = "jedec-flash";
                                 bank-width = <1>;
-                                reg = <0 80000 80000>;
+                                reg = <0x00000000 0x00080000 0x00080000>;
                                 #address-cells = <1>;
                                 #size-cells = <1>;
                                 partition@0 {
                                         label = "OpenBIOS";
-                                        reg = <0 80000>;
+                                        reg = <0x00000000 0x00080000>;
                                         read-only;
                                 };
                         };
@@ -177,24 +179,24 @@
                         nvram@1,0 {
                                 /* NVRAM and RTC */
                                 compatible = "ds1743-nvram";
-                                #bytes = <2000>;
-                                reg = <1 0 2000>;
+                                #bytes = <0x2000>;
+                                reg = <0x00000001 0x00000000 0x00002000>;
                         };
 
                         keyboard@2,0 {
                                 compatible = "intel,82C42PC";
-                                reg = <2 0 2>;
+                                reg = <0x00000002 0x00000000 0x00000002>;
                         };
 
                         ir@3,0 {
                                 compatible = "ti,TIR2000PAG";
-                                reg = <3 0 10>;
+                                reg = <0x00000003 0x00000000 0x00000010>;
                         };
 
                         fpga@7,0 {
                                 compatible = "Walnut-FPGA";
-                                reg = <7 0 10>;
-                                virtual-reg = <f0300005>;
+                                reg = <0x00000007 0x00000000 0x00000010>;
+                                virtual-reg = <0xf0300005>;
                         };
                 };
 
@@ -205,35 +207,35 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb405gp-pci", "ibm,plb-pci";
                         primary;
-                        reg = <eec00000 8       /* Config space access */
-                               eed80000 4       /* IACK */
-                               eed80000 4       /* Special cycle */
-                               ef480000 40>;    /* Internal registers */
+                        reg = <0xeec00000 0x00000008    /* Config space access */
+                               0xeed80000 0x00000004    /* IACK */
+                               0xeed80000 0x00000004    /* Special cycle */
+                               0xef480000 0x00000040>;  /* Internal registers */
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed. Chip supports a second
                          * IO range but we don't use it for now
                          */
-                        ranges = <02000000 0 80000000 80000000 0 20000000
-                                  01000000 0 00000000 e8000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0x80000000 0x80000000 0x00000000 0x20000000
+                                  0x01000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* Walnut has all 4 IRQ pins tied together per slot */
-                        interrupt-map-mask = <f800 0 0 0>;
+                        interrupt-map-mask = <0xf800 0x0 0x0 0x0>;
                         interrupt-map = <
                                 /* IDSEL 1 */
-                                0800 0 0 0 &UIC0 1c 8
+                                0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8
 
                                 /* IDSEL 2 */
-                                1000 0 0 0 &UIC0 1d 8
+                                0x1000 0x0 0x0 0x0 &UIC0 0x1d 0x8
 
                                 /* IDSEL 3 */
-                                1800 0 0 0 &UIC0 1e 8
+                                0x1800 0x0 0x0 0x0 &UIC0 0x1e 0x8
 
                                 /* IDSEL 4 */
-                                2000 0 0 0 &UIC0 1f 8
+                                0x2000 0x0 0x0 0x0 &UIC0 0x1f 0x8
                         >;
                 };
         };
diff --git a/arch/powerpc/boot/dts/warp.dts b/arch/powerpc/boot/dts/warp.dts
index b04a52e22bf5..340018cf16b7 100644
--- a/arch/powerpc/boot/dts/warp.dts
+++ b/arch/powerpc/boot/dts/warp.dts
@@ -9,12 +9,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <2>;
         #size-cells = <1>;
         model = "pika,warp";
         compatible = "pika,warp";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC0;
@@ -28,13 +30,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,440EP";
-                        reg = <0>;
+                        reg = <0x00000000>;
                         clock-frequency = <0>; /* Filled in by zImage */
                         timebase-frequency = <0>; /* Filled in by zImage */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <8000>;
-                        d-cache-size = <8000>;
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <32768>;
+                        d-cache-size = <32768>;
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -42,14 +44,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0 0>; /* Filled in by zImage */
+                reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */
         };
 
         UIC0: interrupt-controller0 {
                 compatible = "ibm,uic-440ep","ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -59,22 +61,22 @@
                 compatible = "ibm,uic-440ep","ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
         SDR0: sdr {
                 compatible = "ibm,sdr-440ep";
-                dcr-reg = <00e 002>;
+                dcr-reg = <0x00e 0x002>;
         };
 
         CPR0: cpr {
                 compatible = "ibm,cpr-440ep";
-                dcr-reg = <00c 002>;
+                dcr-reg = <0x00c 0x002>;
         };
 
         plb {
@@ -86,86 +88,79 @@
 
                 SDRAM0: sdram {
                         compatible = "ibm,sdram-440ep", "ibm,sdram-405gp";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 DMA0: dma {
                         compatible = "ibm,dma-440ep", "ibm,dma-440gp";
-                        dcr-reg = <100 027>;
+                        dcr-reg = <0x100 0x027>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <4>;
                         num-rx-chans = <2>;
                         interrupt-parent = <&MAL0>;
-                        interrupts = <0 1 2 3 4>;
+                        interrupts = <0x0 0x1 0x2 0x3 0x4>;
                         #interrupt-cells = <1>;
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-                                        /*RXEOB*/ 1 &UIC0 b 4
-                                        /*SERR*/  2 &UIC1 0 4
-                                        /*TXDE*/  3 &UIC1 1 4
-                                        /*RXDE*/  4 &UIC1 2 4>;
+                        interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4
+                                        /*RXEOB*/ 0x1 &UIC0 0xb 0x4
+                                        /*SERR*/  0x2 &UIC1 0x0 0x4
+                                        /*TXDE*/  0x3 &UIC1 0x1 0x4
+                                        /*RXDE*/  0x4 &UIC1 0x2 0x4>;
                 };
 
                 POB0: opb {
                         compatible = "ibm,opb-440ep", "ibm,opb-440gp", "ibm,opb";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges = <00000000 0 00000000 80000000
-                                  80000000 0 80000000 80000000>;
+                        ranges = <0x00000000 0x00000000 0x00000000 0x80000000
+                                  0x80000000 0x00000000 0x80000000 0x80000000>;
                         interrupt-parent = <&UIC1>;
-                        interrupts = <7 4>;
+                        interrupts = <0x7 0x4>;
                         clock-frequency = <0>; /* Filled in by zImage */
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                interrupts = <5 1>;
+                                interrupts = <0x5 0x1>;
                                 interrupt-parent = <&UIC1>;
 
                                 fpga@2,0 {
                                         compatible = "pika,fpga";
-                                        reg = <2 0 2200>;
-                                        interrupts = <18 8>;
+                                        reg = <0x00000002 0x00000000 0x00001000>;
+                                        interrupts = <0x18 0x8>;
                                         interrupt-parent = <&UIC0>;
                                 };
 
+                                fpga@2,4000 {
+                                        compatible = "pika,fpga-sd";
+                                        reg = <0x00000002 0x00004000 0x00000A00>;
+                                };
+
                                 nor_flash@0,0 {
-                                        compatible = "amd,s29gl512n", "cfi-flash";
+                                        compatible = "amd,s29gl032a", "cfi-flash";
                                         bank-width = <2>;
-                                        reg = <0 0 4000000>;
+                                        reg = <0x00000000 0x00000000 0x00400000>;
                                         #address-cells = <1>;
                                         #size-cells = <1>;
-                                        partition@0 {
-                                                label = "kernel";
-                                                reg = <0 180000>;
-                                        };
-                                        partition@180000 {
-                                                label = "root";
-                                                reg = <180000 3480000>;
-                                        };
-                                        partition@3600000 {
-                                                label = "user";
-                                                reg = <3600000 900000>;
-                                        };
-                                        partition@3f00000 {
+                                        partition@300000 {
                                                 label = "fpga";
-                                                reg = <3f00000 40000>;
+                                                reg = <0x0030000 0x00040000>;
                                         };
-                                        partition@3f40000 {
+                                        partition@340000 {
                                                 label = "env";
-                                                reg = <3f40000 40000>;
+                                                reg = <0x0340000 0x00040000>;
                                         };
-                                        partition@3f80000 {
+                                        partition@380000 {
                                                 label = "u-boot";
-                                                reg = <3f80000 80000>;
+                                                reg = <0x0380000 0x00080000>;
                                         };
                                 };
                         };
@@ -173,60 +168,80 @@
                         UART0: serial@ef600300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600300 8>;
-                                virtual-reg = <ef600300>;
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                current-speed = <1c200>;
+                                current-speed = <115200>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <0 4>;
+                                interrupts = <0x0 0x4>;
                         };
 
                         IIC0: i2c@ef600700 {
                                 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
-                                reg = <ef600700 14>;
+                                reg = <0xef600700 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
+                                index = <0x0>;
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+
+                                ad7414@4a {
+                                        compatible = "adi,ad7414";
+                                        reg = <0x4a>;
+                                        interrupts = <0x19 0x8>;
+                                        interrupt-parent = <&UIC0>;
+                                };
                         };
 
                         GPIO0: gpio@ef600b00 {
                                 compatible = "ibm,gpio-440ep";
-                                reg = <ef600b00 48>;
+                                reg = <0xef600b00 0x00000048>;
+                                #gpio-cells = <2>;
+                                gpio-controller;
                         };
 
                         GPIO1: gpio@ef600c00 {
                                 compatible = "ibm,gpio-440ep";
-                                reg = <ef600c00 48>;
+                                reg = <0xef600c00 0x00000048>;
+                                #gpio-cells = <2>;
+                                gpio-controller;
+
+                                led@31 {
+                                        compatible = "linux,gpio-led";
+                                        linux,name = ":green:";
+                                        gpios = <&GPIO1 0x30 0>;
+                                };
                         };
 
                         ZMII0: emac-zmii@ef600d00 {
                                 compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii";
-                                reg = <ef600d00 c>;
+                                reg = <0xef600d00 0x0000000c>;
                         };
 
                         EMAC0: ethernet@ef600e00 {
                                 device_type = "network";
                                 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1c 4 1d 4>;
-                                reg = <ef600e00 70>;
+                                interrupts = <0x1c 0x4 0x1d 0x4>;
+                                reg = <0xef600e00 0x00000070>;
                                 local-mac-address = [000000000000];
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0 1>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <5dc>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <1500>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <0>;
                         };
 
                         usb@ef601000 {
                                 compatible = "ohci-be";
-                                reg = <ef601000 80>;
-                                interrupts = <8 1 9 1>;
+                                reg = <0xef601000 0x00000080>;
+                                interrupts = <0x8 0x1 0x9 0x1>;
                                 interrupt-parent = < &UIC1 >;
                         };
                 };
diff --git a/arch/powerpc/boot/dts/yosemite.dts b/arch/powerpc/boot/dts/yosemite.dts
index 0d6d332814e0..e39422aa0d85 100644
--- a/arch/powerpc/boot/dts/yosemite.dts
+++ b/arch/powerpc/boot/dts/yosemite.dts
@@ -9,12 +9,14 @@
  * any warranty of any kind, whether express or implied.
  */
 
+/dts-v1/;
+
 / {
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,yosemite";
         compatible = "amcc,yosemite","amcc,bamboo";
-        dcr-parent = <&/cpus/cpu@0>;
+        dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
                 ethernet0 = &EMAC0;
@@ -32,13 +34,13 @@
                 cpu@0 {
                         device_type = "cpu";
                         model = "PowerPC,440EP";
-                        reg = <0>;
+                        reg = <0x00000000>;
                         clock-frequency = <0>; /* Filled in by zImage */
                         timebase-frequency = <0>; /* Filled in by zImage */
-                        i-cache-line-size = <20>;
-                        d-cache-line-size = <20>;
-                        i-cache-size = <8000>;
-                        d-cache-size = <8000>;
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <32768>;
+                        d-cache-size = <32768>;
                         dcr-controller;
                         dcr-access-method = "native";
                 };
@@ -46,14 +48,14 @@
 
         memory {
                 device_type = "memory";
-                reg = <0 0 0>; /* Filled in by zImage */
+                reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by zImage */
         };
 
         UIC0: interrupt-controller0 {
                 compatible = "ibm,uic-440ep","ibm,uic";
                 interrupt-controller;
                 cell-index = <0>;
-                dcr-reg = <0c0 009>;
+                dcr-reg = <0x0c0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
@@ -63,22 +65,22 @@
                 compatible = "ibm,uic-440ep","ibm,uic";
                 interrupt-controller;
                 cell-index = <1>;
-                dcr-reg = <0d0 009>;
+                dcr-reg = <0x0d0 0x009>;
                 #address-cells = <0>;
                 #size-cells = <0>;
                 #interrupt-cells = <2>;
-                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
                 interrupt-parent = <&UIC0>;
         };
 
         SDR0: sdr {
                 compatible = "ibm,sdr-440ep";
-                dcr-reg = <00e 002>;
+                dcr-reg = <0x00e 0x002>;
         };
 
         CPR0: cpr {
                 compatible = "ibm,cpr-440ep";
-                dcr-reg = <00c 002>;
+                dcr-reg = <0x00c 0x002>;
         };
 
         plb {
@@ -90,29 +92,29 @@
 
                 SDRAM0: sdram {
                         compatible = "ibm,sdram-440ep", "ibm,sdram-405gp";
-                        dcr-reg = <010 2>;
+                        dcr-reg = <0x010 0x002>;
                 };
 
                 DMA0: dma {
                         compatible = "ibm,dma-440ep", "ibm,dma-440gp";
-                        dcr-reg = <100 027>;
+                        dcr-reg = <0x100 0x027>;
                 };
 
                 MAL0: mcmal {
                         compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal";
-                        dcr-reg = <180 62>;
+                        dcr-reg = <0x180 0x062>;
                         num-tx-chans = <4>;
                         num-rx-chans = <2>;
                         interrupt-parent = <&MAL0>;
-                        interrupts = <0 1 2 3 4>;
+                        interrupts = <0x0 0x1 0x2 0x3 0x4>;
                         #interrupt-cells = <1>;
                         #address-cells = <0>;
                         #size-cells = <0>;
-                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
-                                        /*RXEOB*/ 1 &UIC0 b 4
-                                        /*SERR*/  2 &UIC1 0 4
-                                        /*TXDE*/  3 &UIC1 1 4
-                                        /*RXDE*/  4 &UIC1 2 4>;
+                        interrupt-map = </*TXEOB*/ 0x0 &UIC0 0xa 0x4
+                                        /*RXEOB*/ 0x1 &UIC0 0xb 0x4
+                                        /*SERR*/  0x2 &UIC1 0x0 0x4
+                                        /*TXDE*/  0x3 &UIC1 0x1 0x4
+                                        /*RXDE*/  0x4 &UIC1 0x2 0x4>;
                 };
 
                 POB0: opb {
@@ -122,110 +124,110 @@
                         /* Bamboo is oddball in the 44x world and doesn't use the ERPN
                          * bits.
                          */
-                        ranges = <00000000 0 00000000 80000000
-                                  80000000 0 80000000 80000000>;
+                        ranges = <0x00000000 0x00000000 0x00000000 0x80000000
+                                  0x80000000 0x00000000 0x80000000 0x80000000>;
                         interrupt-parent = <&UIC1>;
-                        interrupts = <7 4>;
+                        interrupts = <0x7 0x4>;
                         clock-frequency = <0>; /* Filled in by zImage */
 
                         EBC0: ebc {
                                 compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc";
-                                dcr-reg = <012 2>;
+                                dcr-reg = <0x012 0x002>;
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                interrupts = <5 1>;
+                                interrupts = <0x5 0x1>;
                                 interrupt-parent = <&UIC1>;
                         };
 
                         UART0: serial@ef600300 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600300 8>;
-                                virtual-reg = <ef600300>;
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                current-speed = <1c200>;
+                                current-speed = <115200>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <0 4>;
+                                interrupts = <0x0 0x4>;
                         };
 
                         UART1: serial@ef600400 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600400 8>;
-                                virtual-reg = <ef600400>;
+                                reg = <0xef600400 0x00000008>;
+                                virtual-reg = <0xef600400>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <1 4>;
+                                interrupts = <0x1 0x4>;
                         };
 
                         UART2: serial@ef600500 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600500 8>;
-                                virtual-reg = <ef600500>;
+                                reg = <0xef600500 0x00000008>;
+                                virtual-reg = <0xef600500>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <3 4>;
+                                interrupts = <0x3 0x4>;
                                 status = "disabled";
                         };
 
                         UART3: serial@ef600600 {
                                 device_type = "serial";
                                 compatible = "ns16550";
-                                reg = <ef600600 8>;
-                                virtual-reg = <ef600600>;
+                                reg = <0xef600600 0x00000008>;
+                                virtual-reg = <0xef600600>;
                                 clock-frequency = <0>;
                                 current-speed = <0>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <4 4>;
+                                interrupts = <0x4 0x4>;
                                 status = "disabled";
                         };
 
                         IIC0: i2c@ef600700 {
                                 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
-                                reg = <ef600700 14>;
+                                reg = <0xef600700 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <2 4>;
+                                interrupts = <0x2 0x4>;
                         };
 
                         IIC1: i2c@ef600800 {
                                 compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
-                                reg = <ef600800 14>;
+                                reg = <0xef600800 0x00000014>;
                                 interrupt-parent = <&UIC0>;
-                                interrupts = <7 4>;
+                                interrupts = <0x7 0x4>;
                         };
 
                         spi@ef600900 {
                                 compatible = "amcc,spi-440ep";
-                                reg = <ef600900 6>;
-                                interrupts = <8 4>;
+                                reg = <0xef600900 0x00000006>;
+                                interrupts = <0x8 0x4>;
                                 interrupt-parent = <&UIC0>;
                         };
 
                         ZMII0: emac-zmii@ef600d00 {
                                 compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii";
-                                reg = <ef600d00 c>;
+                                reg = <0xef600d00 0x0000000c>;
                         };
 
                         EMAC0: ethernet@ef600e00 {
                                 device_type = "network";
                                 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1c 4 1d 4>;
-                                reg = <ef600e00 70>;
+                                interrupts = <0x1c 0x4 0x1d 0x4>;
+                                reg = <0xef600e00 0x00000070>;
                                 local-mac-address = [000000000000];
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <0 1>;
                                 mal-rx-channel = <0>;
                                 cell-index = <0>;
-                                max-frame-size = <5dc>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <1500>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <0>;
                         };
@@ -234,26 +236,26 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                 interrupt-parent = <&UIC1>;
-                                interrupts = <1e 4 1f 4>;
-                                reg = <ef600f00 70>;
+                                interrupts = <0x1e 0x4 0x1f 0x4>;
+                                reg = <0xef600f00 0x00000070>;
                                 local-mac-address = [000000000000];
                                 mal-device = <&MAL0>;
                                 mal-tx-channel = <2 3>;
                                 mal-rx-channel = <1>;
                                 cell-index = <1>;
-                                max-frame-size = <5dc>;
-                                rx-fifo-size = <1000>;
-                                tx-fifo-size = <800>;
+                                max-frame-size = <1500>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
                                 phy-mode = "rmii";
-                                phy-map = <00000000>;
+                                phy-map = <0x00000000>;
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <1>;
                         };
 
                         usb@ef601000 {
                                 compatible = "ohci-be";
-                                reg = <ef601000 80>;
-                                interrupts = <8 4 9 4>;
+                                reg = <0xef601000 0x00000080>;
+                                interrupts = <0x8 0x4 0x9 0x4>;
                                 interrupt-parent = < &UIC1 >;
                         };
                 };
@@ -265,35 +267,35 @@
                         #address-cells = <3>;
                         compatible = "ibm,plb440ep-pci", "ibm,plb-pci";
                         primary;
-                        reg = <0 eec00000 8     /* Config space access */
-                               0 eed00000 4     /* IACK */
-                               0 eed00000 4     /* Special cycle */
-                               0 ef400000 40>;  /* Internal registers */
+                        reg = <0x00000000 0xeec00000 0x00000008 /* Config space access */
+                               0x00000000 0xeed00000 0x00000004 /* IACK */
+                               0x00000000 0xeed00000 0x00000004 /* Special cycle */
+                               0x00000000 0xef400000 0x00000040>;       /* Internal registers */
 
                         /* Outbound ranges, one memory and one IO,
                          * later cannot be changed. Chip supports a second
                          * IO range but we don't use it for now
                          */
-                        ranges = <02000000 0 a0000000 0 a0000000 0 20000000
-                                  01000000 0 00000000 0 e8000000 0 00010000>;
+                        ranges = <0x02000000 0x00000000 0xa0000000 0x00000000 0xa0000000 0x00000000 0x20000000
+                                  0x01000000 0x00000000 0x00000000 0x00000000 0xe8000000 0x00000000 0x00010000>;
 
                         /* Inbound 2GB range starting at 0 */
-                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>;
 
                         /* Bamboo has all 4 IRQ pins tied together per slot */
-                        interrupt-map-mask = <f800 0 0 0>;
+                        interrupt-map-mask = <0xf800 0x0 0x0 0x0>;
                         interrupt-map = <
                                 /* IDSEL 1 */
-                                0800 0 0 0 &UIC0 1c 8
+                                0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8
 
                                 /* IDSEL 2 */
-                                1000 0 0 0 &UIC0 1b 8
+                                0x1000 0x0 0x0 0x0 &UIC0 0x1b 0x8
 
                                 /* IDSEL 3 */
-                                1800 0 0 0 &UIC0 1a 8
+                                0x1800 0x0 0x0 0x0 &UIC0 0x1a 0x8
 
                                 /* IDSEL 4 */
-                                2000 0 0 0 &UIC0 19 8
+                                0x2000 0x0 0x0 0x0 &UIC0 0x19 0x8
                         >;
                 };
         };
diff --git a/arch/powerpc/boot/oflib.c b/arch/powerpc/boot/oflib.c
index 95b8fd69a403..b0ec9cf3eaaf 100644
--- a/arch/powerpc/boot/oflib.c
+++ b/arch/powerpc/boot/oflib.c
@@ -168,8 +168,19 @@ void *of_claim(unsigned long virt, unsigned long size, unsigned long align)
 
 void *of_vmlinux_alloc(unsigned long size)
 {
-        void *p = malloc(size);
-
+        unsigned long start = (unsigned long)_start, end = (unsigned long)_end;
+        void *addr;
+        void *p;
+
+        /* With some older POWER4 firmware we need to claim the area the kernel
+         * will reside in.  Newer firmwares don't need this so we just ignore
+         * the return value.
+         */
+        addr = of_claim(start, end - start, 0);
+        printf("Trying to claim from 0x%lx to 0x%lx (0x%lx) got %p\r\n",
+               start, end, end - start, addr);
+
+        p = malloc(size);
         if (!p)
                 fatal("Can't allocate memory for kernel image!\n\r");
 
diff --git a/arch/powerpc/boot/redboot-83xx.c b/arch/powerpc/boot/redboot-83xx.c
new file mode 100644
index 000000000000..79aa9e151fa7
--- /dev/null
+++ b/arch/powerpc/boot/redboot-83xx.c
@@ -0,0 +1,60 @@
+/*
+ * RedBoot firmware support
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ * Copyright (c) 2008 Codehermit
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "stdio.h"
+#include "redboot.h"
+#include "fsl-soc.h"
+#include "io.h"
+
+static bd_t bd;
+BSS_STACK(4096);
+
+#define MHZ(x)  ((x + 500000) / 1000000)
+
+static void platform_fixups(void)
+{
+        void *node;
+
+        dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
+        dt_fixup_mac_addresses(bd.bi_enetaddr);
+        dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 16, bd.bi_busfreq);
+
+        node = finddevice("/soc/cpm/brg");
+        if (node) {
+                printf("BRG clock-frequency <- 0x%x (%dMHz)\r\n",
+                       bd.bi_busfreq, MHZ(bd.bi_busfreq));
+                setprop(node, "clock-frequency",  &bd.bi_busfreq, 4);
+        }
+
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        memcpy(&bd, (char *)r3, sizeof(bd));
+
+        if (bd.bi_tag != 0x42444944)
+                return;
+
+        simple_alloc_init(_end,
+                          bd.bi_memstart + bd.bi_memsize - (unsigned long)_end,
+                          32, 64);
+
+        fdt_init(_dtb_start);
+        serial_console_init();
+        platform_ops.fixups = platform_fixups;
+
+        loader_info.cmdline = (char *)bd.bi_cmdline;
+        loader_info.cmdline_len = strlen((char *)bd.bi_cmdline);
+}
diff --git a/arch/powerpc/boot/simpleboot.c b/arch/powerpc/boot/simpleboot.c
index 86cd285bccc6..c58a0dada992 100644
--- a/arch/powerpc/boot/simpleboot.c
+++ b/arch/powerpc/boot/simpleboot.c
@@ -23,6 +23,8 @@
 
 BSS_STACK(4*1024);
 
+extern int platform_specific_init(void) __attribute__((weak));
+
 void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
@@ -80,5 +82,9 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
 
         /* prepare the device tree and find the console */
         fdt_init(_dtb_start);
+
+        if (platform_specific_init)
+                platform_specific_init();
+
         serial_console_init();
 }
diff --git a/arch/powerpc/boot/virtex.c b/arch/powerpc/boot/virtex.c
new file mode 100644
index 000000000000..f622805f8000
--- /dev/null
+++ b/arch/powerpc/boot/virtex.c
@@ -0,0 +1,100 @@
+/*
+ * The platform specific code for virtex devices since a boot loader is not
+ * always used.
+ *
+ * (C) Copyright 2008 Xilinx, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include "ops.h"
+#include "io.h"
+#include "stdio.h"
+
+#define UART_DLL                0       /* Out: Divisor Latch Low */
+#define UART_DLM                1       /* Out: Divisor Latch High */
+#define UART_FCR                2       /* Out: FIFO Control Register */
+#define UART_FCR_CLEAR_RCVR     0x02    /* Clear the RCVR FIFO */
+#define UART_FCR_CLEAR_XMIT     0x04    /* Clear the XMIT FIFO */
+#define UART_LCR                3       /* Out: Line Control Register */
+#define UART_MCR                4       /* Out: Modem Control Register */
+#define UART_MCR_RTS            0x02    /* RTS complement */
+#define UART_MCR_DTR            0x01    /* DTR complement */
+#define UART_LCR_DLAB           0x80    /* Divisor latch access bit */
+#define UART_LCR_WLEN8          0x03    /* Wordlength: 8 bits */
+
+static int virtex_ns16550_console_init(void *devp)
+{
+        unsigned char *reg_base;
+        u32 reg_shift, reg_offset, clk, spd;
+        u16 divisor;
+        int n;
+
+        if (dt_get_virtual_reg(devp, (void **)&reg_base, 1) < 1)
+                return -1;
+
+        n = getprop(devp, "reg-offset", &reg_offset, sizeof(reg_offset));
+        if (n == sizeof(reg_offset))
+                reg_base += reg_offset;
+
+        n = getprop(devp, "reg-shift", &reg_shift, sizeof(reg_shift));
+        if (n != sizeof(reg_shift))
+                reg_shift = 0;
+
+        n = getprop(devp, "current-speed", (void *)&spd, sizeof(spd));
+        if (n != sizeof(spd))
+                spd = 9600;
+
+        /* should there be a default clock rate?*/
+        n = getprop(devp, "clock-frequency", (void *)&clk, sizeof(clk));
+        if (n != sizeof(clk))
+                return -1;
+
+        divisor = clk / (16 * spd);
+
+        /* Access baud rate */
+        out_8(reg_base + (UART_LCR << reg_shift), UART_LCR_DLAB);
+
+        /* Baud rate based on input clock */
+        out_8(reg_base + (UART_DLL << reg_shift), divisor & 0xFF);
+        out_8(reg_base + (UART_DLM << reg_shift), divisor >> 8);
+
+        /* 8 data, 1 stop, no parity */
+        out_8(reg_base + (UART_LCR << reg_shift), UART_LCR_WLEN8);
+
+        /* RTS/DTR */
+        out_8(reg_base + (UART_MCR << reg_shift), UART_MCR_RTS | UART_MCR_DTR);
+
+        /* Clear transmitter and receiver */
+        out_8(reg_base + (UART_FCR << reg_shift),
+                                UART_FCR_CLEAR_XMIT | UART_FCR_CLEAR_RCVR);
+        return 0;
+}
+
+/* For virtex, the kernel may be loaded without using a bootloader and if so
+   some UARTs need more setup than is provided in the normal console init
+*/
+int platform_specific_init(void)
+{
+        void *devp;
+        char devtype[MAX_PROP_LEN];
+        char path[MAX_PATH_LEN];
+
+        devp = finddevice("/chosen");
+        if (devp == NULL)
+                return -1;
+
+        if (getprop(devp, "linux,stdout-path", path, MAX_PATH_LEN) > 0) {
+                devp = finddevice(path);
+                if (devp == NULL)
+                        return -1;
+
+                if ((getprop(devp, "device_type", devtype, sizeof(devtype)) > 0)
+                                && !strcmp(devtype, "serial")
+                                && (dt_is_compatible(devp, "ns16550")))
+                                virtex_ns16550_console_init(devp);
+        }
+        return 0;
+}
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index d6c96d9ab291..644bf9d4ea00 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -138,14 +138,20 @@ objflags=-S
 tmp=$tmpdir/zImage.$$.o
 ksection=.kernel:vmlinux.strip
 isection=.kernel:initrd
+link_address='0x400000'
 
 case "$platform" in
-pmac|pseries|chrp)
+pseries)
+    platformo=$object/of.o
+    link_address='0x4000000'
+    ;;
+pmac|chrp)
     platformo=$object/of.o
     ;;
 coff)
     platformo=$object/of.o
     lds=$object/zImage.coff.lds
+    link_address='0x500000'
     ;;
 miboot|uboot)
     # miboot and U-boot want just the bare bits, not an ELF binary
@@ -171,13 +177,13 @@ cuboot*)
     *-mpc824*)
         platformo=$object/cuboot-824x.o
         ;;
-    *-mpc83*)
+    *-mpc83*|*-asp834x*)
         platformo=$object/cuboot-83xx.o
         ;;
     *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555|*-ksi8560*)
         platformo=$object/cuboot-85xx-cpm2.o
         ;;
-    *-mpc85*|*-tqm8540|*-sbc85*)
+    *-mpc85*|*-tqm85*|*-sbc85*)
         platformo=$object/cuboot-85xx.o
         ;;
     esac
@@ -190,6 +196,7 @@ ps3)
     objflags="-O binary --set-section-flags=.bss=contents,alloc,load,data"
     ksection=.kernel:vmlinux.bin
     isection=.kernel:initrd
+    link_address=''
     ;;
 ep88xc|ep405|ep8248e)
     platformo="$object/fixed-head.o $object/$platform.o"
@@ -200,7 +207,19 @@ adder875-redboot)
     binary=y
     ;;
 simpleboot-virtex405-*)
-    platformo="$object/virtex405-head.o $object/simpleboot.o"
+    platformo="$object/virtex405-head.o $object/simpleboot.o $object/virtex.o"
+    binary=y
+    ;;
+simpleboot-virtex440-*)
+    platformo="$object/simpleboot.o $object/virtex.o"
+    binary=y
+    ;;
+simpleboot-*)
+    platformo="$object/simpleboot.o"
+    binary=y
+    ;;
+asp834x-redboot)
+    platformo="$object/fixed-head.o $object/redboot-83xx.o"
     binary=y
     ;;
 esac
@@ -268,7 +287,10 @@ if [ -n "$dtb" ]; then
 fi
 
 if [ "$platform" != "miboot" ]; then
-    ${CROSS}ld -m elf32ppc -T $lds -o "$ofile" \
+    if [ -n "$link_address" ] ; then
+        text_start="-Ttext $link_address --defsym _start=$link_address"
+    fi
+    ${CROSS}ld -m elf32ppc -T $lds $text_start -o "$ofile" \
         $platformo $tmp $object/wrapper.a
     rm $tmp
 fi
diff --git a/arch/powerpc/boot/zImage.coff.lds.S b/arch/powerpc/boot/zImage.coff.lds.S
index fe87a90ce7f1..856dc78b14ef 100644
--- a/arch/powerpc/boot/zImage.coff.lds.S
+++ b/arch/powerpc/boot/zImage.coff.lds.S
@@ -3,7 +3,6 @@ ENTRY(_zimage_start_opd)
 EXTERN(_zimage_start_opd)
 SECTIONS
 {
-  . = (5*1024*1024);
   _start = .;
   .text      :
   {
diff --git a/arch/powerpc/boot/zImage.lds.S b/arch/powerpc/boot/zImage.lds.S
index f6e380fdb388..0962d62bdb50 100644
--- a/arch/powerpc/boot/zImage.lds.S
+++ b/arch/powerpc/boot/zImage.lds.S
@@ -3,7 +3,6 @@ ENTRY(_zimage_start)
 EXTERN(_zimage_start)
 SECTIONS
 {
-  . = (4*1024*1024);
   _start = .;
   .text      :
   {
diff --git a/arch/powerpc/configs/44x/sam440ep_defconfig b/arch/powerpc/configs/44x/sam440ep_defconfig
new file mode 100644
index 000000000000..9ce5cbc2a4e7
--- /dev/null
+++ b/arch/powerpc/configs/44x/sam440ep_defconfig
@@ -0,0 +1,1192 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.25
+# Mon May  5 13:43:02 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+CONFIG_44x=y
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_4xx=y
+CONFIG_BOOKE=y
+CONFIG_PTE_64BIT=y
+CONFIG_PHYS_64BIT=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_NOT_COHERENT_CACHE=y
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_PPC_DCR_NATIVE=y
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_PPC_DCR=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+# CONFIG_IKCONFIG_PROC is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+# CONFIG_IOSCHED_DEADLINE is not set
+# CONFIG_IOSCHED_CFQ is not set
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
+# CONFIG_PPC4xx_PCI_EXPRESS is not set
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_BAMBOO is not set
+# CONFIG_EBONY is not set
+CONFIG_SAM440EP=y
+# CONFIG_SEQUOIA is not set
+# CONFIG_TAISHAN is not set
+# CONFIG_KATMAI is not set
+# CONFIG_RAINIER is not set
+# CONFIG_WARP is not set
+# CONFIG_CANYONLANDS is not set
+# CONFIG_YOSEMITE is not set
+CONFIG_440EP=y
+CONFIG_IBM440EP_ERR42=y
+# CONFIG_IPIC is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_PROC_DEVICETREE=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE=""
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_4xx_SOC=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HAS_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_TASK_SIZE=0xc0000000
+CONFIG_CONSISTENT_START=0xff100000
+CONFIG_CONSISTENT_SIZE=0x00200000
+
+#
+# Networking
+#
+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 is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+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_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC 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_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+# CONFIG_MTD is not set
+CONFIG_OF_DEVICE=y
+CONFIG_OF_I2C=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM 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_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=35000
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_XILINX_SYSACE is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+# CONFIG_SCSI_LOWLEVEL is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+# CONFIG_SATA_PMP is not set
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SIL24 is not set
+CONFIG_ATA_SFF=y
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_SATA_SIL=y
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_IBM_NEW_EMAC=y
+CONFIG_IBM_NEW_EMAC_RXB=128
+CONFIG_IBM_NEW_EMAC_TXB=64
+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
+CONFIG_IBM_NEW_EMAC_ZMII=y
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_B44 is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI is not set
+# CONFIG_IWLWIFI_LEDS is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_APPLETOUCH is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_PCI is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+# CONFIG_SERIAL_8250_RSA is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_CHARDEV is not set
+CONFIG_I2C_ALGOBIT=y
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# 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_IBM_IIC=y
+# CONFIG_I2C_MPC is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 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
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+
+#
+# Multimedia drivers
+#
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FB_DDC=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_SVGALIB is not set
+CONFIG_FB_MACMODES=y
+CONFIG_FB_BACKLIGHT=y
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_OF is not set
+# CONFIG_FB_CT65550 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_UVESA is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+CONFIG_FB_RADEON=y
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+# CONFIG_BACKLIGHT_CORGI is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_HCD_PPC_OF=y
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MON is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+CONFIG_RTC_DRV_M41T80=y
+CONFIG_RTC_DRV_M41T80_WDT=y
+# CONFIG_RTC_DRV_S35390A is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+# CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+CONFIG_AFFS_FS=m
+# 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_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_NETWORK_FILESYSTEMS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL 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_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_DLM is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC_ITU_T=y
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_IRQSTACKS is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_CRYPTO is not set
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/44x/taishan_defconfig b/arch/powerpc/configs/44x/taishan_defconfig
index 087aedce1338..e53c92655bd6 100644
--- a/arch/powerpc/configs/44x/taishan_defconfig
+++ b/arch/powerpc/configs/44x/taishan_defconfig
@@ -348,7 +348,83 @@ CONFIG_FW_LOADER=y
 # CONFIG_SYS_HYPERVISOR is not set
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
-# CONFIG_MTD is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+# CONFIG_MTD_BLKDEVS is not set
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
 CONFIG_OF_DEVICE=y
 # CONFIG_PARPORT is not set
 CONFIG_BLK_DEV=y
@@ -660,6 +736,7 @@ CONFIG_TMPFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
 CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_MINIX_FS is not set
diff --git a/arch/powerpc/configs/44x/virtex5_defconfig b/arch/powerpc/configs/44x/virtex5_defconfig
new file mode 100644
index 000000000000..9c41f66b5a7d
--- /dev/null
+++ b/arch/powerpc/configs/44x/virtex5_defconfig
@@ -0,0 +1,1107 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26-rc8
+# Wed Jul  2 15:36:41 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+CONFIG_44x=y
+# CONFIG_E200 is not set
+CONFIG_4xx=y
+CONFIG_BOOKE=y
+CONFIG_PTE_64BIT=y
+CONFIG_PHYS_64BIT=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_NOT_COHERENT_CACHE=y
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_PPC_DCR_NATIVE=y
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_PPC_DCR=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+# CONFIG_GROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_CLASSIC_RCU=y
+# CONFIG_PPC4xx_PCI_EXPRESS is not set
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_BAMBOO is not set
+# CONFIG_EBONY is not set
+# CONFIG_SEQUOIA is not set
+# CONFIG_TAISHAN is not set
+# CONFIG_KATMAI is not set
+# CONFIG_RAINIER is not set
+# CONFIG_WARP is not set
+# CONFIG_CANYONLANDS is not set
+# CONFIG_YOSEMITE is not set
+CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y
+CONFIG_XILINX_VIRTEX=y
+CONFIG_XILINX_VIRTEX_5_FXT=y
+# CONFIG_IPIC is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+# CONFIG_PREEMPT_RCU is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_MATH_EMULATION=y
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_PROC_DEVICETREE=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE=""
+CONFIG_EXTRA_TARGETS=""
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_4xx_SOC=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HAS_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_TASK_SIZE=0xc0000000
+CONFIG_CONSISTENT_START=0xff100000
+CONFIG_CONSISTENT_SIZE=0x00200000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+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 is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
+# CONFIG_IP_NF_MATCH_RECENT is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_AH is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
+CONFIG_IP_NF_FILTER=m
+# CONFIG_IP_NF_TARGET_REJECT is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+CONFIG_IP_NF_MANGLE=m
+# CONFIG_IP_NF_TARGET_ECN is not set
+# CONFIG_IP_NF_TARGET_TTL is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC 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_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+CONFIG_OF_DEVICE=y
+CONFIG_OF_I2C=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM 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_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=8192
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_XILINX_SYSACE is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# Enable only one of the two stacks, unless you know what you are doing
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E1000E_ENABLED is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+# CONFIG_MOUSE_PS2_TOUCHKIT is not set
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+# CONFIG_SERIO_I8042 is not set
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+# CONFIG_NVRAM is not set
+# CONFIG_GEN_RTC is not set
+CONFIG_XILINX_HWICAP=y
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# 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_IBM_IIC is not set
+# CONFIG_I2C_MPC is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+CONFIG_I2C_DEBUG_CORE=y
+CONFIG_I2C_DEBUG_ALGO=y
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+# CONFIG_FB_MACMODES is not set
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_OF is not set
+# CONFIG_FB_CT65550 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+CONFIG_FB_XILINX=y
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+# CONFIG_FONT_10x18 is not set
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_AUTOFS_FS=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_FUSE_FS=m
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# 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=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+CONFIG_ROMFS_FS=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V3_ACL is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=y
+# CONFIG_SMB_NLS_DEFAULT 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 is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_SAMPLES is not set
+# CONFIG_IRQSTACKS is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
new file mode 100644
index 000000000000..d2c435f0da42
--- /dev/null
+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
@@ -0,0 +1,1128 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26-rc2
+# Mon May 19 21:12:32 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+# CONFIG_FSL_EMB_PERFMON is not set
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+CONFIG_GENERIC_GPIO=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFAULT_UIMAGE=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+# CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
+
+#
+# Platform support
+#
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+CONFIG_MPC83xx=y
+# CONFIG_MPC831x_RDB is not set
+# CONFIG_MPC832x_MDS is not set
+# CONFIG_MPC832x_RDB is not set
+# CONFIG_MPC834x_MDS is not set
+# CONFIG_MPC834x_ITX is not set
+# CONFIG_MPC836x_MDS is not set
+CONFIG_MPC836x_RDK=y
+# CONFIG_MPC837x_MDS is not set
+# CONFIG_MPC837x_RDB is not set
+# CONFIG_SBC834x is not set
+CONFIG_IPIC=y
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_QUICC_ENGINE=y
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_FSL_LBC=y
+CONFIG_FSL_GTM=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HAS_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_TASK_SIZE=0xc0000000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+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_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC 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_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_OF_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_GEOMETRY is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+# CONFIG_MTD_CFI_AMDSTD is not set
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_OF_DEVICE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM 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_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=32768
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+CONFIG_BROADCOM_PHY=y
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+# CONFIG_NET_ETHERNET is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E1000E_ENABLED is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+# CONFIG_GIANFAR is not set
+CONFIG_UCC_GETH=y
+CONFIG_UGETH_NAPI=y
+# CONFIG_UGETH_MAGIC_PACKET is not set
+# CONFIG_UGETH_FILTERING is not set
+# CONFIG_UGETH_TX_ON_DEMAND is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV 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_TABLET 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
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+# CONFIG_DEVKMEM is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+CONFIG_SERIAL_QE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_GPIO is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_MPC=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 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
+CONFIG_SPI=y
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_BITBANG=y
+CONFIG_SPI_MPC83xx=y
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_AT25 is not set
+CONFIG_SPI_SPIDEV=y
+# CONFIG_SPI_TLE62X0 is not set
+CONFIG_HAVE_GPIO_LIB=y
+
+#
+# GPIO Support
+#
+
+#
+# I2C GPIO expanders:
+#
+# CONFIG_GPIO_PCA953X is not set
+# CONFIG_GPIO_PCF857X is not set
+
+#
+# SPI GPIO expanders:
+#
+# CONFIG_GPIO_MCP23S08 is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_83xx_WDT=y
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_EGPIO is not set
+# CONFIG_HTC_PASIC3 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+CONFIG_DAB=y
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+# CONFIG_FB_DDC is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
+# CONFIG_FB_SYS_FILLRECT is not set
+# CONFIG_FB_SYS_COPYAREA is not set
+# CONFIG_FB_SYS_IMAGEBLIT is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+# CONFIG_FB_SYS_FOPS is not set
+# CONFIG_FB_SVGALIB is not set
+CONFIG_FB_MACMODES=y
+# CONFIG_FB_BACKLIGHT is not set
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_OF=y
+# CONFIG_FB_CT65550 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_FSL_DIU is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
+# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP 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_EXT4DEV_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_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_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# 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_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_RPCSEC_GSS_KRB5=y
+# 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_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_NLS is not set
+# CONFIG_DLM is not set
+CONFIG_UCC_SLOW=y
+CONFIG_UCC_FAST=y
+CONFIG_UCC=y
+CONFIG_QE_GPIO=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_IRQSTACKS is not set
+CONFIG_PPC_EARLY_DEBUG=y
+# CONFIG_PPC_EARLY_DEBUG_LPAR is not set
+# CONFIG_PPC_EARLY_DEBUG_G5 is not set
+# CONFIG_PPC_EARLY_DEBUG_RTAS_PANEL is not set
+# CONFIG_PPC_EARLY_DEBUG_RTAS_CONSOLE is not set
+# CONFIG_PPC_EARLY_DEBUG_MAPLE is not set
+# CONFIG_PPC_EARLY_DEBUG_ISERIES is not set
+# CONFIG_PPC_EARLY_DEBUG_PAS_REALMODE is not set
+# CONFIG_PPC_EARLY_DEBUG_BEAT is not set
+# CONFIG_PPC_EARLY_DEBUG_44x is not set
+# CONFIG_PPC_EARLY_DEBUG_40x is not set
+# CONFIG_PPC_EARLY_DEBUG_CPM is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/85xx/tqm8548_defconfig b/arch/powerpc/configs/85xx/tqm8548_defconfig
new file mode 100644
index 000000000000..b3b770be3cc9
--- /dev/null
+++ b/arch/powerpc/configs/85xx/tqm8548_defconfig
@@ -0,0 +1,1225 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26-rc5
+# Thu Jun 26 14:40:02 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+CONFIG_PPC_85xx=y
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_E500=y
+# CONFIG_PPC_E500MC is not set
+CONFIG_BOOKE=y
+CONFIG_FSL_BOOKE=y
+CONFIG_FSL_EMB_PERFMON=y
+# CONFIG_PHYS_64BIT is not set
+CONFIG_SPE=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFAULT_UIMAGE=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+CONFIG_MPC85xx=y
+# CONFIG_MPC8540_ADS is not set
+# CONFIG_MPC8560_ADS is not set
+# CONFIG_MPC85xx_CDS is not set
+# CONFIG_MPC85xx_MDS is not set
+# CONFIG_MPC85xx_DS is not set
+# CONFIG_KSI8560 is not set
+# CONFIG_STX_GP3 is not set
+# CONFIG_TQM8540 is not set
+# CONFIG_TQM8541 is not set
+CONFIG_TQM8548=y
+# CONFIG_TQM8555 is not set
+# CONFIG_TQM8560 is not set
+# CONFIG_SBC8548 is not set
+# CONFIG_SBC8560 is not set
+CONFIG_TQM85xx=y
+# CONFIG_IPIC is not set
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
+CONFIG_PPC_CPM_NEW_BINDING=y
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=y
+CONFIG_MATH_EMULATION=y
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+# CONFIG_SECCOMP is not set
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_FSL_PCI=y
+CONFIG_FSL_LBC=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIEASPM is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HAS_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_PHYSICAL_ALIGN=0x10000000
+CONFIG_TASK_SIZE=0xc0000000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+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_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC 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_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_MTD_NAND=y
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+CONFIG_MTD_NAND_ECC_SMC=y
+# CONFIG_MTD_NAND_MUSEUM_IDS is not set
+CONFIG_MTD_NAND_IDS=y
+# CONFIG_MTD_NAND_DISKONCHIP is not set
+# CONFIG_MTD_NAND_CAFE is not set
+# CONFIG_MTD_NAND_NANDSIM is not set
+# CONFIG_MTD_NAND_PLATFORM is not set
+# CONFIG_MTD_NAND_FSL_ELBC is not set
+CONFIG_MTD_NAND_FSL_UPM=y
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_GLUEBI is not set
+
+#
+# UBI debugging options
+#
+# CONFIG_MTD_UBI_DEBUG is not set
+CONFIG_OF_DEVICE=y
+CONFIG_OF_I2C=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM 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_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=32768
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_HAVE_IDE=y
+CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_IDEDISK is not set
+# 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
+CONFIG_IDE_PROC_FS=y
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_PLATFORM is not set
+CONFIG_BLK_DEV_IDEDMA_SFF=y
+
+#
+# PCI IDE chipsets support
+#
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_PCIBUS_ORDER=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# 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_JMICRON is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT8213 is not set
+# CONFIG_BLK_DEV_IT821X 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_SL82C105 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_BLK_DEV_TC86C001 is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_BLK_DEV_HD_ONLY is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+CONFIG_E1000=y
+CONFIG_E1000_NAPI=y
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
+# CONFIG_E1000E is not set
+# CONFIG_E1000E_ENABLED is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+CONFIG_GIANFAR=y
+CONFIG_GFAR_NAPI=y
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NIU is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_BNX2X is not set
+# CONFIG_SFC is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV 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_TABLET 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
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# 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_MPC=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 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
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7473 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S 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=y
+# 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_LM93 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+CONFIG_DAB=y
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+# CONFIG_USB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS1307=y
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_PPC is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP 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_EXT4DEV_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_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_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# 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_JFFS2_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+# CONFIG_NFS_V3 is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# 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_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_NLS is not set
+# CONFIG_DLM is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUGGER is not set
+# CONFIG_IRQSTACKS is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/asp8347_defconfig b/arch/powerpc/configs/asp8347_defconfig
new file mode 100644
index 000000000000..60bb4d106c87
--- /dev/null
+++ b/arch/powerpc/configs/asp8347_defconfig
@@ -0,0 +1,1214 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.25-rc6
+# Tue May  6 02:21:00 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_FSL_EMB_PERFMON=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_REDBOOT=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+# CONFIG_KALLSYMS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+# CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+# CONFIG_KMOD is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
+
+#
+# Platform support
+#
+# CONFIG_PPC_MULTIPLATFORM is not set
+# CONFIG_PPC_82xx is not set
+CONFIG_PPC_83xx=y
+# CONFIG_PPC_86xx is not set
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+CONFIG_MPC83xx=y
+# CONFIG_MPC831x_RDB is not set
+# CONFIG_MPC832x_MDS is not set
+# CONFIG_MPC832x_RDB is not set
+# CONFIG_MPC834x_MDS is not set
+# CONFIG_MPC834x_ITX is not set
+# CONFIG_MPC836x_MDS is not set
+# CONFIG_MPC837x_MDS is not set
+# CONFIG_MPC837x_RDB is not set
+# CONFIG_SBC834x is not set
+CONFIG_ASP834x=y
+CONFIG_PPC_MPC834x=y
+CONFIG_IPIC=y
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI 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=0xc0000000
+CONFIG_BOOT_LOAD=0x00800000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+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_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC 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_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+CONFIG_MTD_REDBOOT_PARTS=y
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED=y
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_OF_PARTS=y
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_OF_DEVICE=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM 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_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=32768
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E1000E_ENABLED is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+CONFIG_GIANFAR=y
+# CONFIG_GFAR_NAPI is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV 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_TABLET 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
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+CONFIG_GEN_RTC=y
+# CONFIG_GEN_RTC_X is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=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_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# 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_MPC=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_TPS65010 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 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
+
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7473 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S 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_LM93 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+CONFIG_THERMAL=y
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+CONFIG_83xx_WDT=y
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_FSL=y
+CONFIG_USB_EHCI_HCD_PPC_OF=y
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+
+#
+# Conflicting RTC option has been selected, check GEN_RTC and RTC
+#
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+CONFIG_RTC_DRV_DS1374=y
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_DMADEVICES is not set
+
+#
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP 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_EXT4DEV_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_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_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# 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_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_RPCSEC_GSS_KRB5=y
+# 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_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+# CONFIG_DLM is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+# CONFIG_CRYPTO_SEQIV is not set
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_ECB=m
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_TEST is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig
new file mode 100644
index 000000000000..dc599c7e97d5
--- /dev/null
+++ b/arch/powerpc/configs/c2k_defconfig
@@ -0,0 +1,1872 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26-rc2
+# Thu May 15 11:00:14 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+# CONFIG_ALTIVEC is not set
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
+CONFIG_NOT_COHERENT_CACHE=y
+CONFIG_CHECK_CACHE_COHERENCY=y
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+# CONFIG_PPC_UDBG_16550 is not set
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_DEFAULT_UIMAGE is not set
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+CONFIG_AUDIT=y
+CONFIG_AUDITSYSCALL=y
+CONFIG_AUDIT_TREE=y
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+CONFIG_NAMESPACES=y
+# CONFIG_UTS_NS is not set
+# CONFIG_IPC_NS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+# CONFIG_EMBEDDED is not set
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_PROFILING=y
+# CONFIG_MARKERS is not set
+CONFIG_OPROFILE=m
+CONFIG_HAVE_OPROFILE=y
+CONFIG_KPROBES=y
+CONFIG_KRETPROBES=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+CONFIG_LBD=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_CLASSIC_RCU=y
+
+#
+# Platform support
+#
+CONFIG_PPC_MULTIPLATFORM=y
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
+CONFIG_CLASSIC32=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_MPC5121_ADS is not set
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_PMAC is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+CONFIG_EMBEDDED6xx=y
+# CONFIG_LINKSTATION is not set
+# CONFIG_STORCENTER is not set
+# CONFIG_MPC7448HPC2 is not set
+# CONFIG_PPC_HOLLY is not set
+# CONFIG_PPC_PRPMC2800 is not set
+CONFIG_PPC_C2K=y
+CONFIG_MV64X60=y
+# CONFIG_IPIC is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_TABLE=y
+# CONFIG_CPU_FREQ_DEBUG is not set
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_STAT_DETAILS is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=m
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=m
+# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set
+
+#
+# CPU Frequency drivers
+#
+# CONFIG_TAU is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+CONFIG_HIGHMEM=y
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=y
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+# CONFIG_KEXEC is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_PROC_DEVICETREE is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCCARD is not set
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_FAKE is not set
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
+# CONFIG_HAS_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_TASK_SIZE=0xc0000000
+CONFIG_CONSISTENT_START=0xff100000
+CONFIG_CONSISTENT_SIZE=0x00200000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IP_VS=m
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IPV6=m
+CONFIG_IPV6_PRIVACY=y
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_SECMARK is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+# CONFIG_IP_NF_MATCH_AH is not set
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+# CONFIG_IP_NF_TARGET_TTL is not set
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+# CONFIG_IP6_NF_MATCH_AH is not set
+# CONFIG_IP6_NF_MATCH_MH is not set
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+CONFIG_IP6_NF_MANGLE=m
+# CONFIG_IP6_NF_TARGET_HL is not set
+CONFIG_IP6_NF_RAW=m
+
+#
+# Bridge: Netfilter Configuration
+#
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+# CONFIG_BRIDGE_EBT_ULOG is not set
+# CONFIG_BRIDGE_EBT_NFLOG is not set
+# CONFIG_IP_DCCP is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_TIPC is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+# CONFIG_ATM_MPOA is not set
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# 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_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+# CONFIG_NET_SCH_RR is not set
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+# CONFIG_NET_CLS_BASIC is not set
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+# CONFIG_NET_CLS_FLOW is not set
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_CLS_ACT is not set
+CONFIG_NET_CLS_IND=y
+CONFIG_NET_SCH_FIFO=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NET_TCPPROBE is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+CONFIG_BT=m
+CONFIG_BT_L2CAP=m
+CONFIG_BT_SCO=m
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_HCIUSB=m
+CONFIG_BT_HCIUSB_SCO=y
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+# CONFIG_BT_HCIUART_LL is not set
+CONFIG_BT_HCIBCM203X=m
+# CONFIG_BT_HCIBPA10X is not set
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIVHCI=m
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+CONFIG_WIRELESS_EXT=y
+# CONFIG_MAC80211 is not set
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_I4=y
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PCI is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_OF_DEVICE=y
+CONFIG_OF_I2C=m
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=m
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+# CONFIG_SCSI_SAS_LIBSAS is not set
+CONFIG_SCSI_SRP_ATTRS=m
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=4
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC7XXX_OLD=m
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+CONFIG_SCSI_ARCMSR=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+# CONFIG_MEGARAID_LEGACY is not set
+CONFIG_MEGARAID_SAS=m
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_STEX is not set
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_QLOGIC_1280=m
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+CONFIG_VITESSE_PHY=y
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E1000E_ENABLED is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+CONFIG_MV643XX_ETH=y
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_ATM_DRIVERS is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+CONFIG_SLHC=m
+# CONFIG_NET_FC is not set
+CONFIG_NETCONSOLE=m
+# CONFIG_NETCONSOLE_DYNAMIC is not set
+CONFIG_NETPOLL=y
+CONFIG_NETPOLL_TRAP=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_ISDN=m
+CONFIG_ISDN_I4L=m
+CONFIG_ISDN_PPP=y
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_IPPP_FILTER=y
+# CONFIG_ISDN_PPP_BSDCOMP is not set
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DRV_LOOP=m
+# CONFIG_ISDN_DIVERSION is not set
+
+#
+# ISDN4Linux hardware drivers
+#
+
+#
+# Passive cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+
+#
+# D-channel protocol features
+#
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+CONFIG_HISAX_NO_SENDCOMPLETE=y
+CONFIG_HISAX_NO_LLC=y
+CONFIG_HISAX_NO_KEYPAD=y
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+
+#
+# HiSax supported cards
+#
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+# CONFIG_HISAX_DEBUG is not set
+
+#
+# HiSax PCMCIA card service modules
+#
+
+#
+# HiSax sub driver modules
+#
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_HFCUSB=m
+# CONFIG_HISAX_HFC4S8S is not set
+CONFIG_HISAX_FRITZ_PCIPNP=m
+CONFIG_HISAX_HDLC=y
+
+#
+# Active cards
+#
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+# CONFIG_ISDN_DRV_GIGASET is not set
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+
+#
+# CAPI hardware drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_CAPI_EICON=y
+CONFIG_ISDN_DIVAS=m
+CONFIG_ISDN_DIVAS_BRIPCI=y
+CONFIG_ISDN_DIVAS_PRIPCI=y
+CONFIG_ISDN_DIVAS_DIVACAPI=m
+CONFIG_ISDN_DIVAS_USERIDI=m
+CONFIG_ISDN_DIVAS_MAINT=m
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+CONFIG_INPUT_EVDEV=y
+# 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_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_INPUT_ATI_REMOTE is not set
+# CONFIG_INPUT_ATI_REMOTE2 is not set
+# CONFIG_INPUT_KEYSPAN_REMOTE is not set
+# CONFIG_INPUT_POWERMATE is not set
+# CONFIG_INPUT_YEALINK is not set
+CONFIG_INPUT_UINPUT=m
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+CONFIG_SERIAL_NONSTANDARD=y
+# CONFIG_COMPUTONE is not set
+# CONFIG_ROCKETPORT is not set
+# CONFIG_CYCLADES is not set
+# CONFIG_DIGIEPCA is not set
+# CONFIG_MOXA_INTELLIO is not set
+# CONFIG_MOXA_SMARTIO is not set
+# CONFIG_ISI is not set
+# CONFIG_SYNCLINK is not set
+# CONFIG_SYNCLINKMP is not set
+# CONFIG_SYNCLINK_GT is not set
+# CONFIG_N_HDLC is not set
+# CONFIG_RISCOM8 is not set
+# CONFIG_SPECIALIX is not set
+# CONFIG_SX is not set
+# CONFIG_RIO is not set
+# CONFIG_STALDRV is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_MPSC=y
+CONFIG_SERIAL_MPSC_CONSOLE=y
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=m
+CONFIG_NVRAM=m
+CONFIG_GEN_RTC=m
+# CONFIG_GEN_RTC_X is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+CONFIG_RAW_DRIVER=y
+CONFIG_MAX_RAW_DEVS=8192
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=m
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=m
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# 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_MPC is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+CONFIG_I2C_MV64XXX=m
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+CONFIG_SENSORS_EEPROM=m
+CONFIG_SENSORS_PCF8574=m
+# CONFIG_PCF8575 is not set
+CONFIG_SENSORS_PCF8591=m
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 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
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=m
+CONFIG_HWMON_VID=m
+# CONFIG_SENSORS_AD7418 is not set
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+# CONFIG_SENSORS_ADM1029 is not set
+CONFIG_SENSORS_ADM1031=m
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7473 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+CONFIG_SENSORS_DS1621=m
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+CONFIG_SENSORS_GL518SM=m
+# CONFIG_SENSORS_GL520SM is not set
+CONFIG_SENSORS_IT87=m
+# CONFIG_SENSORS_LM63 is not set
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_LM93 is not set
+CONFIG_SENSORS_MAX1619=m
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
+CONFIG_SENSORS_SMSC47M1=m
+# CONFIG_SENSORS_SMSC47M192 is not set
+CONFIG_SENSORS_SMSC47B397=m
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_THMC50 is not set
+CONFIG_SENSORS_VIA686A=m
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+CONFIG_SENSORS_W83781D=m
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+CONFIG_SENSORS_W83L785TS=m
+# CONFIG_SENSORS_W83L786NG is not set
+CONFIG_SENSORS_W83627HF=m
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_THERMAL is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+# CONFIG_MV64X60_WDT is not set
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+CONFIG_WDT_501_PCI=y
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+
+#
+# Multimedia drivers
+#
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_HID_SUPPORT is not set
+CONFIG_HID=m
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_SUSPEND=y
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_HCD_PPC_OF=y
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+# CONFIG_USB_OHCI_HCD_PPC_OF_LE is not set
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_UHCI_HCD=m
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_DPCM=y
+# CONFIG_USB_STORAGE_USBAT is not set
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_SERIAL=m
+CONFIG_USB_EZUSB=y
+CONFIG_USB_SERIAL_GENERIC=y
+# CONFIG_USB_SERIAL_AIRCABLE is not set
+# CONFIG_USB_SERIAL_AIRPRIME is not set
+# CONFIG_USB_SERIAL_ARK3116 is not set
+CONFIG_USB_SERIAL_BELKIN=m
+# CONFIG_USB_SERIAL_CH341 is not set
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+# CONFIG_USB_SERIAL_CP2101 is not set
+# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+# CONFIG_USB_SERIAL_FUNSOFT is not set
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+# CONFIG_USB_SERIAL_GARMIN is not set
+# CONFIG_USB_SERIAL_IPW is not set
+# CONFIG_USB_SERIAL_IUU is not set
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_MPR=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+# CONFIG_USB_SERIAL_MOS7720 is not set
+# CONFIG_USB_SERIAL_MOS7840 is not set
+# CONFIG_USB_SERIAL_NAVMAN is not set
+CONFIG_USB_SERIAL_PL2303=m
+# CONFIG_USB_SERIAL_OTI6858 is not set
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
+# CONFIG_USB_SERIAL_HP4X is not set
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
+# CONFIG_USB_SERIAL_TI is not set
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+# CONFIG_USB_SERIAL_OPTION is not set
+CONFIG_USB_SERIAL_OMNINET=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+CONFIG_USB_AUERSWALD=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+# CONFIG_USB_BERRY_CHARGE is not set
+CONFIG_USB_LED=m
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+CONFIG_USB_TEST=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+# CONFIG_USB_CXACRU is not set
+# CONFIG_USB_UEAGLEATM is not set
+# CONFIG_USB_XUSBATM is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_MTHCA=m
+CONFIG_INFINIBAND_MTHCA_DEBUG=y
+CONFIG_INFINIBAND_AMSO1100=m
+# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
+# CONFIG_MLX4_INFINIBAND is not set
+# CONFIG_INFINIBAND_NES is not set
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+CONFIG_INFINIBAND_IPOIB_DEBUG=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
+CONFIG_INFINIBAND_SRP=m
+# CONFIG_INFINIBAND_ISER is not set
+# CONFIG_EDAC is not set
+# CONFIG_RTC_CLASS is not set
+CONFIG_DMADEVICES=y
+
+#
+# DMA Devices
+#
+# CONFIG_FSL_DMA is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+# CONFIG_EXT2_FS is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+CONFIG_EXT3_FS_SECURITY=y
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=m
+CONFIG_FS_MBCACHE=m
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_QUOTA=y
+# CONFIG_QUOTA_NETLINK_INTERFACE is not set
+CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_QFMT_V1 is not set
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=m
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_ECRYPT_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_CRAMFS=m
+CONFIG_VXFS_FS=m
+# CONFIG_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_RPCSEC_GSS_SPKM3=m
+# CONFIG_SMB_FS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL 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=y
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+# CONFIG_KARMA_PARTITION is not set
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+CONFIG_CRC_CCITT=m
+# CONFIG_CRC16 is not set
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_HAVE_LMB=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+CONFIG_DEBUG_SPINLOCK=y
+# CONFIG_DEBUG_MUTEXES is not set
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_HIGHMEM=y
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_LKDTM is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
+CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_DEBUG_STACK_USAGE=y
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUGGER is not set
+# CONFIG_IRQSTACKS is not set
+# CONFIG_BDI_SWITCH is not set
+CONFIG_BOOTX_TEXT=y
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_CAPABILITIES=y
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set
+# CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_NULL=m
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/mpc8536_ds_defconfig b/arch/powerpc/configs/mpc8536_ds_defconfig
new file mode 100644
index 000000000000..f1e2931de5da
--- /dev/null
+++ b/arch/powerpc/configs/mpc8536_ds_defconfig
@@ -0,0 +1,1637 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26-rc8
+# Wed Jul  2 01:34:26 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+CONFIG_PPC_85xx=y
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_E500=y
+# CONFIG_PPC_E500MC is not set
+CONFIG_BOOKE=y
+CONFIG_FSL_BOOKE=y
+CONFIG_FSL_EMB_PERFMON=y
+# CONFIG_PHYS_64BIT is not set
+CONFIG_SPE=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFAULT_UIMAGE=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+CONFIG_AUDIT=y
+# CONFIG_AUDITSYSCALL is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+CONFIG_LBD=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_CLASSIC_RCU=y
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+CONFIG_MPC85xx=y
+# CONFIG_MPC8540_ADS is not set
+# CONFIG_MPC8560_ADS is not set
+# CONFIG_MPC85xx_CDS is not set
+# CONFIG_MPC85xx_MDS is not set
+CONFIG_MPC8536_DS=y
+# CONFIG_MPC85xx_DS is not set
+# CONFIG_KSI8560 is not set
+# CONFIG_STX_GP3 is not set
+# CONFIG_TQM8540 is not set
+# CONFIG_TQM8541 is not set
+# CONFIG_TQM8548 is not set
+# CONFIG_TQM8555 is not set
+# CONFIG_TQM8560 is not set
+# CONFIG_SBC8548 is not set
+# CONFIG_SBC8560 is not set
+# CONFIG_IPIC is not set
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPM2 is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+CONFIG_HIGHMEM=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+CONFIG_MATH_EMULATION=y
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_FSL_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HAS_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_PHYSICAL_ALIGN=0x10000000
+CONFIG_TASK_SIZE=0xc0000000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPGRE=y
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_TIPC 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_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+CONFIG_OF_DEVICE=y
+CONFIG_OF_I2C=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM 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=y
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=524288
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_SATA_PMP=y
+# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_SIL24=y
+CONFIG_SATA_FSL=y
+CONFIG_ATA_SFF=y
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_SATA_SIL=y
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# Enable only one of the two stacks, unless you know what you are doing
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+CONFIG_DUMMY=y
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+CONFIG_VITESSE_PHY=y
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E1000E_ENABLED is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+CONFIG_SKGE=y
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKY2=y
+# CONFIG_SKY2_DEBUG is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+CONFIG_GIANFAR=y
+CONFIG_GFAR_NAPI=y
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NIU is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_BNX2X is not set
+# CONFIG_SFC is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV 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_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_CHARDEV is not set
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# 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_MPC=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+CONFIG_SENSORS_EEPROM=y
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 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
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+# CONFIG_TTPCI_EEPROM is not set
+# CONFIG_DVB_BUDGET_CORE is not set
+
+#
+# Supported USB Adapters
+#
+# CONFIG_DVB_USB is not set
+# CONFIG_DVB_TTUSB_BUDGET is not set
+# CONFIG_DVB_TTUSB_DEC is not set
+# CONFIG_DVB_CINERGYT2 is not set
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+# CONFIG_DVB_B2C2_FLEXCOP is not set
+
+#
+# Supported BT878 Adapters
+#
+
+#
+# Supported Pluto2 Adapters
+#
+# CONFIG_DVB_PLUTO2 is not set
+
+#
+# Supported DVB Frontends
+#
+
+#
+# Customise DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# DVB-S (satellite) frontends
+#
+# CONFIG_DVB_CX24110 is not set
+# CONFIG_DVB_CX24123 is not set
+# CONFIG_DVB_MT312 is not set
+# CONFIG_DVB_S5H1420 is not set
+# CONFIG_DVB_STV0299 is not set
+# CONFIG_DVB_TDA8083 is not set
+# CONFIG_DVB_TDA10086 is not set
+# CONFIG_DVB_VES1X93 is not set
+# CONFIG_DVB_TUNER_ITD1000 is not set
+# CONFIG_DVB_TDA826X is not set
+# CONFIG_DVB_TUA6100 is not set
+
+#
+# DVB-T (terrestrial) frontends
+#
+# CONFIG_DVB_SP8870 is not set
+# CONFIG_DVB_SP887X is not set
+# CONFIG_DVB_CX22700 is not set
+# CONFIG_DVB_CX22702 is not set
+# CONFIG_DVB_L64781 is not set
+# CONFIG_DVB_TDA1004X is not set
+# CONFIG_DVB_NXT6000 is not set
+# CONFIG_DVB_MT352 is not set
+# CONFIG_DVB_ZL10353 is not set
+# CONFIG_DVB_DIB3000MB is not set
+# CONFIG_DVB_DIB3000MC is not set
+# CONFIG_DVB_DIB7000M is not set
+# CONFIG_DVB_DIB7000P is not set
+# CONFIG_DVB_TDA10048 is not set
+
+#
+# DVB-C (cable) frontends
+#
+# CONFIG_DVB_VES1820 is not set
+# CONFIG_DVB_TDA10021 is not set
+# CONFIG_DVB_TDA10023 is not set
+# CONFIG_DVB_STV0297 is not set
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+# CONFIG_DVB_NXT200X is not set
+# CONFIG_DVB_OR51211 is not set
+# CONFIG_DVB_OR51132 is not set
+# CONFIG_DVB_BCM3510 is not set
+# CONFIG_DVB_LGDT330X is not set
+# CONFIG_DVB_S5H1409 is not set
+# CONFIG_DVB_AU8522 is not set
+# CONFIG_DVB_S5H1411 is not set
+
+#
+# Digital terrestrial only tuners/PLL
+#
+# CONFIG_DVB_PLL is not set
+# CONFIG_DVB_TUNER_DIB0070 is not set
+
+#
+# SEC control devices for DVB-S
+#
+# CONFIG_DVB_LNBP21 is not set
+# CONFIG_DVB_ISL6405 is not set
+# CONFIG_DVB_ISL6421 is not set
+CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+# CONFIG_SND_SEQUENCER is not set
+# CONFIG_SND_MIXER_OSS is not set
+# CONFIG_SND_PCM_OSS is not set
+# CONFIG_SND_DYNAMIC_MINORS is not set
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_AC97_CODEC=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+
+#
+# PCI devices
+#
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HIFIER is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+CONFIG_SND_INTEL8X0=y
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+
+#
+# ALSA PowerMac devices
+#
+
+#
+# ALSA PowerPC devices
+#
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+
+#
+# System on Chip audio support
+#
+# CONFIG_SND_SOC is not set
+
+#
+# ALSA SoC audio for Freescale SOCs
+#
+
+#
+# SoC Audio for the Texas Instruments OMAP
+#
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=y
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+CONFIG_USB_EHCI_FSL=y
+CONFIG_USB_EHCI_HCD_PPC_OF=y
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_PPC is not set
+CONFIG_DMADEVICES=y
+
+#
+# DMA Devices
+#
+CONFIG_FSL_DMA=y
+CONFIG_DMA_ENGINE=y
+
+#
+# DMA Clients
+#
+# CONFIG_NET_DMA is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP 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_EXT4DEV_FS 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
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_CRAMFS=y
+CONFIG_VXFS_FS=m
+# CONFIG_MINIX_FS is not set
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+# CONFIG_ROMFS_FS is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+CONFIG_NFSD=y
+# CONFIG_NFSD_V3 is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_RPCSEC_GSS_KRB5=y
+# 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=y
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL 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_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUGGER is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_IRQSTACKS is not set
+# CONFIG_VIRQ_DEBUG is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_SHA1=m
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
index 12f9b5a80220..f9d279bb700b 100644
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.25-rc6
-# Sat Apr  5 09:35:48 2008
+# Linux kernel version: 2.6.26-rc8
+# Wed Jul  9 13:50:48 2008
 #
 # CONFIG_PPC64 is not set
 
@@ -32,6 +32,8 @@ CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_HARDIRQS=y
 # CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
 CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_ARCH_HAS_ILOG2_U32=y
 CONFIG_GENERIC_HWEIGHT=y
@@ -88,6 +90,7 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
 CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_KALLSYMS_EXTRA_PASS=y
@@ -115,12 +118,14 @@ CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 # CONFIG_MODVERSIONS is not set
@@ -157,6 +162,7 @@ CONFIG_PPC4xx_PCI_EXPRESS=y
 # CONFIG_PQ2ADS is not set
 CONFIG_BAMBOO=y
 CONFIG_EBONY=y
+CONFIG_SAM440EP=y
 CONFIG_SEQUOIA=y
 CONFIG_TAISHAN=y
 CONFIG_KATMAI=y
@@ -164,6 +170,7 @@ CONFIG_RAINIER=y
 CONFIG_WARP=y
 CONFIG_CANYONLANDS=y
 CONFIG_YOSEMITE=y
+CONFIG_XILINX_VIRTEX440_GENERIC_BOARD=y
 CONFIG_440EP=y
 CONFIG_440EPX=y
 CONFIG_440GRX=y
@@ -172,6 +179,8 @@ CONFIG_440GX=y
 CONFIG_440SPe=y
 CONFIG_460EX=y
 CONFIG_IBM440EP_ERR42=y
+CONFIG_XILINX_VIRTEX=y
+CONFIG_XILINX_VIRTEX_5_FXT=y
 # CONFIG_IPIC is not set
 # CONFIG_MPIC is not set
 # CONFIG_MPIC_WEIRD is not set
@@ -220,13 +229,16 @@ CONFIG_FLATMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_RESOURCES_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
 CONFIG_PROC_DEVICETREE=y
 # CONFIG_CMDLINE_BOOL is not set
+CONFIG_EXTRA_TARGETS=""
 CONFIG_SECCOMP=y
 CONFIG_ISA_DMA_API=y
 
@@ -246,6 +258,7 @@ CONFIG_PCI_LEGACY=y
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HAS_RAPIDIO is not set
 
 #
 # Advanced setup
@@ -255,13 +268,13 @@ CONFIG_PCI_LEGACY=y
 #
 # Default settings for advanced configuration options are used
 #
-CONFIG_HIGHMEM_START=0xfe000000
 CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
 CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
 CONFIG_TASK_SIZE=0xc0000000
 CONFIG_CONSISTENT_START=0xff100000
 CONFIG_CONSISTENT_SIZE=0x00200000
-CONFIG_BOOT_LOAD=0x01000000
 
 #
 # Networking
@@ -303,8 +316,6 @@ CONFIG_TCP_CONG_CUBIC=y
 CONFIG_DEFAULT_TCP_CONG="cubic"
 # CONFIG_TCP_MD5SIG is not set
 # CONFIG_IPV6 is not set
-# CONFIG_INET6_XFRM_TUNNEL is not set
-# CONFIG_INET6_TUNNEL is not set
 # CONFIG_NETWORK_SECMARK is not set
 # CONFIG_NETFILTER is not set
 # CONFIG_IP_DCCP is not set
@@ -366,6 +377,7 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_CMDLINE_PARTS is not set
 CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
 
 #
 # User Modules And Translation Layers
@@ -478,6 +490,10 @@ CONFIG_HAVE_IDE=y
 #
 # IEEE 1394 (FireWire) support
 #
+
+#
+# Enable only one of the two stacks, unless you know what you are doing
+#
 # CONFIG_FIREWIRE is not set
 # CONFIG_IEEE1394 is not set
 # CONFIG_I2O is not set
@@ -528,7 +544,6 @@ CONFIG_NETDEV_1000=y
 # CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
 # CONFIG_TIGON3 is not set
 # CONFIG_BNX2 is not set
@@ -546,6 +561,7 @@ CONFIG_NETDEV_10000=y
 # CONFIG_MLX4_CORE is not set
 # CONFIG_TEHUTI is not set
 # CONFIG_BNX2X is not set
+# CONFIG_SFC is not set
 # CONFIG_TR is not set
 
 #
@@ -553,6 +569,7 @@ CONFIG_NETDEV_10000=y
 #
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_WAN is not set
 # CONFIG_FDDI is not set
 # CONFIG_HIPPI is not set
@@ -579,6 +596,7 @@ CONFIG_NETDEV_10000=y
 # Character devices
 #
 # CONFIG_VT is not set
+CONFIG_DEVKMEM=y
 # CONFIG_SERIAL_NONSTANDARD is not set
 # CONFIG_NOZOMI is not set
 
@@ -611,22 +629,19 @@ CONFIG_LEGACY_PTY_COUNT=256
 # CONFIG_HW_RANDOM is not set
 # CONFIG_NVRAM is not set
 # CONFIG_GEN_RTC is not set
+CONFIG_XILINX_HWICAP=m
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
 CONFIG_DEVPORT=y
 # CONFIG_I2C is not set
-
-#
-# SPI support
-#
 # CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
 # CONFIG_W1 is not set
 # CONFIG_POWER_SUPPLY is not set
 # CONFIG_HWMON is not set
 # CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
 # CONFIG_WATCHDOG is not set
 
 #
@@ -639,12 +654,22 @@ CONFIG_SSB_POSSIBLE=y
 # Multifunction device drivers
 #
 # CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
 
 #
 # Multimedia devices
 #
+
+#
+# Multimedia core support
+#
 # CONFIG_VIDEO_DEV is not set
 # CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
 # CONFIG_DAB is not set
 
 #
@@ -671,6 +696,8 @@ CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
 CONFIG_USB_ARCH_HAS_EHCI=y
 # CONFIG_USB is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
 
 #
 # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -679,14 +706,11 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # CONFIG_MMC is not set
 # CONFIG_MEMSTICK is not set
 # CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
 # CONFIG_INFINIBAND is not set
 # CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
 # CONFIG_DMADEVICES is not set
-
-#
-# Userspace I/O
-#
 # CONFIG_UIO is not set
 
 #
@@ -701,7 +725,6 @@ CONFIG_EXT2_FS=y
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 # CONFIG_XFS_FS is not set
-# CONFIG_GFS2_FS is not set
 # CONFIG_OCFS2_FS is not set
 CONFIG_DNOTIFY=y
 CONFIG_INOTIFY=y
@@ -770,7 +793,6 @@ CONFIG_NFS_FS=y
 CONFIG_NFS_V3=y
 # CONFIG_NFS_V3_ACL 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
@@ -798,6 +820,7 @@ CONFIG_MSDOS_PARTITION=y
 # Library routines
 #
 CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
 # CONFIG_CRC_CCITT is not set
 # CONFIG_CRC16 is not set
 # CONFIG_CRC_ITU_T is not set
@@ -818,6 +841,7 @@ CONFIG_HAVE_LMB=y
 # CONFIG_PRINTK_TIME is not set
 CONFIG_ENABLE_WARN_DEPRECATED=y
 CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
 CONFIG_MAGIC_SYSRQ=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_DEBUG_FS is not set
@@ -828,6 +852,7 @@ CONFIG_DETECT_SOFTLOCKUP=y
 CONFIG_SCHED_DEBUG=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
@@ -840,6 +865,7 @@ CONFIG_SCHED_DEBUG=y
 CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_INFO is not set
 # CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
 # CONFIG_DEBUG_LIST is not set
 # CONFIG_DEBUG_SG is not set
 # CONFIG_BOOT_PRINTK_DELAY is not set
@@ -851,6 +877,9 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUGGER is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_IRQSTACKS is not set
 # CONFIG_BDI_SWITCH is not set
 # CONFIG_PPC_EARLY_DEBUG is not set
 
@@ -861,50 +890,80 @@ CONFIG_DEBUG_BUGVERBOSE=y
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
 CONFIG_CRYPTO_ALGAPI=y
 CONFIG_CRYPTO_BLKCIPHER=y
-# CONFIG_CRYPTO_SEQIV is not set
 CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=y
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=y
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
 # CONFIG_CRYPTO_HMAC is not set
 # CONFIG_CRYPTO_XCBC is not set
-# CONFIG_CRYPTO_NULL is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
 # CONFIG_CRYPTO_SHA1 is not set
 # CONFIG_CRYPTO_SHA256 is not set
 # CONFIG_CRYPTO_SHA512 is not set
-# CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_TGR192 is not set
-# CONFIG_CRYPTO_GF128MUL is not set
-CONFIG_CRYPTO_ECB=y
-CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_PCBC=y
-# CONFIG_CRYPTO_LRW is not set
-# CONFIG_CRYPTO_XTS is not set
-# CONFIG_CRYPTO_CTR is not set
-# CONFIG_CRYPTO_GCM is not set
-# CONFIG_CRYPTO_CCM is not set
-# CONFIG_CRYPTO_CRYPTD is not set
-CONFIG_CRYPTO_DES=y
-# CONFIG_CRYPTO_FCRYPT is not set
-# CONFIG_CRYPTO_BLOWFISH is not set
-# CONFIG_CRYPTO_TWOFISH is not set
-# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
 # CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
 # CONFIG_CRYPTO_CAST6 is not set
-# CONFIG_CRYPTO_TEA is not set
-# CONFIG_CRYPTO_ARC4 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
 # CONFIG_CRYPTO_KHAZAD is not set
-# CONFIG_CRYPTO_ANUBIS is not set
-# CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
 # CONFIG_CRYPTO_DEFLATE is not set
-# CONFIG_CRYPTO_MICHAEL_MIC is not set
-# CONFIG_CRYPTO_CRC32C is not set
-# CONFIG_CRYPTO_CAMELLIA is not set
-# CONFIG_CRYPTO_TEST is not set
-# CONFIG_CRYPTO_AUTHENC is not set
 # CONFIG_CRYPTO_LZO is not set
 # CONFIG_CRYPTO_HW is not set
 # CONFIG_PPC_CLOCK is not set
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index adaa05fb0478..fe6ffa683d78 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -946,6 +946,7 @@ CONFIG_HVC_DRIVER=y
 CONFIG_HVC_CONSOLE=y
 CONFIG_HVC_RTAS=y
 CONFIG_HVCS=m
+CONFIG_IBM_BSR=m
 # CONFIG_IPMI_HANDLER is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_GEN_RTC=y
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index f3f5e2641432..bf0b1fd0ec34 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -50,12 +50,13 @@ obj-$(CONFIG_IBMVIO)		+= vio.o
 obj-$(CONFIG_IBMEBUS)           += ibmebus.o
 obj-$(CONFIG_GENERIC_TBSYNC)    += smp-tbsync.o
 obj-$(CONFIG_CRASH_DUMP)        += crash_dump.o
+obj-$(CONFIG_E500)              += idle_e500.o
 obj-$(CONFIG_6xx)               += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
 obj-$(CONFIG_TAU)               += tau_6xx.o
 obj-$(CONFIG_HIBERNATION)       += swsusp.o suspend.o \
                                    swsusp_$(CONFIG_WORD_SIZE).o
 obj64-$(CONFIG_HIBERNATION)     += swsusp_asm64.o
-obj-$(CONFIG_MODULES)           += module_$(CONFIG_WORD_SIZE).o
+obj-$(CONFIG_MODULES)           += module.o module_$(CONFIG_WORD_SIZE).o
 obj-$(CONFIG_44x)               += cpu_setup_44x.o
 
 ifeq ($(CONFIG_PPC_MERGE),y)
diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c
index e06f75daeba3..367129789cc0 100644
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
@@ -48,6 +48,7 @@ struct aligninfo {
 #define HARD    0x80    /* string, stwcx. */
 #define E4      0x40    /* SPE endianness is word */
 #define E8      0x80    /* SPE endianness is double word */
+#define SPLT    0x80    /* VSX SPLAT load */
 
 /* DSISR bits reported for a DCBZ instruction: */
 #define DCBZ    0x5f    /* 8xx/82xx dcbz faults when cache not enabled */
@@ -363,10 +364,10 @@ static int emulate_multiple(struct pt_regs *regs, unsigned char __user *addr,
  * Only POWER6 has these instructions, and it does true little-endian,
  * so we don't need the address swizzling.
  */
-static int emulate_fp_pair(struct pt_regs *regs, unsigned char __user *addr,
-                           unsigned int reg, unsigned int flags)
+static int emulate_fp_pair(unsigned char __user *addr, unsigned int reg,
+                           unsigned int flags)
 {
-        char *ptr = (char *) &current->thread.fpr[reg];
+        char *ptr = (char *) &current->thread.TS_FPR(reg);
         int i, ret;
 
         if (!(flags & F))
@@ -637,6 +638,36 @@ static int emulate_spe(struct pt_regs *regs, unsigned int reg,
 }
 #endif /* CONFIG_SPE */
 
+#ifdef CONFIG_VSX
+/*
+ * Emulate VSX instructions...
+ */
+static int emulate_vsx(unsigned char __user *addr, unsigned int reg,
+                       unsigned int areg, struct pt_regs *regs,
+                       unsigned int flags, unsigned int length)
+{
+        char *ptr = (char *) &current->thread.TS_FPR(reg);
+        int ret;
+
+        flush_vsx_to_thread(current);
+
+        if (flags & ST)
+                ret = __copy_to_user(addr, ptr, length);
+        else {
+                if (flags & SPLT){
+                        ret = __copy_from_user(ptr, addr, length);
+                        ptr += length;
+                }
+                ret |= __copy_from_user(ptr, addr, length);
+        }
+        if (flags & U)
+                regs->gpr[areg] = regs->dar;
+        if (ret)
+                return -EFAULT;
+        return 1;
+}
+#endif
+
 /*
  * Called on alignment exception. Attempts to fixup
  *
@@ -647,7 +678,7 @@ static int emulate_spe(struct pt_regs *regs, unsigned int reg,
 
 int fix_alignment(struct pt_regs *regs)
 {
-        unsigned int instr, nb, flags;
+        unsigned int instr, nb, flags, instruction = 0;
         unsigned int reg, areg;
         unsigned int dsisr;
         unsigned char __user *addr;
@@ -689,6 +720,7 @@ int fix_alignment(struct pt_regs *regs)
                 if (cpu_has_feature(CPU_FTR_REAL_LE) && (regs->msr & MSR_LE))
                         instr = cpu_to_le32(instr);
                 dsisr = make_dsisr(instr);
+                instruction = instr;
         }
 
         /* extract the operation and registers from the dsisr */
@@ -728,6 +760,30 @@ int fix_alignment(struct pt_regs *regs)
         /* DAR has the operand effective address */
         addr = (unsigned char __user *)regs->dar;
 
+#ifdef CONFIG_VSX
+        if ((instruction & 0xfc00003e) == 0x7c000018) {
+                /* Additional register addressing bit (64 VSX vs 32 FPR/GPR */
+                reg |= (instruction & 0x1) << 5;
+                /* Simple inline decoder instead of a table */
+                if (instruction & 0x200)
+                        nb = 16;
+                else if (instruction & 0x080)
+                        nb = 8;
+                else
+                        nb = 4;
+                flags = 0;
+                if (instruction & 0x100)
+                        flags |= ST;
+                if (instruction & 0x040)
+                        flags |= U;
+                /* splat load needs a special decoder */
+                if ((instruction & 0x400) == 0){
+                        flags |= SPLT;
+                        nb = 8;
+                }
+                return emulate_vsx(addr, reg, areg, regs, flags, nb);
+        }
+#endif
         /* A size of 0 indicates an instruction we don't support, with
          * the exception of DCBZ which is handled as a special case here
          */
@@ -759,7 +815,7 @@ int fix_alignment(struct pt_regs *regs)
 
         /* Special case for 16-byte FP loads and stores */
         if (nb == 16)
-                return emulate_fp_pair(regs, addr, reg, flags);
+                return emulate_fp_pair(addr, reg, flags);
 
         /* If we are loading, get the data from user space, else
          * get it from register values
@@ -784,7 +840,7 @@ int fix_alignment(struct pt_regs *regs)
                                 return -EFAULT;
                 }
         } else if (flags & F) {
-                data.dd = current->thread.fpr[reg];
+                data.dd = current->thread.TS_FPR(reg);
                 if (flags & S) {
                         /* Single-precision FP store requires conversion... */
 #ifdef CONFIG_PPC_FPU
@@ -862,7 +918,7 @@ int fix_alignment(struct pt_regs *regs)
                 if (unlikely(ret))
                         return -EFAULT;
         } else if (flags & F)
-                current->thread.fpr[reg] = data.dd;
+                current->thread.TS_FPR(reg) = data.dd;
         else
                 regs->gpr[reg] = data.ll;
 
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index ec9228d687b0..92768d3006f7 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -52,6 +52,10 @@
 #include <asm/iseries/alpaca.h>
 #endif
 
+#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
+#include "head_booke.h"
+#endif
+
 int main(void)
 {
         DEFINE(THREAD, offsetof(struct task_struct, thread));
@@ -74,6 +78,10 @@ int main(void)
         DEFINE(THREAD_VSCR, offsetof(struct thread_struct, vscr));
         DEFINE(THREAD_USED_VR, offsetof(struct thread_struct, used_vr));
 #endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_VSX
+        DEFINE(THREAD_VSR0, offsetof(struct thread_struct, fpr));
+        DEFINE(THREAD_USED_VSR, offsetof(struct thread_struct, used_vsr));
+#endif /* CONFIG_VSX */
 #ifdef CONFIG_PPC64
         DEFINE(KSP_VSID, offsetof(struct thread_struct, ksp_vsid));
 #else /* CONFIG_PPC64 */
@@ -242,6 +250,25 @@ int main(void)
         DEFINE(_SRR1, STACK_FRAME_OVERHEAD+sizeof(struct pt_regs)+8);
 #endif /* CONFIG_PPC64 */
 
+#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
+        DEFINE(EXC_LVL_SIZE, STACK_EXC_LVL_FRAME_SIZE);
+        DEFINE(MAS0, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas0));
+        /* we overload MMUCR for 44x on MAS0 since they are mutually exclusive */
+        DEFINE(MMUCR, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas0));
+        DEFINE(MAS1, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas1));
+        DEFINE(MAS2, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas2));
+        DEFINE(MAS3, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas3));
+        DEFINE(MAS6, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas6));
+        DEFINE(MAS7, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, mas7));
+        DEFINE(_SRR0, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, srr0));
+        DEFINE(_SRR1, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, srr1));
+        DEFINE(_CSRR0, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, csrr0));
+        DEFINE(_CSRR1, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, csrr1));
+        DEFINE(_DSRR0, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, dsrr0));
+        DEFINE(_DSRR1, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, dsrr1));
+        DEFINE(SAVED_KSP_LIMIT, STACK_INT_FRAME_SIZE+offsetof(struct exception_regs, saved_ksp_limit));
+#endif
+
         DEFINE(CLONE_VM, CLONE_VM);
         DEFINE(CLONE_UNTRACED, CLONE_UNTRACED);
 
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S
index e3623e3e3451..5465e8de0e61 100644
--- a/arch/powerpc/kernel/cpu_setup_44x.S
+++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -33,6 +33,7 @@ _GLOBAL(__setup_cpu_440grx)
         mtlr    r4
         blr
 _GLOBAL(__setup_cpu_460ex)
+_GLOBAL(__setup_cpu_460gt)
         b       __init_fpu_44x
 _GLOBAL(__setup_cpu_440gx)
 _GLOBAL(__setup_cpu_440spe)
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index e44d5530f0a6..f7f3c215d06f 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -37,6 +37,7 @@ extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec);
+extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);
@@ -52,6 +53,8 @@ extern void __setup_cpu_ppc970MP(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_pa6t(unsigned long offset, struct cpu_spec* spec);
 extern void __restore_cpu_pa6t(void);
 extern void __restore_cpu_ppc970(void);
+extern void __setup_cpu_power7(unsigned long offset, struct cpu_spec* spec);
+extern void __restore_cpu_power7(void);
 #endif /* CONFIG_PPC64 */
 
 /* This table only contains "desktop" CPUs, it need to be filled with embedded
@@ -67,7 +70,12 @@ extern void __restore_cpu_ppc970(void);
                                  PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP)
 #define COMMON_USER_POWER6      (COMMON_USER_PPC64 | PPC_FEATURE_ARCH_2_05 |\
                                  PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | \
-                                 PPC_FEATURE_TRUE_LE)
+                                 PPC_FEATURE_TRUE_LE | \
+                                 PPC_FEATURE_PSERIES_PERFMON_COMPAT)
+#define COMMON_USER_POWER7      (COMMON_USER_PPC64 | PPC_FEATURE_ARCH_2_06 |\
+                                 PPC_FEATURE_SMT | PPC_FEATURE_ICACHE_SNOOP | \
+                                 PPC_FEATURE_TRUE_LE | \
+                                 PPC_FEATURE_PSERIES_PERFMON_COMPAT)
 #define COMMON_USER_PA6T        (COMMON_USER_PPC64 | PPC_FEATURE_PA6T |\
                                  PPC_FEATURE_TRUE_LE | \
                                  PPC_FEATURE_HAS_ALTIVEC_COMP)
@@ -380,6 +388,37 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_generic,
                 .platform               = "power6",
         },
+        {       /* 2.06-compliant processor, i.e. Power7 "architected" mode */
+                .pvr_mask               = 0xffffffff,
+                .pvr_value              = 0x0f000003,
+                .cpu_name               = "POWER7 (architected)",
+                .cpu_features           = CPU_FTRS_POWER7,
+                .cpu_user_features      = COMMON_USER_POWER7,
+                .icache_bsize           = 128,
+                .dcache_bsize           = 128,
+                .machine_check          = machine_check_generic,
+                .platform               = "power7",
+        },
+        {       /* Power7 */
+                .pvr_mask               = 0xffff0000,
+                .pvr_value              = 0x003f0000,
+                .cpu_name               = "POWER7 (raw)",
+                .cpu_features           = CPU_FTRS_POWER7,
+                .cpu_user_features      = COMMON_USER_POWER7,
+                .icache_bsize           = 128,
+                .dcache_bsize           = 128,
+                .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_IBM,
+                .cpu_setup              = __setup_cpu_power7,
+                .cpu_restore            = __restore_cpu_power7,
+                .oprofile_cpu_type      = "ppc64/power7",
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .oprofile_mmcra_sihv    = POWER6_MMCRA_SIHV,
+                .oprofile_mmcra_sipr    = POWER6_MMCRA_SIPR,
+                .oprofile_mmcra_clear   = POWER6_MMCRA_THRM |
+                        POWER6_MMCRA_OTHER,
+                .platform               = "power7",
+        },
         {       /* Cell Broadband Engine */
                 .pvr_mask               = 0xffff0000,
                 .pvr_value              = 0x00700000,
@@ -1410,6 +1449,16 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_440A,
                 .platform               = "ppc440",
         },
+        { /* 440 in Xilinx Virtex-5 FXT */
+                .pvr_mask               = 0xfffffff0,
+                .pvr_value              = 0x7ff21910,
+                .cpu_name               = "440 in Virtex-5 FXT",
+                .cpu_features           = CPU_FTRS_44X,
+                .cpu_user_features      = COMMON_USER_BOOKE,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+                .platform               = "ppc440",
+        },
         { /* 460EX */
                 .pvr_mask               = 0xffff0002,
                 .pvr_value              = 0x13020002,
@@ -1427,9 +1476,10 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .pvr_value              = 0x13020000,
                 .cpu_name               = "460GT",
                 .cpu_features           = CPU_FTRS_44X,
-                .cpu_user_features      = COMMON_USER_BOOKE,
+                .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
+                .cpu_setup              = __setup_cpu_460gt,
                 .machine_check          = machine_check_440A,
                 .platform               = "ppc440",
         },
@@ -1491,7 +1541,6 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .pvr_mask               = 0xffff0000,
                 .pvr_value              = 0x80200000,
                 .cpu_name               = "e500",
-                /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                 .cpu_features           = CPU_FTRS_E500,
                 .cpu_user_features      = COMMON_USER_BOOKE |
                         PPC_FEATURE_HAS_SPE_COMP |
@@ -1508,7 +1557,6 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .pvr_mask               = 0xffff0000,
                 .pvr_value              = 0x80210000,
                 .cpu_name               = "e500v2",
-                /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                 .cpu_features           = CPU_FTRS_E500_2,
                 .cpu_user_features      = COMMON_USER_BOOKE |
                         PPC_FEATURE_HAS_SPE_COMP |
@@ -1522,6 +1570,20 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_e500,
                 .platform               = "ppc8548",
         },
+        {       /* e500mc */
+                .pvr_mask               = 0xffff0000,
+                .pvr_value              = 0x80230000,
+                .cpu_name               = "e500mc",
+                .cpu_features           = CPU_FTRS_E500MC,
+                .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
+                .icache_bsize           = 64,
+                .dcache_bsize           = 64,
+                .num_pmcs               = 4,
+                .oprofile_cpu_type      = "ppc/e500", /* xxx - galak, e500mc? */
+                .oprofile_type          = PPC_OPROFILE_FSL_EMB,
+                .machine_check          = machine_check_e500,
+                .platform               = "ppce500mc",
+        },
         {       /* default match */
                 .pvr_mask               = 0x00000000,
                 .pvr_value              = 0x00000000,
@@ -1587,38 +1649,3 @@ struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr)
         BUG();
         return NULL;
 }
-
-void do_feature_fixups(unsigned long value, void *fixup_start, void *fixup_end)
-{
-        struct fixup_entry {
-                unsigned long   mask;
-                unsigned long   value;
-                long            start_off;
-                long            end_off;
-        } *fcur, *fend;
-
-        fcur = fixup_start;
-        fend = fixup_end;
-
-        for (; fcur < fend; fcur++) {
-                unsigned int *pstart, *pend, *p;
-
-                if ((value & fcur->mask) == fcur->value)
-                        continue;
-
-                /* These PTRRELOCs will disappear once the new scheme for
-                 * modules and vdso is implemented
-                 */
-                pstart = ((unsigned int *)fcur) + (fcur->start_off / 4);
-                pend = ((unsigned int *)fcur) + (fcur->end_off / 4);
-
-                for (p = pstart; p < pend; p++) {
-                        *p = 0x60000000u;
-                        asm volatile ("dcbst 0, %0" : : "r" (p));
-                }
-                asm volatile ("sync" : : : "memory");
-                for (p = pstart; p < pend; p++)
-                        asm volatile ("icbi 0,%0" : : "r" (p));
-                asm volatile ("sync; isync" : : : "memory");
-        }
-}
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index eae401de3f76..0a8439aafdd1 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -48,7 +48,7 @@ int crashing_cpu = -1;
 static cpumask_t cpus_in_crash = CPU_MASK_NONE;
 cpumask_t cpus_in_sr = CPU_MASK_NONE;
 
-#define CRASH_HANDLER_MAX 1
+#define CRASH_HANDLER_MAX 2
 /* NULL terminated list of shutdown handles */
 static crash_shutdown_t crash_shutdown_handles[CRASH_HANDLER_MAX+1];
 static DEFINE_SPINLOCK(crash_handlers_lock);
diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c
index 9ee3c5278db0..e0debcca0bfa 100644
--- a/arch/powerpc/kernel/crash_dump.c
+++ b/arch/powerpc/kernel/crash_dump.c
@@ -14,6 +14,7 @@
 #include <linux/crash_dump.h>
 #include <linux/bootmem.h>
 #include <linux/lmb.h>
+#include <asm/code-patching.h>
 #include <asm/kdump.h>
 #include <asm/prom.h>
 #include <asm/firmware.h>
@@ -33,6 +34,8 @@ void __init reserve_kdump_trampoline(void)
 
 static void __init create_trampoline(unsigned long addr)
 {
+        unsigned int *p = (unsigned int *)addr;
+
         /* The maximum range of a single instruction branch, is the current
          * instruction's address + (32 MB - 4) bytes. For the trampoline we
          * need to branch to current address + 32 MB. So we insert a nop at
@@ -41,8 +44,8 @@ static void __init create_trampoline(unsigned long addr)
          * branch to "addr" we jump to ("addr" + 32 MB). Although it requires
          * two instructions it doesn't require any registers.
          */
-        create_instruction(addr, 0x60000000); /* nop */
-        create_branch(addr + 4, addr + PHYSICAL_START, 0);
+        patch_instruction(p, PPC_NOP_INSTR);
+        patch_branch(++p, addr + PHYSICAL_START, 0);
 }
 
 void __init setup_kdump_trampoline(void)
diff --git a/arch/powerpc/kernel/dma_64.c b/arch/powerpc/kernel/dma_64.c
index 3a317cb0636a..ae5708e3a312 100644
--- a/arch/powerpc/kernel/dma_64.c
+++ b/arch/powerpc/kernel/dma_64.c
@@ -15,15 +15,6 @@
  * Generic iommu implementation
  */
 
-static inline unsigned long device_to_mask(struct device *dev)
-{
-        if (dev->dma_mask && *dev->dma_mask)
-                return *dev->dma_mask;
-        /* Assume devices without mask can take 32 bit addresses */
-        return 0xfffffffful;
-}
-
-
 /* Allocates a contiguous real buffer and creates mappings over it.
  * Returns the virtual address of the buffer and sets dma_handle
  * to the dma address (mapping) of the first page.
@@ -50,32 +41,38 @@ static void dma_iommu_free_coherent(struct device *dev, size_t size,
  */
 static dma_addr_t dma_iommu_map_single(struct device *dev, void *vaddr,
                                        size_t size,
-                                       enum dma_data_direction direction)
+                                       enum dma_data_direction direction,
+                                       struct dma_attrs *attrs)
 {
         return iommu_map_single(dev, dev->archdata.dma_data, vaddr, size,
-                                device_to_mask(dev), direction);
+                                device_to_mask(dev), direction, attrs);
 }
 
 
 static void dma_iommu_unmap_single(struct device *dev, dma_addr_t dma_handle,
                                    size_t size,
-                                   enum dma_data_direction direction)
+                                   enum dma_data_direction direction,
+                                   struct dma_attrs *attrs)
 {
-        iommu_unmap_single(dev->archdata.dma_data, dma_handle, size, direction);
+        iommu_unmap_single(dev->archdata.dma_data, dma_handle, size, direction,
+                           attrs);
 }
 
 
 static int dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist,
-                            int nelems, enum dma_data_direction direction)
+                            int nelems, enum dma_data_direction direction,
+                            struct dma_attrs *attrs)
 {
-        return iommu_map_sg(dev, sglist, nelems,
-                            device_to_mask(dev), direction);
+        return iommu_map_sg(dev, dev->archdata.dma_data, sglist, nelems,
+                            device_to_mask(dev), direction, attrs);
 }
 
 static void dma_iommu_unmap_sg(struct device *dev, struct scatterlist *sglist,
-                int nelems, enum dma_data_direction direction)
+                int nelems, enum dma_data_direction direction,
+                struct dma_attrs *attrs)
 {
-        iommu_unmap_sg(dev->archdata.dma_data, sglist, nelems, direction);
+        iommu_unmap_sg(dev->archdata.dma_data, sglist, nelems, direction,
+                       attrs);
 }
 
 /* We support DMA to/from any memory page via the iommu */
@@ -148,19 +145,22 @@ static void dma_direct_free_coherent(struct device *dev, size_t size,
 
 static dma_addr_t dma_direct_map_single(struct device *dev, void *ptr,
                                         size_t size,
-                                        enum dma_data_direction direction)
+                                        enum dma_data_direction direction,
+                                        struct dma_attrs *attrs)
 {
         return virt_to_abs(ptr) + get_dma_direct_offset(dev);
 }
 
 static void dma_direct_unmap_single(struct device *dev, dma_addr_t dma_addr,
                                     size_t size,
-                                    enum dma_data_direction direction)
+                                    enum dma_data_direction direction,
+                                    struct dma_attrs *attrs)
 {
 }
 
 static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
-                             int nents, enum dma_data_direction direction)
+                             int nents, enum dma_data_direction direction,
+                             struct dma_attrs *attrs)
 {
         struct scatterlist *sg;
         int i;
@@ -174,7 +174,8 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
 }
 
 static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,
-                                int nents, enum dma_data_direction direction)
+                                int nents, enum dma_data_direction direction,
+                                struct dma_attrs *attrs)
 {
 }
 
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 7231a708af0d..da52269aec1e 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -45,29 +45,54 @@
 #endif
 
 #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:
-        TRANSFER_TO_HANDLER_EXC_LEVEL(MCHECK)
-        b       transfer_to_handler_full
+        mfspr   r0,SPRN_DSRR0
+        stw     r0,_DSRR0(r11)
+        mfspr   r0,SPRN_DSRR1
+        stw     r0,_DSRR1(r11)
+        /* fall through */
 
         .globl  debug_transfer_to_handler
 debug_transfer_to_handler:
-        TRANSFER_TO_HANDLER_EXC_LEVEL(DEBUG)
-        b       transfer_to_handler_full
+        mfspr   r0,SPRN_CSRR0
+        stw     r0,_CSRR0(r11)
+        mfspr   r0,SPRN_CSRR1
+        stw     r0,_CSRR1(r11)
+        /* fall through */
 
         .globl  crit_transfer_to_handler
 crit_transfer_to_handler:
-        TRANSFER_TO_HANDLER_EXC_LEVEL(CRIT)
+#ifdef CONFIG_FSL_BOOKE
+        mfspr   r0,SPRN_MAS0
+        stw     r0,MAS0(r11)
+        mfspr   r0,SPRN_MAS1
+        stw     r0,MAS1(r11)
+        mfspr   r0,SPRN_MAS2
+        stw     r0,MAS2(r11)
+        mfspr   r0,SPRN_MAS3
+        stw     r0,MAS3(r11)
+        mfspr   r0,SPRN_MAS6
+        stw     r0,MAS6(r11)
+#ifdef CONFIG_PHYS_64BIT
+        mfspr   r0,SPRN_MAS7
+        stw     r0,MAS7(r11)
+#endif /* CONFIG_PHYS_64BIT */
+#endif /* CONFIG_FSL_BOOKE */
+#ifdef CONFIG_44x
+        mfspr   r0,SPRN_MMUCR
+        stw     r0,MMUCR(r11)
+#endif
+        mfspr   r0,SPRN_SRR0
+        stw     r0,_SRR0(r11)
+        mfspr   r0,SPRN_SRR1
+        stw     r0,_SRR1(r11)
+
+        mfspr   r8,SPRN_SPRG3
+        lwz     r0,KSP_LIMIT(r8)
+        stw     r0,SAVED_KSP_LIMIT(r11)
+        rlwimi  r0,r1,0,0,(31-THREAD_SHIFT)
+        stw     r0,KSP_LIMIT(r8)
         /* fall through */
 #endif
 
@@ -78,6 +103,16 @@ crit_transfer_to_handler:
         stw     r0,GPR10(r11)
         lwz     r0,crit_r11@l(0)
         stw     r0,GPR11(r11)
+        mfspr   r0,SPRN_SRR0
+        stw     r0,crit_srr0@l(0)
+        mfspr   r0,SPRN_SRR1
+        stw     r0,crit_srr1@l(0)
+
+        mfspr   r8,SPRN_SPRG3
+        lwz     r0,KSP_LIMIT(r8)
+        stw     r0,saved_ksp_limit@l(0)
+        rlwimi  r0,r1,0,0,(31-THREAD_SHIFT)
+        stw     r0,KSP_LIMIT(r8)
         /* fall through */
 #endif
 
@@ -142,13 +177,14 @@ transfer_to_handler:
         cmplw   r1,r9                   /* if r1 <= ksp_limit */
         ble-    stack_ovf               /* then the kernel stack overflowed */
 5:
-#ifdef CONFIG_6xx
+#if defined(CONFIG_6xx) || defined(CONFIG_E500)
         rlwinm  r9,r1,0,0,31-THREAD_SHIFT
         tophys(r9,r9)                   /* check local flags */
         lwz     r12,TI_LOCAL_FLAGS(r9)
         mtcrf   0x01,r12
         bt-     31-TLF_NAPPING,4f
-#endif /* CONFIG_6xx */
+        bt-     31-TLF_SLEEPING,7f
+#endif /* CONFIG_6xx || CONFIG_E500 */
         .globl transfer_to_handler_cont
 transfer_to_handler_cont:
 3:
@@ -161,10 +197,17 @@ transfer_to_handler_cont:
         SYNC
         RFI                             /* jump to handler, enable MMU */
 
-#ifdef CONFIG_6xx
+#if defined (CONFIG_6xx) || defined(CONFIG_E500)
 4:      rlwinm  r12,r12,0,~_TLF_NAPPING
         stw     r12,TI_LOCAL_FLAGS(r9)
-        b       power_save_6xx_restore
+        b       power_save_ppc32_restore
+
+7:      rlwinm  r12,r12,0,~_TLF_SLEEPING
+        stw     r12,TI_LOCAL_FLAGS(r9)
+        lwz     r9,_MSR(r11)            /* if sleeping, clear MSR.EE */
+        rlwinm  r9,r9,0,~MSR_EE
+        lwz     r12,_LINK(r11)          /* and return to address in LR */
+        b       fast_exception_return
 #endif
 
 /*
@@ -669,7 +712,7 @@ user_exc_return:		/* r10 contains MSR_KERNEL here */
         /* Check current_thread_info()->flags */
         rlwinm  r9,r1,0,0,(31-THREAD_SHIFT)
         lwz     r9,TI_FLAGS(r9)
-        andi.   r0,r9,(_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK|_TIF_NEED_RESCHED)
+        andi.   r0,r9,_TIF_USER_WORK_MASK
         bne     do_work
 
 restore_user:
@@ -860,17 +903,90 @@ exc_exit_restart_end:
         exc_lvl_rfi;                                                    \
         b       .;              /* prevent prefetch past exc_lvl_rfi */
 
+#define RESTORE_xSRR(exc_lvl_srr0, exc_lvl_srr1)                        \
+        lwz     r9,_##exc_lvl_srr0(r1);                                 \
+        lwz     r10,_##exc_lvl_srr1(r1);                                \
+        mtspr   SPRN_##exc_lvl_srr0,r9;                                 \
+        mtspr   SPRN_##exc_lvl_srr1,r10;
+
+#if defined(CONFIG_FSL_BOOKE)
+#ifdef CONFIG_PHYS_64BIT
+#define RESTORE_MAS7                                                    \
+        lwz     r11,MAS7(r1);                                           \
+        mtspr   SPRN_MAS7,r11;
+#else
+#define RESTORE_MAS7
+#endif /* CONFIG_PHYS_64BIT */
+#define RESTORE_MMU_REGS                                                \
+        lwz     r9,MAS0(r1);                                            \
+        lwz     r10,MAS1(r1);                                           \
+        lwz     r11,MAS2(r1);                                           \
+        mtspr   SPRN_MAS0,r9;                                           \
+        lwz     r9,MAS3(r1);                                            \
+        mtspr   SPRN_MAS1,r10;                                          \
+        lwz     r10,MAS6(r1);                                           \
+        mtspr   SPRN_MAS2,r11;                                          \
+        mtspr   SPRN_MAS3,r9;                                           \
+        mtspr   SPRN_MAS6,r10;                                          \
+        RESTORE_MAS7;
+#elif defined(CONFIG_44x)
+#define RESTORE_MMU_REGS                                                \
+        lwz     r9,MMUCR(r1);                                           \
+        mtspr   SPRN_MMUCR,r9;
+#else
+#define RESTORE_MMU_REGS
+#endif
+
+#ifdef CONFIG_40x
         .globl  ret_from_crit_exc
 ret_from_crit_exc:
+        mfspr   r9,SPRN_SPRG3
+        lis     r10,saved_ksp_limit@ha;
+        lwz     r10,saved_ksp_limit@l(r10);
+        tovirt(r9,r9);
+        stw     r10,KSP_LIMIT(r9)
+        lis     r9,crit_srr0@ha;
+        lwz     r9,crit_srr0@l(r9);
+        lis     r10,crit_srr1@ha;
+        lwz     r10,crit_srr1@l(r10);
+        mtspr   SPRN_SRR0,r9;
+        mtspr   SPRN_SRR1,r10;
         RET_FROM_EXC_LEVEL(SPRN_CSRR0, SPRN_CSRR1, RFCI)
+#endif /* CONFIG_40x */
 
 #ifdef CONFIG_BOOKE
+        .globl  ret_from_crit_exc
+ret_from_crit_exc:
+        mfspr   r9,SPRN_SPRG3
+        lwz     r10,SAVED_KSP_LIMIT(r1)
+        stw     r10,KSP_LIMIT(r9)
+        RESTORE_xSRR(SRR0,SRR1);
+        RESTORE_MMU_REGS;
+        RET_FROM_EXC_LEVEL(SPRN_CSRR0, SPRN_CSRR1, RFCI)
+
         .globl  ret_from_debug_exc
 ret_from_debug_exc:
+        mfspr   r9,SPRN_SPRG3
+        lwz     r10,SAVED_KSP_LIMIT(r1)
+        stw     r10,KSP_LIMIT(r9)
+        lwz     r9,THREAD_INFO-THREAD(r9)
+        rlwinm  r10,r1,0,0,(31-THREAD_SHIFT)
+        lwz     r10,TI_PREEMPT(r10)
+        stw     r10,TI_PREEMPT(r9)
+        RESTORE_xSRR(SRR0,SRR1);
+        RESTORE_xSRR(CSRR0,CSRR1);
+        RESTORE_MMU_REGS;
         RET_FROM_EXC_LEVEL(SPRN_DSRR0, SPRN_DSRR1, RFDI)
 
         .globl  ret_from_mcheck_exc
 ret_from_mcheck_exc:
+        mfspr   r9,SPRN_SPRG3
+        lwz     r10,SAVED_KSP_LIMIT(r1)
+        stw     r10,KSP_LIMIT(r9)
+        RESTORE_xSRR(SRR0,SRR1);
+        RESTORE_xSRR(CSRR0,CSRR1);
+        RESTORE_xSRR(DSRR0,DSRR1);
+        RESTORE_MMU_REGS;
         RET_FROM_EXC_LEVEL(SPRN_MCSRR0, SPRN_MCSRR1, RFMCI)
 #endif /* CONFIG_BOOKE */
 
@@ -926,7 +1042,7 @@ recheck:
         lwz     r9,TI_FLAGS(r9)
         andi.   r0,r9,_TIF_NEED_RESCHED
         bne-    do_resched
-        andi.   r0,r9,_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK
+        andi.   r0,r9,_TIF_USER_WORK_MASK
         beq     restore_user
 do_user_signal:                 /* r10 contains MSR_KERNEL here */
         ori     r10,r10,MSR_EE
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 2f511a969d2c..d7369243ae44 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -354,6 +354,11 @@ _GLOBAL(_switch)
         mflr    r20             /* Return to switch caller */
         mfmsr   r22
         li      r0, MSR_FP
+#ifdef CONFIG_VSX
+BEGIN_FTR_SECTION
+        oris    r0,r0,MSR_VSX@h /* Disable VSX */
+END_FTR_SECTION_IFSET(CPU_FTR_VSX)
+#endif /* CONFIG_VSX */
 #ifdef CONFIG_ALTIVEC
 BEGIN_FTR_SECTION
         oris    r0,r0,MSR_VEC@h /* Disable altivec */
@@ -384,16 +389,16 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 
         ld      r8,KSP(r4)      /* new stack pointer */
 BEGIN_FTR_SECTION
-        b       2f
-END_FTR_SECTION_IFCLR(CPU_FTR_SLB)
-BEGIN_FTR_SECTION
+  BEGIN_FTR_SECTION_NESTED(95)
         clrrdi  r6,r8,28        /* get its ESID */
         clrrdi  r9,r1,28        /* get current sp ESID */
-END_FTR_SECTION_IFCLR(CPU_FTR_1T_SEGMENT)
-BEGIN_FTR_SECTION
+  FTR_SECTION_ELSE_NESTED(95)
         clrrdi  r6,r8,40        /* get its 1T ESID */
         clrrdi  r9,r1,40        /* get current sp 1T ESID */
-END_FTR_SECTION_IFSET(CPU_FTR_1T_SEGMENT)
+  ALT_FTR_SECTION_END_NESTED_IFCLR(CPU_FTR_1T_SEGMENT, 95)
+FTR_SECTION_ELSE
+        b       2f
+ALT_FTR_SECTION_END_IFSET(CPU_FTR_SLB)
         clrldi. r0,r6,2         /* is new ESID c00000000? */
         cmpd    cr1,r6,r9       /* or is new ESID the same as current ESID? */
         cror    eq,4*cr1+eq,eq
diff --git a/arch/powerpc/kernel/fpu.S b/arch/powerpc/kernel/fpu.S
index 821e152e093c..a088c064ae40 100644
--- a/arch/powerpc/kernel/fpu.S
+++ b/arch/powerpc/kernel/fpu.S
@@ -24,6 +24,29 @@
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
 
+#ifdef CONFIG_VSX
+#define REST_32FPVSRS(n,c,base)                                         \
+BEGIN_FTR_SECTION                                                       \
+        b       2f;                                                     \
+END_FTR_SECTION_IFSET(CPU_FTR_VSX);                                     \
+        REST_32FPRS(n,base);                                            \
+        b       3f;                                                     \
+2:      REST_32VSRS(n,c,base);                                          \
+3:
+
+#define SAVE_32FPVSRS(n,c,base)                                         \
+BEGIN_FTR_SECTION                                                       \
+        b       2f;                                                     \
+END_FTR_SECTION_IFSET(CPU_FTR_VSX);                                     \
+        SAVE_32FPRS(n,base);                                            \
+        b       3f;                                                     \
+2:      SAVE_32VSRS(n,c,base);                                          \
+3:
+#else
+#define REST_32FPVSRS(n,b,base) REST_32FPRS(n, base)
+#define SAVE_32FPVSRS(n,b,base) SAVE_32FPRS(n, base)
+#endif
+
 /*
  * This task wants to use the FPU now.
  * On UP, disable FP for the task which had the FPU previously,
@@ -34,6 +57,11 @@
 _GLOBAL(load_up_fpu)
         mfmsr   r5
         ori     r5,r5,MSR_FP
+#ifdef CONFIG_VSX
+BEGIN_FTR_SECTION
+        oris    r5,r5,MSR_VSX@h
+END_FTR_SECTION_IFSET(CPU_FTR_VSX)
+#endif
         SYNC
         MTMSRD(r5)                      /* enable use of fpu now */
         isync
@@ -50,7 +78,7 @@ _GLOBAL(load_up_fpu)
         beq     1f
         toreal(r4)
         addi    r4,r4,THREAD            /* want last_task_used_math->thread */
-        SAVE_32FPRS(0, r4)
+        SAVE_32FPVSRS(0, r5, r4)
         mffs    fr0
         stfd    fr0,THREAD_FPSCR(r4)
         PPC_LL  r5,PT_REGS(r4)
@@ -77,7 +105,7 @@ _GLOBAL(load_up_fpu)
 #endif
         lfd     fr0,THREAD_FPSCR(r5)
         MTFSF_L(fr0)
-        REST_32FPRS(0, r5)
+        REST_32FPVSRS(0, r4, r5)
 #ifndef CONFIG_SMP
         subi    r4,r5,THREAD
         fromreal(r4)
@@ -85,7 +113,7 @@ _GLOBAL(load_up_fpu)
 #endif /* CONFIG_SMP */
         /* restore registers and return */
         /* we haven't used ctr or xer or lr */
-        b       fast_exception_return
+        blr
 
 /*
  * giveup_fpu(tsk)
@@ -96,6 +124,11 @@ _GLOBAL(load_up_fpu)
 _GLOBAL(giveup_fpu)
         mfmsr   r5
         ori     r5,r5,MSR_FP
+#ifdef CONFIG_VSX
+BEGIN_FTR_SECTION
+        oris    r5,r5,MSR_VSX@h
+END_FTR_SECTION_IFSET(CPU_FTR_VSX)
+#endif
         SYNC_601
         ISYNC_601
         MTMSRD(r5)                      /* enable use of fpu now */
@@ -106,7 +139,7 @@ _GLOBAL(giveup_fpu)
         addi    r3,r3,THREAD            /* want THREAD of task */
         PPC_LL  r5,PT_REGS(r3)
         PPC_LCMPI       0,r5,0
-        SAVE_32FPRS(0, r3)
+        SAVE_32FPVSRS(0, r4 ,r3)
         mffs    fr0
         stfd    fr0,THREAD_FPSCR(r3)
         beq     1f
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 785af9b56591..99ee2f0f0f2b 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -421,8 +421,10 @@ BEGIN_FTR_SECTION
         b       ProgramCheck
 END_FTR_SECTION_IFSET(CPU_FTR_FPU_UNAVAILABLE)
         EXCEPTION_PROLOG
-        bne     load_up_fpu             /* if from user, just load it up */
-        addi    r3,r1,STACK_FRAME_OVERHEAD
+        beq     1f
+        bl      load_up_fpu             /* if from user, just load it up */
+        b       fast_exception_return
+1:      addi    r3,r1,STACK_FRAME_OVERHEAD
         EXC_XFER_EE_LITE(0x800, kernel_fp_unavailable_exception)
 
 /* Decrementer */
diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S
index 8552e67e3a8b..56d8e5d90c5b 100644
--- a/arch/powerpc/kernel/head_40x.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -93,6 +93,12 @@ _ENTRY(crit_r10)
         .space  4
 _ENTRY(crit_r11)
         .space  4
+_ENTRY(crit_srr0)
+        .space  4
+_ENTRY(crit_srr1)
+        .space  4
+_ENTRY(saved_ksp_limit)
+        .space  4
 
 /*
  * Exception vector entry code. This code runs with address translation
@@ -148,14 +154,14 @@ _ENTRY(crit_r11)
         mfcr    r10;                    /* save CR in r10 for now          */\
         mfspr   r11,SPRN_SRR3;          /* check whether user or kernel    */\
         andi.   r11,r11,MSR_PR;                                              \
-        lis     r11,critical_stack_top@h;                                    \
-        ori     r11,r11,critical_stack_top@l;                                \
+        lis     r11,critirq_ctx@ha;                                          \
+        tophys(r11,r11);                                                     \
+        lwz     r11,critirq_ctx@l(r11);                                      \
         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     */\
+1:      addi    r11,r11,THREAD_SIZE-INT_FRAME_SIZE; /* Alloc an excpt frm  */\
         tophys(r11,r11);                                                     \
         stw     r10,_CCR(r11);          /* save various registers          */\
         stw     r12,GPR12(r11);                                              \
@@ -996,16 +1002,6 @@ empty_zero_page:
 swapper_pg_dir:
         .space  PGD_TABLE_SIZE
 
-
-/* Stack for handling critical exceptions from kernel mode */
-        .section .bss
-        .align 12
-exception_stack_bottom:
-        .space  4096
-critical_stack_top:
-        .globl  exception_stack_top
-exception_stack_top:
-
 /* Room for two PTE pointers, usually the kernel and current user pointers
  * to their respective root page table.
  */
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index 22b5d2c459a3..f3a1ea9d7fe4 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -293,119 +293,9 @@ interrupt_base:
         MCHECK_EXCEPTION(0x0210, MachineCheckA, machine_check_exception)
 
         /* Data Storage Interrupt */
-        START_EXCEPTION(DataStorage)
-        mtspr   SPRN_SPRG0, r10         /* Save some working registers */
-        mtspr   SPRN_SPRG1, r11
-        mtspr   SPRN_SPRG4W, r12
-        mtspr   SPRN_SPRG5W, r13
-        mfcr    r11
-        mtspr   SPRN_SPRG7W, r11
-
-        /*
-         * Check if it was a store fault, if not then bail
-         * because a user tried to access a kernel or
-         * read-protected page.  Otherwise, get the
-         * offending address and handle it.
-         */
-        mfspr   r10, SPRN_ESR
-        andis.  r10, r10, ESR_ST@h
-        beq     2f
-
-        mfspr   r10, SPRN_DEAR          /* Get faulting address */
-
-        /* If we are faulting a kernel address, we have to use the
-         * kernel page tables.
-         */
-        lis     r11, PAGE_OFFSET@h
-        cmplw   r10, r11
-        blt+    3f
-        lis     r11, swapper_pg_dir@h
-        ori     r11, r11, swapper_pg_dir@l
-
-        mfspr   r12,SPRN_MMUCR
-        rlwinm  r12,r12,0,0,23          /* Clear TID */
-
-        b       4f
-
-        /* Get the PGD for the current thread */
-3:
-        mfspr   r11,SPRN_SPRG3
-        lwz     r11,PGDIR(r11)
-
-        /* Load PID into MMUCR TID */
-        mfspr   r12,SPRN_MMUCR          /* Get MMUCR */
-        mfspr   r13,SPRN_PID            /* Get PID */
-        rlwimi  r12,r13,0,24,31         /* Set TID */
-
-4:
-        mtspr   SPRN_MMUCR,r12
-
-        rlwinm  r12, r10, 13, 19, 29    /* Compute pgdir/pmd offset */
-        lwzx    r11, r12, r11           /* Get pgd/pmd entry */
-        rlwinm. r12, r11, 0, 0, 20      /* Extract pt base address */
-        beq     2f                      /* Bail if no table */
-
-        rlwimi  r12, r10, 23, 20, 28    /* Compute pte address */
-        lwz     r11, 4(r12)             /* Get pte entry */
-
-        andi.   r13, r11, _PAGE_RW      /* Is it writeable? */
-        beq     2f                      /* Bail if not */
-
-        /* Update 'changed'.
-        */
-        ori     r11, r11, _PAGE_DIRTY|_PAGE_ACCESSED|_PAGE_HWWRITE
-        stw     r11, 4(r12)             /* Update Linux page table */
-
-        li      r13, PPC44x_TLB_SR@l    /* Set SR */
-        rlwimi  r13, r11, 29, 29, 29    /* SX = _PAGE_HWEXEC */
-        rlwimi  r13, r11, 0, 30, 30     /* SW = _PAGE_RW */
-        rlwimi  r13, r11, 29, 28, 28    /* UR = _PAGE_USER */
-        rlwimi  r12, r11, 31, 26, 26    /* (_PAGE_USER>>1)->r12 */
-        rlwimi  r12, r11, 29, 30, 30    /* (_PAGE_USER>>3)->r12 */
-        and     r12, r12, r11           /* HWEXEC/RW & USER */
-        rlwimi  r13, r12, 0, 26, 26     /* UX = HWEXEC & USER */
-        rlwimi  r13, r12, 3, 27, 27     /* UW = RW & USER */
-
-        rlwimi  r11,r13,0,26,31         /* Insert static perms */
-
-        /*
-         * Clear U0-U3 and WL1 IL1I IL1D IL2I IL2D bits which are added
-         * on newer 440 cores like the 440x6 used on AMCC 460EX/460GT (see
-         * include/asm-powerpc/pgtable-ppc32.h for details).
-         */
-        rlwinm  r11,r11,0,20,10
-
-        /* find the TLB index that caused the fault.  It has to be here. */
-        tlbsx   r10, 0, r10
-
-        tlbwe   r11, r10, PPC44x_TLB_ATTRIB     /* Write ATTRIB */
-
-        /* Done...restore registers and get out of here.
-        */
-        mfspr   r11, SPRN_SPRG7R
-        mtcr    r11
-        mfspr   r13, SPRN_SPRG5R
-        mfspr   r12, SPRN_SPRG4R
+        DATA_STORAGE_EXCEPTION
 
-        mfspr   r11, SPRN_SPRG1
-        mfspr   r10, SPRN_SPRG0
-        rfi                     /* Force context change */
-
-2:
-        /*
-         * The bailout.  Restore registers to pre-exception conditions
-         * and call the heavyweights to help us out.
-         */
-        mfspr   r11, SPRN_SPRG7R
-        mtcr    r11
-        mfspr   r13, SPRN_SPRG5R
-        mfspr   r12, SPRN_SPRG4R
-
-        mfspr   r11, SPRN_SPRG1
-        mfspr   r10, SPRN_SPRG0
-        b       data_access
-
-        /* Instruction Storage Interrupt */
+                /* Instruction Storage Interrupt */
         INSTRUCTION_STORAGE_EXCEPTION
 
         /* External Input Interrupt */
@@ -423,7 +313,6 @@ interrupt_base:
 #else
         EXCEPTION(0x2010, FloatingPointUnavailable, unknown_exception, EXC_XFER_EE)
 #endif
-
         /* System Call Interrupt */
         START_EXCEPTION(SystemCall)
         NORMAL_EXCEPTION_PROLOG
@@ -484,18 +373,57 @@ interrupt_base:
 4:
         mtspr   SPRN_MMUCR,r12
 
+        /* Mask of required permission bits. Note that while we
+         * do copy ESR:ST to _PAGE_RW position as trying to write
+         * to an RO page is pretty common, we don't do it with
+         * _PAGE_DIRTY. We could do it, but it's a fairly rare
+         * event so I'd rather take the overhead when it happens
+         * rather than adding an instruction here. We should measure
+         * whether the whole thing is worth it in the first place
+         * as we could avoid loading SPRN_ESR completely in the first
+         * place...
+         *
+         * TODO: Is it worth doing that mfspr & rlwimi in the first
+         *       place or can we save a couple of instructions here ?
+         */
+        mfspr   r12,SPRN_ESR
+        li      r13,_PAGE_PRESENT|_PAGE_ACCESSED
+        rlwimi  r13,r12,10,30,30
+
+        /* Load the PTE */
         rlwinm  r12, r10, 13, 19, 29    /* Compute pgdir/pmd offset */
         lwzx    r11, r12, r11           /* Get pgd/pmd entry */
         rlwinm. r12, r11, 0, 0, 20      /* Extract pt base address */
         beq     2f                      /* Bail if no table */
 
         rlwimi  r12, r10, 23, 20, 28    /* Compute pte address */
-        lwz     r11, 4(r12)             /* Get pte entry */
-        andi.   r13, r11, _PAGE_PRESENT /* Is the page present? */
-        beq     2f                      /* Bail if not present */
+        lwz     r11, 0(r12)             /* Get high word of pte entry */
+        lwz     r12, 4(r12)             /* Get low word of pte entry */
 
-        ori     r11, r11, _PAGE_ACCESSED
-        stw     r11, 4(r12)
+        lis     r10,tlb_44x_index@ha
+
+        andc.   r13,r13,r12             /* Check permission */
+
+        /* Load the next available TLB index */
+        lwz     r13,tlb_44x_index@l(r10)
+
+        bne     2f                      /* Bail if permission mismach */
+
+        /* Increment, rollover, and store TLB index */
+        addi    r13,r13,1
+
+        /* Compare with watermark (instruction gets patched) */
+        .globl tlb_44x_patch_hwater_D
+tlb_44x_patch_hwater_D:
+        cmpwi   0,r13,1                 /* reserve entries */
+        ble     5f
+        li      r13,0
+5:
+        /* Store the next available TLB index */
+        stw     r13,tlb_44x_index@l(r10)
+
+        /* Re-load the faulting address */
+        mfspr   r10,SPRN_DEAR
 
          /* Jump to common tlb load */
         b       finish_tlb_load
@@ -510,7 +438,7 @@ interrupt_base:
         mfspr   r12, SPRN_SPRG4R
         mfspr   r11, SPRN_SPRG1
         mfspr   r10, SPRN_SPRG0
-        b       data_access
+        b       DataStorage
 
         /* Instruction TLB Error Interrupt */
         /*
@@ -554,18 +482,42 @@ interrupt_base:
 4:
         mtspr   SPRN_MMUCR,r12
 
+        /* Make up the required permissions */
+        li      r13,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_HWEXEC
+
         rlwinm  r12, r10, 13, 19, 29    /* Compute pgdir/pmd offset */
         lwzx    r11, r12, r11           /* Get pgd/pmd entry */
         rlwinm. r12, r11, 0, 0, 20      /* Extract pt base address */
         beq     2f                      /* Bail if no table */
 
         rlwimi  r12, r10, 23, 20, 28    /* Compute pte address */
-        lwz     r11, 4(r12)             /* Get pte entry */
-        andi.   r13, r11, _PAGE_PRESENT /* Is the page present? */
-        beq     2f                      /* Bail if not present */
+        lwz     r11, 0(r12)             /* Get high word of pte entry */
+        lwz     r12, 4(r12)             /* Get low word of pte entry */
 
-        ori     r11, r11, _PAGE_ACCESSED
-        stw     r11, 4(r12)
+        lis     r10,tlb_44x_index@ha
+
+        andc.   r13,r13,r12             /* Check permission */
+
+        /* Load the next available TLB index */
+        lwz     r13,tlb_44x_index@l(r10)
+
+        bne     2f                      /* Bail if permission mismach */
+
+        /* Increment, rollover, and store TLB index */
+        addi    r13,r13,1
+
+        /* Compare with watermark (instruction gets patched) */
+        .globl tlb_44x_patch_hwater_I
+tlb_44x_patch_hwater_I:
+        cmpwi   0,r13,1                 /* reserve entries */
+        ble     5f
+        li      r13,0
+5:
+        /* Store the next available TLB index */
+        stw     r13,tlb_44x_index@l(r10)
+
+        /* Re-load the faulting address */
+        mfspr   r10,SPRN_SRR0
 
         /* Jump to common TLB load point */
         b       finish_tlb_load
@@ -587,86 +539,40 @@ interrupt_base:
 
 /*
  * Local functions
- */
-        /*
-         * Data TLB exceptions will bail out to this point
-         * if they can't resolve the lightweight TLB fault.
-         */
-data_access:
-        NORMAL_EXCEPTION_PROLOG
-        mfspr   r5,SPRN_ESR             /* Grab the ESR, save it, pass arg3 */
-        stw     r5,_ESR(r11)
-        mfspr   r4,SPRN_DEAR            /* Grab the DEAR, save it, pass arg2 */
-        EXC_XFER_EE_LITE(0x0300, handle_page_fault)
+  */
 
 /*
 
  * Both the instruction and data TLB miss get to this
  * point to load the TLB.
  *      r10 - EA of fault
- *      r11 - available to use
- *      r12 - Pointer to the 64-bit PTE
- *      r13 - available to use
+ *      r11 - PTE high word value
+ *      r12 - PTE low word value
+ *      r13 - TLB index
  *      MMUCR - loaded with proper value when we get here
  *      Upon exit, we reload everything and RFI.
  */
 finish_tlb_load:
-        /*
-         * We set execute, because we don't have the granularity to
-         * properly set this at the page level (Linux problem).
-         * If shared is set, we cause a zero PID->TID load.
-         * Many of these bits are software only.  Bits we don't set
-         * here we (properly should) assume have the appropriate value.
-         */
-
-        /* Load the next available TLB index */
-        lis     r13, tlb_44x_index@ha
-        lwz     r13, tlb_44x_index@l(r13)
-        /* Load the TLB high watermark */
-        lis     r11, tlb_44x_hwater@ha
-        lwz     r11, tlb_44x_hwater@l(r11)
-
-        /* Increment, rollover, and store TLB index */
-        addi    r13, r13, 1
-        cmpw    0, r13, r11                     /* reserve entries */
-        ble     7f
-        li      r13, 0
-7:
-        /* Store the next available TLB index */
-        lis     r11, tlb_44x_index@ha
-        stw     r13, tlb_44x_index@l(r11)
-
-        lwz     r11, 0(r12)                     /* Get MS word of PTE */
-        lwz     r12, 4(r12)                     /* Get LS word of PTE */
-        rlwimi  r11, r12, 0, 0 , 19             /* Insert RPN */
-        tlbwe   r11, r13, PPC44x_TLB_XLAT       /* Write XLAT */
+        /* Combine RPN & ERPN an write WS 0 */
+        rlwimi  r11,r12,0,0,19
+        tlbwe   r11,r13,PPC44x_TLB_XLAT
 
         /*
-         * Create PAGEID. This is the faulting address,
+         * Create WS1. This is the faulting address (EPN),
          * page size, and valid flag.
          */
-        li      r11, PPC44x_TLB_VALID | PPC44x_TLB_4K
-        rlwimi  r10, r11, 0, 20, 31             /* Insert valid and page size */
-        tlbwe   r10, r13, PPC44x_TLB_PAGEID     /* Write PAGEID */
-
-        li      r10, PPC44x_TLB_SR@l            /* Set SR */
-        rlwimi  r10, r12, 0, 30, 30             /* Set SW = _PAGE_RW */
-        rlwimi  r10, r12, 29, 29, 29            /* SX = _PAGE_HWEXEC */
-        rlwimi  r10, r12, 29, 28, 28            /* UR = _PAGE_USER */
-        rlwimi  r11, r12, 31, 26, 26            /* (_PAGE_USER>>1)->r12 */
-        and     r11, r12, r11                   /* HWEXEC & USER */
-        rlwimi  r10, r11, 0, 26, 26             /* UX = HWEXEC & USER */
-
-        rlwimi  r12, r10, 0, 26, 31             /* Insert static perms */
-
-        /*
-         * Clear U0-U3 and WL1 IL1I IL1D IL2I IL2D bits which are added
-         * on newer 440 cores like the 440x6 used on AMCC 460EX/460GT (see
-         * include/asm-powerpc/pgtable-ppc32.h for details).
-         */
-        rlwinm  r12, r12, 0, 20, 10
-
-        tlbwe   r12, r13, PPC44x_TLB_ATTRIB     /* Write ATTRIB */
+        li      r11,PPC44x_TLB_VALID | PPC44x_TLB_4K
+        rlwimi  r10,r11,0,20,31                 /* Insert valid and page size*/
+        tlbwe   r10,r13,PPC44x_TLB_PAGEID       /* Write PAGEID */
+
+        /* And WS 2 */
+        li      r10,0xf85                       /* Mask to apply from PTE */
+        rlwimi  r10,r12,29,30,30                /* DIRTY -> SW position */
+        and     r11,r12,r10                     /* Mask PTE bits to keep */
+        andi.   r10,r12,_PAGE_USER              /* User page ? */
+        beq     1f                              /* nope, leave U bits empty */
+        rlwimi  r11,r11,3,26,28                 /* yes, copy S bits to U */
+1:      tlbwe   r11,r13,PPC44x_TLB_ATTRIB       /* Write ATTRIB */
 
         /* Done...restore registers and get out of here.
         */
@@ -742,15 +648,6 @@ empty_zero_page:
 swapper_pg_dir:
         .space  PGD_TABLE_SIZE
 
-/* Reserved 4k for the critical exception stack & 4k for the machine
- * check stack per CPU for kernel mode exceptions */
-        .section .bss
-        .align 12
-exception_stack_bottom:
-        .space  BOOKE_EXCEPTION_STACK_SIZE
-        .globl  exception_stack_top
-exception_stack_top:
-
 /*
  * Room for two PTE pointers, usually the kernel and current user pointers
  * to their respective root page table.
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index 25e84c0e1166..cc8fb474d520 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -275,7 +275,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
         . = 0xf00
         b       performance_monitor_pSeries
 
-        STD_EXCEPTION_PSERIES(0xf20, altivec_unavailable)
+        . = 0xf20
+        b       altivec_unavailable_pSeries
+
+        . = 0xf40
+        b       vsx_unavailable_pSeries
 
 #ifdef CONFIG_CBE_RAS
         HSTD_EXCEPTION_PSERIES(0x1200, cbe_system_error)
@@ -295,6 +299,8 @@ END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
 
         /* moved from 0xf00 */
         STD_EXCEPTION_PSERIES(., performance_monitor)
+        STD_EXCEPTION_PSERIES(., altivec_unavailable)
+        STD_EXCEPTION_PSERIES(., vsx_unavailable)
 
 /*
  * An interrupt came in while soft-disabled; clear EE in SRR1,
@@ -739,7 +745,8 @@ fp_unavailable_common:
         ENABLE_INTS
         bl      .kernel_fp_unavailable_exception
         BUG_OPCODE
-1:      b       .load_up_fpu
+1:      bl      .load_up_fpu
+        b       fast_exception_return
 
         .align  7
         .globl altivec_unavailable_common
@@ -747,7 +754,10 @@ altivec_unavailable_common:
         EXCEPTION_PROLOG_COMMON(0xf20, PACA_EXGEN)
 #ifdef CONFIG_ALTIVEC
 BEGIN_FTR_SECTION
-        bne     .load_up_altivec        /* if from user, just load it up */
+        beq     1f
+        bl      .load_up_altivec
+        b       fast_exception_return
+1:
 END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 #endif
         bl      .save_nvgprs
@@ -827,9 +837,70 @@ _STATIC(load_up_altivec)
         std     r4,0(r3)
 #endif /* CONFIG_SMP */
         /* restore registers and return */
-        b       fast_exception_return
+        blr
 #endif /* CONFIG_ALTIVEC */
 
+        .align  7
+        .globl vsx_unavailable_common
+vsx_unavailable_common:
+        EXCEPTION_PROLOG_COMMON(0xf40, PACA_EXGEN)
+#ifdef CONFIG_VSX
+BEGIN_FTR_SECTION
+        bne     .load_up_vsx
+1:
+END_FTR_SECTION_IFSET(CPU_FTR_VSX)
+#endif
+        bl      .save_nvgprs
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        ENABLE_INTS
+        bl      .vsx_unavailable_exception
+        b       .ret_from_except
+
+#ifdef CONFIG_VSX
+/*
+ * load_up_vsx(unused, unused, tsk)
+ * Disable VSX for the task which had it previously,
+ * and save its vector registers in its thread_struct.
+ * Reuse the fp and vsx saves, but first check to see if they have
+ * been saved already.
+ * On entry: r13 == 'current' && last_task_used_vsx != 'current'
+ */
+_STATIC(load_up_vsx)
+/* Load FP and VSX registers if they haven't been done yet */
+        andi.   r5,r12,MSR_FP
+        beql+   load_up_fpu             /* skip if already loaded */
+        andis.  r5,r12,MSR_VEC@h
+        beql+   load_up_altivec         /* skip if already loaded */
+
+#ifndef CONFIG_SMP
+        ld      r3,last_task_used_vsx@got(r2)
+        ld      r4,0(r3)
+        cmpdi   0,r4,0
+        beq     1f
+        /* Disable VSX for last_task_used_vsx */
+        addi    r4,r4,THREAD
+        ld      r5,PT_REGS(r4)
+        ld      r4,_MSR-STACK_FRAME_OVERHEAD(r5)
+        lis     r6,MSR_VSX@h
+        andc    r6,r4,r6
+        std     r6,_MSR-STACK_FRAME_OVERHEAD(r5)
+1:
+#endif /* CONFIG_SMP */
+        ld      r4,PACACURRENT(r13)
+        addi    r4,r4,THREAD            /* Get THREAD */
+        li      r6,1
+        stw     r6,THREAD_USED_VSR(r4) /* ... also set thread used vsr */
+        /* enable use of VSX after return */
+        oris    r12,r12,MSR_VSX@h
+        std     r12,_MSR(r1)
+#ifndef CONFIG_SMP
+        /* Update last_task_used_math to 'current' */
+        ld      r4,PACACURRENT(r13)
+        std     r4,0(r3)
+#endif /* CONFIG_SMP */
+        b       fast_exception_return
+#endif /* CONFIG_VSX */
+
 /*
  * Hash table stuff
  */
@@ -1127,7 +1198,6 @@ _GLOBAL(generic_secondary_smp_init)
 3:      HMT_LOW
         lbz     r23,PACAPROCSTART(r13)  /* Test if this processor should */
                                         /* start.                        */
-        sync
 
 #ifndef CONFIG_SMP
         b       3b                      /* Never go on non-SMP           */
@@ -1135,6 +1205,8 @@ _GLOBAL(generic_secondary_smp_init)
         cmpwi   0,r23,0
         beq     3b                      /* Loop until told to go         */
 
+        sync                            /* order paca.run and cur_cpu_spec */
+
         /* See if we need to call a cpu state restore handler */
         LOAD_REG_IMMEDIATE(r23, cur_cpu_spec)
         ld      r23,0(r23)
diff --git a/arch/powerpc/kernel/head_booke.h b/arch/powerpc/kernel/head_booke.h
index aefafc6330c9..fce2df988504 100644
--- a/arch/powerpc/kernel/head_booke.h
+++ b/arch/powerpc/kernel/head_booke.h
@@ -43,9 +43,7 @@
         SAVE_2GPRS(7, r11)
 
 /* To handle the additional exception priority levels on 40x and Book-E
- * processors we allocate a 4k stack per additional priority level. The various
- * head_xxx.S files allocate space (exception_stack_top) for each priority's
- * stack times the number of CPUs
+ * processors we allocate a stack per additional priority level.
  *
  * On 40x critical is the only additional level
  * On 44x/e500 we have critical and machine check
@@ -61,36 +59,37 @@
  * going to critical or their own debug level we aren't currently
  * providing configurations that micro-optimize space usage.
  */
-#ifdef CONFIG_44x
-#define NUM_EXCEPTION_LVLS      2
-#else
-#define NUM_EXCEPTION_LVLS      3
-#endif
-#define BOOKE_EXCEPTION_STACK_SIZE      (4096 * NUM_EXCEPTION_LVLS)
 
 /* CRIT_SPRG only used in critical exception handling */
 #define CRIT_SPRG       SPRN_SPRG2
 /* 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)
+#define MCHECK_STACK_BASE       mcheckirq_ctx
+#define CRIT_STACK_BASE         critirq_ctx
 
-/* only on e200 for now */
-#define DEBUG_STACK_TOP         (exception_stack_top - 8192)
+/* only on e500mc/e200 */
+#define DEBUG_STACK_BASE        dbgirq_ctx
+#ifdef CONFIG_PPC_E500MC
+#define DEBUG_SPRG              SPRN_SPRG9
+#else
 #define DEBUG_SPRG              SPRN_SPRG6W
+#endif
+
+#define EXC_LVL_FRAME_OVERHEAD  (THREAD_SIZE - INT_FRAME_SIZE - EXC_LVL_SIZE)
 
 #ifdef CONFIG_SMP
 #define BOOKE_LOAD_EXC_LEVEL_STACK(level)               \
         mfspr   r8,SPRN_PIR;                            \
-        mulli   r8,r8,BOOKE_EXCEPTION_STACK_SIZE;       \
-        neg     r8,r8;                                  \
-        addis   r8,r8,level##_STACK_TOP@ha;             \
-        addi    r8,r8,level##_STACK_TOP@l
+        slwi    r8,r8,2;                                \
+        addis   r8,r8,level##_STACK_BASE@ha;            \
+        lwz     r8,level##_STACK_BASE@l(r8);            \
+        addi    r8,r8,EXC_LVL_FRAME_OVERHEAD;
 #else
 #define BOOKE_LOAD_EXC_LEVEL_STACK(level)               \
-        lis     r8,level##_STACK_TOP@h;                 \
-        ori     r8,r8,level##_STACK_TOP@l
+        lis     r8,level##_STACK_BASE@ha;               \
+        lwz     r8,level##_STACK_BASE@l(r8);            \
+        addi    r8,r8,EXC_LVL_FRAME_OVERHEAD;
 #endif
 
 /*
@@ -104,22 +103,36 @@
 #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,exc_level_srr1;     /* check whether user or kernel    */\
-        andi.   r11,r11,MSR_PR;                                              \
-        mr      r11,r8;                                                      \
-        mfspr   r8,exc_level##_SPRG;                                         \
-        beq     1f;                                                          \
-        /* COMING FROM USER MODE */                                          \
+        stw     r9,GPR9(r8);            /* save various registers          */\
+        mfcr    r9;                     /* save CR in r9 for now           */\
+        stw     r10,GPR10(r8);                                               \
+        stw     r11,GPR11(r8);                                               \
+        stw     r9,_CCR(r8);            /* save CR on stack                */\
+        mfspr   r10,exc_level_srr1;     /* check whether user or kernel    */\
+        andi.   r10,r10,MSR_PR;                                              \
         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);                                              \
+        addi    r11,r11,EXC_LVL_FRAME_OVERHEAD; /* allocate stack frame    */\
+        beq     1f;                                                          \
+        /* COMING FROM USER MODE */                                          \
+        stw     r9,_CCR(r11);           /* save CR                         */\
+        lwz     r10,GPR10(r8);          /* copy regs from exception stack  */\
+        lwz     r9,GPR9(r8);                                                 \
+        stw     r10,GPR10(r11);                                              \
+        lwz     r10,GPR11(r8);                                               \
         stw     r9,GPR9(r11);                                                \
+        stw     r10,GPR11(r11);                                              \
+        b       2f;                                                          \
+        /* COMING FROM PRIV MODE */                                          \
+1:      lwz     r9,TI_FLAGS-EXC_LVL_FRAME_OVERHEAD(r11);                     \
+        lwz     r10,TI_PREEMPT-EXC_LVL_FRAME_OVERHEAD(r11);                  \
+        stw     r9,TI_FLAGS-EXC_LVL_FRAME_OVERHEAD(r8);                      \
+        stw     r10,TI_PREEMPT-EXC_LVL_FRAME_OVERHEAD(r8);                   \
+        lwz     r9,TI_TASK-EXC_LVL_FRAME_OVERHEAD(r11);                      \
+        stw     r9,TI_TASK-EXC_LVL_FRAME_OVERHEAD(r8);                       \
+        mr      r11,r8;                                                      \
+2:      mfspr   r8,exc_level##_SPRG;                                         \
+        stw     r12,GPR12(r11);         /* save various registers          */\
         mflr    r10;                                                         \
         stw     r10,_LINK(r11);                                              \
         mfspr   r12,SPRN_DEAR;          /* save DEAR and ESR in the frame  */\
@@ -231,7 +244,7 @@ label:
          * 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.           \
+         * off DE in the DSRR1 value and clearing the debug status.           \
          */                                                                   \
         mfspr   r10,SPRN_DBSR;          /* check single-step/branch taken */  \
         andis.  r10,r10,DBSR_IC@h;                                            \
@@ -262,17 +275,17 @@ label:
         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);                                 \
+        lwz     r10,GPR10(r8);                                                \
+        lwz     r11,GPR11(r8);                                                \
         mfspr   r8,DEBUG_SPRG;                                                \
                                                                               \
         RFDI;                                                                 \
         b       .;                                                            \
                                                                               \
-        /* continue normal handling for a critical exception... */            \
+        /* continue normal handling for a debug 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)
+        EXC_XFER_TEMPLATE(DebugException, 0x2008, (MSR_KERNEL & ~(MSR_ME|MSR_DE|MSR_CE)), NOCOPY, debug_transfer_to_handler, ret_from_debug_exc)
 
 #define DEBUG_CRIT_EXCEPTION                                                  \
         START_EXCEPTION(DebugCrit);                                           \
@@ -315,8 +328,8 @@ label:
         lwz     r12,GPR12(r11);                                               \
         mtspr   CRIT_SPRG,r8;                                                 \
         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);                                 \
+        lwz     r10,GPR10(r8);                                                \
+        lwz     r11,GPR11(r8);                                                \
         mfspr   r8,CRIT_SPRG;                                                 \
                                                                               \
         rfci;                                                                 \
@@ -327,6 +340,14 @@ label:
         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)
 
+#define DATA_STORAGE_EXCEPTION                                                \
+        START_EXCEPTION(DataStorage)                                          \
+        NORMAL_EXCEPTION_PROLOG;                                              \
+        mfspr   r5,SPRN_ESR;            /* Grab the ESR and save it */        \
+        stw     r5,_ESR(r11);                                                 \
+        mfspr   r4,SPRN_DEAR;           /* Grab the DEAR */                   \
+        EXC_XFER_EE_LITE(0x0300, handle_page_fault)
+
 #define INSTRUCTION_STORAGE_EXCEPTION                                         \
         START_EXCEPTION(InstructionStorage)                                   \
         NORMAL_EXCEPTION_PROLOG;                                              \
@@ -363,8 +384,31 @@ label:
 #define FP_UNAVAILABLE_EXCEPTION                                              \
         START_EXCEPTION(FloatingPointUnavailable)                             \
         NORMAL_EXCEPTION_PROLOG;                                              \
-        bne     load_up_fpu;            /* if from user, just load it up */   \
-        addi    r3,r1,STACK_FRAME_OVERHEAD;                                   \
+        beq     1f;                                                           \
+        bl      load_up_fpu;            /* if from user, just load it up */   \
+        b       fast_exception_return;                                        \
+1:      addi    r3,r1,STACK_FRAME_OVERHEAD;                                   \
         EXC_XFER_EE_LITE(0x800, kernel_fp_unavailable_exception)
 
+#ifndef __ASSEMBLY__
+struct exception_regs {
+        unsigned long mas0;
+        unsigned long mas1;
+        unsigned long mas2;
+        unsigned long mas3;
+        unsigned long mas6;
+        unsigned long mas7;
+        unsigned long srr0;
+        unsigned long srr1;
+        unsigned long csrr0;
+        unsigned long csrr1;
+        unsigned long dsrr0;
+        unsigned long dsrr1;
+        unsigned long saved_ksp_limit;
+};
+
+/* ensure this structure is always sized to a multiple of the stack alignment */
+#define STACK_EXC_LVL_FRAME_SIZE        _ALIGN_UP(sizeof (struct exception_regs), 16)
+
+#endif /* __ASSEMBLY__ */
 #endif /* __HEAD_BOOKE_H__ */
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index e581524d85bc..c4268500e856 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -39,6 +39,7 @@
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
 #include <asm/asm-offsets.h>
+#include <asm/cache.h>
 #include "head_booke.h"
 
 /* As with the other PowerPC ports, it is expected that when code
@@ -304,7 +305,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
         SET_IVOR(13, DataTLBError);
         SET_IVOR(14, InstructionTLBError);
         SET_IVOR(15, DebugDebug);
-#if defined(CONFIG_E500)
+#if defined(CONFIG_E500) && !defined(CONFIG_PPC_E500MC)
         SET_IVOR(15, DebugCrit);
 #endif
         SET_IVOR(32, SPEUnavailable);
@@ -313,6 +314,9 @@ skpinv:	addi	r6,r6,1				/* Increment */
 #ifndef CONFIG_E200
         SET_IVOR(35, PerformanceMonitor);
 #endif
+#ifdef CONFIG_PPC_E500MC
+        SET_IVOR(36, Doorbell);
+#endif
 
         /* Establish the interrupt vector base */
         lis     r4,interrupt_base@h     /* IVPR only uses the high 16-bits */
@@ -750,10 +754,13 @@ interrupt_base:
         /* Performance Monitor */
         EXCEPTION(0x2060, PerformanceMonitor, performance_monitor_exception, EXC_XFER_STD)
 
+#ifdef CONFIG_PPC_E500MC
+        EXCEPTION(0x2070, Doorbell, unknown_exception, EXC_XFER_EE)
+#endif
 
         /* Debug Interrupt */
         DEBUG_DEBUG_EXCEPTION
-#if defined(CONFIG_E500)
+#if defined(CONFIG_E500) && !defined(CONFIG_PPC_E500MC)
         DEBUG_CRIT_EXCEPTION
 #endif
 
@@ -1065,6 +1072,52 @@ _GLOBAL(set_context)
         isync                   /* Force context change */
         blr
 
+_GLOBAL(flush_dcache_L1)
+        mfspr   r3,SPRN_L1CFG0
+
+        rlwinm  r5,r3,9,3       /* Extract cache block size */
+        twlgti  r5,1            /* Only 32 and 64 byte cache blocks
+                                 * are currently defined.
+                                 */
+        li      r4,32
+        subfic  r6,r5,2         /* r6 = log2(1KiB / cache block size) -
+                                 *      log2(number of ways)
+                                 */
+        slw     r5,r4,r5        /* r5 = cache block size */
+
+        rlwinm  r7,r3,0,0xff    /* Extract number of KiB in the cache */
+        mulli   r7,r7,13        /* An 8-way cache will require 13
+                                 * loads per set.
+                                 */
+        slw     r7,r7,r6
+
+        /* save off HID0 and set DCFA */
+        mfspr   r8,SPRN_HID0
+        ori     r9,r8,HID0_DCFA@l
+        mtspr   SPRN_HID0,r9
+        isync
+
+        lis     r4,KERNELBASE@h
+        mtctr   r7
+
+1:      lwz     r3,0(r4)        /* Load... */
+        add     r4,r4,r5
+        bdnz    1b
+
+        msync
+        lis     r4,KERNELBASE@h
+        mtctr   r7
+
+1:      dcbf    0,r4            /* ...and flush. */
+        add     r4,r4,r5
+        bdnz    1b
+        
+        /* restore HID0 */
+        mtspr   SPRN_HID0,r8
+        isync
+
+        blr
+
 /*
  * We put a few things here that have to be page-aligned. This stuff
  * goes at the beginning of the data segment, which is page-aligned.
@@ -1080,15 +1133,6 @@ empty_zero_page:
 swapper_pg_dir:
         .space  PGD_TABLE_SIZE
 
-/* Reserved 4k for the critical exception stack & 4k for the machine
- * check stack per CPU for kernel mode exceptions */
-        .section .bss
-        .align 12
-exception_stack_bottom:
-        .space  BOOKE_EXCEPTION_STACK_SIZE * NR_CPUS
-        .globl  exception_stack_top
-exception_stack_top:
-
 /*
  * Room for two PTE pointers, usually the kernel and current user pointers
  * to their respective root page table.
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 9971159c8040..9d42eb57aea3 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -53,7 +53,7 @@ static struct device ibmebus_bus_device = { /* fake "parent" device */
 struct bus_type ibmebus_bus_type;
 
 /* These devices will automatically be added to the bus during init */
-static struct of_device_id __initdata builtin_matches[] = {
+static struct of_device_id __initdata ibmebus_matches[] = {
         { .compatible = "IBM,lhca" },
         { .compatible = "IBM,lhea" },
         {},
@@ -82,7 +82,8 @@ static void ibmebus_free_coherent(struct device *dev,
 static dma_addr_t ibmebus_map_single(struct device *dev,
                                      void *ptr,
                                      size_t size,
-                                     enum dma_data_direction direction)
+                                     enum dma_data_direction direction,
+                                     struct dma_attrs *attrs)
 {
         return (dma_addr_t)(ptr);
 }
@@ -90,14 +91,16 @@ static dma_addr_t ibmebus_map_single(struct device *dev,
 static void ibmebus_unmap_single(struct device *dev,
                                  dma_addr_t dma_addr,
                                  size_t size,
-                                 enum dma_data_direction direction)
+                                 enum dma_data_direction direction,
+                                 struct dma_attrs *attrs)
 {
         return;
 }
 
 static int ibmebus_map_sg(struct device *dev,
                           struct scatterlist *sgl,
-                          int nents, enum dma_data_direction direction)
+                          int nents, enum dma_data_direction direction,
+                          struct dma_attrs *attrs)
 {
         struct scatterlist *sg;
         int i;
@@ -112,7 +115,8 @@ static int ibmebus_map_sg(struct device *dev,
 
 static void ibmebus_unmap_sg(struct device *dev,
                              struct scatterlist *sg,
-                             int nents, enum dma_data_direction direction)
+                             int nents, enum dma_data_direction direction,
+                             struct dma_attrs *attrs)
 {
         return;
 }
@@ -350,7 +354,7 @@ static int __init ibmebus_bus_init(void)
                 return err;
         }
 
-        err = ibmebus_create_devices(builtin_matches);
+        err = ibmebus_create_devices(ibmebus_matches);
         if (err) {
                 device_unregister(&ibmebus_bus_device);
                 bus_unregister(&ibmebus_bus_type);
diff --git a/arch/powerpc/kernel/idle_6xx.S b/arch/powerpc/kernel/idle_6xx.S
index 01bcd52bbf8e..019b02d8844f 100644
--- a/arch/powerpc/kernel/idle_6xx.S
+++ b/arch/powerpc/kernel/idle_6xx.S
@@ -153,7 +153,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
  * address of current.  R11 points to the exception frame (physical
  * address).  We have to preserve r10.
  */
-_GLOBAL(power_save_6xx_restore)
+_GLOBAL(power_save_ppc32_restore)
         lwz     r9,_LINK(r11)           /* interrupted in ppc6xx_idle: */
         stw     r9,_NIP(r11)            /* make it do a blr */
 
diff --git a/arch/powerpc/kernel/idle_e500.S b/arch/powerpc/kernel/idle_e500.S
new file mode 100644
index 000000000000..06304034b393
--- /dev/null
+++ b/arch/powerpc/kernel/idle_e500.S
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2008 Freescale Semiconductor, Inc. All rights reserved.
+ * Dave Liu <daveliu@freescale.com>
+ * copy from idle_6xx.S and modify for e500 based processor,
+ * implement the power_save function in idle.
+ *
+ * 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.
+ */
+
+#include <linux/threads.h>
+#include <asm/reg.h>
+#include <asm/page.h>
+#include <asm/cputable.h>
+#include <asm/thread_info.h>
+#include <asm/ppc_asm.h>
+#include <asm/asm-offsets.h>
+
+        .text
+
+_GLOBAL(e500_idle)
+        rlwinm  r3,r1,0,0,31-THREAD_SHIFT       /* current thread_info */
+        lwz     r4,TI_LOCAL_FLAGS(r3)   /* set napping bit */
+        ori     r4,r4,_TLF_NAPPING      /* so when we take an exception */
+        stw     r4,TI_LOCAL_FLAGS(r3)   /* it will return to our caller */
+
+        /* Check if we can nap or doze, put HID0 mask in r3 */
+        lis     r3,0
+BEGIN_FTR_SECTION
+        lis     r3,HID0_DOZE@h
+END_FTR_SECTION_IFSET(CPU_FTR_CAN_DOZE)
+
+BEGIN_FTR_SECTION
+        /* Now check if user enabled NAP mode */
+        lis     r4,powersave_nap@ha
+        lwz     r4,powersave_nap@l(r4)
+        cmpwi   0,r4,0
+        beq     1f
+        stwu    r1,-16(r1)
+        mflr    r0
+        stw     r0,20(r1)
+        bl      flush_dcache_L1
+        lwz     r0,20(r1)
+        addi    r1,r1,16
+        mtlr    r0
+        lis     r3,HID0_NAP@h
+END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP)
+BEGIN_FTR_SECTION
+        msync
+        li      r7,L2CSR0_L2FL@l
+        mtspr   SPRN_L2CSR0,r7
+2:
+        mfspr   r7,SPRN_L2CSR0
+        andi.   r4,r7,L2CSR0_L2FL@l
+        bne     2b
+END_FTR_SECTION_IFSET(CPU_FTR_L2CSR|CPU_FTR_CAN_NAP)
+1:
+        /* Go to NAP or DOZE now */
+        mfspr   r4,SPRN_HID0
+        rlwinm  r4,r4,0,~(HID0_DOZE|HID0_NAP|HID0_SLEEP)
+        or      r4,r4,r3
+        isync
+        mtspr   SPRN_HID0,r4
+        isync
+
+        mfmsr   r7
+        oris    r7,r7,MSR_WE@h
+        ori     r7,r7,MSR_EE
+        msync
+        mtmsr   r7
+        isync
+2:      b       2b
+
+/*
+ * Return from NAP/DOZE mode, restore some CPU specific registers,
+ * r2 containing physical address of current.
+ * r11 points to the exception frame (physical address).
+ * We have to preserve r10.
+ */
+_GLOBAL(power_save_ppc32_restore)
+        lwz     r9,_LINK(r11)           /* interrupted in e500_idle */
+        stw     r9,_NIP(r11)            /* make it do a blr */
+
+#ifdef CONFIG_SMP
+        mfspr   r12,SPRN_SPRG3
+        lwz     r11,TI_CPU(r12)         /* get cpu number * 4 */
+        slwi    r11,r11,2
+#else
+        li      r11,0
+#endif
+        b       transfer_to_handler_cont
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 0c663669bc32..8c68ee9e5d1c 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -267,11 +267,11 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr,
         spin_unlock_irqrestore(&(tbl->it_lock), flags);
 }
 
-int iommu_map_sg(struct device *dev, struct scatterlist *sglist,
-                 int nelems, unsigned long mask,
-                 enum dma_data_direction direction)
+int iommu_map_sg(struct device *dev, struct iommu_table *tbl,
+                 struct scatterlist *sglist, int nelems,
+                 unsigned long mask, enum dma_data_direction direction,
+                 struct dma_attrs *attrs)
 {
-        struct iommu_table *tbl = dev->archdata.dma_data;
         dma_addr_t dma_next = 0, dma_addr;
         unsigned long flags;
         struct scatterlist *s, *outs, *segstart;
@@ -412,7 +412,8 @@ int iommu_map_sg(struct device *dev, struct scatterlist *sglist,
 
 
 void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,
-                int nelems, enum dma_data_direction direction)
+                int nelems, enum dma_data_direction direction,
+                struct dma_attrs *attrs)
 {
         struct scatterlist *sg;
         unsigned long flags;
@@ -554,7 +555,7 @@ void iommu_free_table(struct iommu_table *tbl, const char *node_name)
  */
 dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl,
                             void *vaddr, size_t size, unsigned long mask,
-                            enum dma_data_direction direction)
+                enum dma_data_direction direction, struct dma_attrs *attrs)
 {
         dma_addr_t dma_handle = DMA_ERROR_CODE;
         unsigned long uaddr;
@@ -587,7 +588,8 @@ dma_addr_t iommu_map_single(struct device *dev, struct iommu_table *tbl,
 }
 
 void iommu_unmap_single(struct iommu_table *tbl, dma_addr_t dma_handle,
-                size_t size, enum dma_data_direction direction)
+                size_t size, enum dma_data_direction direction,
+                struct dma_attrs *attrs)
 {
         unsigned int npages;
 
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index dcc946e67099..6ac8612da3c3 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -356,9 +356,42 @@ void __init init_IRQ(void)
 {
         if (ppc_md.init_IRQ)
                 ppc_md.init_IRQ();
+
+        exc_lvl_ctx_init();
+
         irq_ctx_init();
 }
 
+#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
+struct thread_info   *critirq_ctx[NR_CPUS] __read_mostly;
+struct thread_info    *dbgirq_ctx[NR_CPUS] __read_mostly;
+struct thread_info *mcheckirq_ctx[NR_CPUS] __read_mostly;
+
+void exc_lvl_ctx_init(void)
+{
+        struct thread_info *tp;
+        int i;
+
+        for_each_possible_cpu(i) {
+                memset((void *)critirq_ctx[i], 0, THREAD_SIZE);
+                tp = critirq_ctx[i];
+                tp->cpu = i;
+                tp->preempt_count = 0;
+
+#ifdef CONFIG_BOOKE
+                memset((void *)dbgirq_ctx[i], 0, THREAD_SIZE);
+                tp = dbgirq_ctx[i];
+                tp->cpu = i;
+                tp->preempt_count = 0;
+
+                memset((void *)mcheckirq_ctx[i], 0, THREAD_SIZE);
+                tp = mcheckirq_ctx[i];
+                tp->cpu = i;
+                tp->preempt_count = HARDIRQ_OFFSET;
+#endif
+        }
+}
+#endif
 
 #ifdef CONFIG_IRQSTACKS
 struct thread_info *softirq_ctx[NR_CPUS] __read_mostly;
@@ -465,7 +498,7 @@ struct irq_host *irq_alloc_host(struct device_node *of_node,
         host->revmap_type = revmap_type;
         host->inval_irq = inval_irq;
         host->ops = ops;
-        host->of_node = of_node;
+        host->of_node = of_node_get(of_node);
 
         if (host->ops->match == NULL)
                 host->ops->match = default_irq_host_match;
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c
index c176c513566b..4ba2af125450 100644
--- a/arch/powerpc/kernel/kprobes.c
+++ b/arch/powerpc/kernel/kprobes.c
@@ -34,6 +34,13 @@
 #include <asm/cacheflush.h>
 #include <asm/sstep.h>
 #include <asm/uaccess.h>
+#include <asm/system.h>
+
+#ifdef CONFIG_BOOKE
+#define MSR_SINGLESTEP  (MSR_DE)
+#else
+#define MSR_SINGLESTEP  (MSR_SE)
+#endif
 
 DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
 DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
@@ -53,7 +60,8 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
                 ret = -EINVAL;
         }
 
-        /* insn must be on a special executable page on ppc64 */
+        /* insn must be on a special executable page on ppc64.  This is
+         * not explicitly required on ppc32 (right now), but it doesn't hurt */
         if (!ret) {
                 p->ainsn.insn = get_insn_slot();
                 if (!p->ainsn.insn)
@@ -95,7 +103,16 @@ void __kprobes arch_remove_kprobe(struct kprobe *p)
 
 static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
 {
-        regs->msr |= MSR_SE;
+        /* We turn off async exceptions to ensure that the single step will
+         * be for the instruction we have the kprobe on, if we dont its
+         * possible we'd get the single step reported for an exception handler
+         * like Decrementer or External Interrupt */
+        regs->msr &= ~MSR_EE;
+        regs->msr |= MSR_SINGLESTEP;
+#ifdef CONFIG_BOOKE
+        regs->msr &= ~MSR_CE;
+        mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) | DBCR0_IC | DBCR0_IDM);
+#endif
 
         /*
          * On powerpc we should single step on the original
@@ -158,7 +175,8 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
                         kprobe_opcode_t insn = *p->ainsn.insn;
                         if (kcb->kprobe_status == KPROBE_HIT_SS &&
                                         is_trap(insn)) {
-                                regs->msr &= ~MSR_SE;
+                                /* Turn off 'trace' bits */
+                                regs->msr &= ~MSR_SINGLESTEP;
                                 regs->msr |= kcb->kprobe_saved_msr;
                                 goto no_kprobe;
                         }
@@ -376,6 +394,10 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs)
         if (!cur)
                 return 0;
 
+        /* make sure we got here for instruction we have a kprobe on */
+        if (((unsigned long)cur->ainsn.insn + 4) != regs->nip)
+                return 0;
+
         if ((kcb->kprobe_status != KPROBE_REENTER) && cur->post_handler) {
                 kcb->kprobe_status = KPROBE_HIT_SSDONE;
                 cur->post_handler(cur, regs, 0);
@@ -395,10 +417,10 @@ out:
 
         /*
          * if somebody else is singlestepping across a probe point, msr
-         * will have SE set, in which case, continue the remaining processing
+         * will have DE/SE set, in which case, continue the remaining processing
          * of do_debug, as if this is not a probe hit.
          */
-        if (regs->msr & MSR_SE)
+        if (regs->msr & MSR_SINGLESTEP)
                 return 0;
 
         return 1;
@@ -421,7 +443,7 @@ int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
                  * normal page fault.
                  */
                 regs->nip = (unsigned long)cur->addr;
-                regs->msr &= ~MSR_SE;
+                regs->msr &= ~MSR_SINGLESTEP; /* Turn off 'trace' bits */
                 regs->msr |= kcb->kprobe_saved_msr;
                 if (kcb->kprobe_status == KPROBE_REENTER)
                         restore_previous_kprobe(kcb);
@@ -498,7 +520,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
 #ifdef CONFIG_PPC64
 unsigned long arch_deref_entry_point(void *entry)
 {
-        return (unsigned long)(((func_descr_t *)entry)->entry);
+        return ((func_descr_t *)entry)->entry;
 }
 #endif
 
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index 1e656b43ad7f..827a5726a035 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -573,7 +573,7 @@ static int lparcfg_open(struct inode *inode, struct file *file)
         return single_open(file, lparcfg_data, NULL);
 }
 
-const struct file_operations lparcfg_fops = {
+static const struct file_operations lparcfg_fops = {
         .owner          = THIS_MODULE,
         .read           = seq_read,
         .write          = lparcfg_write,
@@ -581,7 +581,7 @@ const struct file_operations lparcfg_fops = {
         .release        = single_release,
 };
 
-int __init lparcfg_init(void)
+static int __init lparcfg_init(void)
 {
         struct proc_dir_entry *ent;
         mode_t mode = S_IRUSR | S_IRGRP | S_IROTH;
@@ -601,7 +601,7 @@ int __init lparcfg_init(void)
         return 0;
 }
 
-void __exit lparcfg_cleanup(void)
+static void __exit lparcfg_cleanup(void)
 {
         if (proc_ppc64_lparcfg)
                 remove_proc_entry("lparcfg", proc_ppc64_lparcfg->parent);
diff --git a/arch/powerpc/kernel/machine_kexec_64.c b/arch/powerpc/kernel/machine_kexec_64.c
index b732b5f8e356..a168514d8609 100644
--- a/arch/powerpc/kernel/machine_kexec_64.c
+++ b/arch/powerpc/kernel/machine_kexec_64.c
@@ -158,7 +158,7 @@ void kexec_copy_flush(struct kimage *image)
  * on calling the interrupts, but we would like to call it off irq level
  * so that the interrupt controller is clean.
  */
-void kexec_smp_down(void *arg)
+static void kexec_smp_down(void *arg)
 {
         if (ppc_md.kexec_cpu_down)
                 ppc_md.kexec_cpu_down(0, 1);
@@ -249,7 +249,7 @@ static void kexec_prepare_cpus(void)
  * We could use a smaller stack if we don't care about anything using
  * current, but that audit has not been performed.
  */
-union thread_union kexec_stack
+static union thread_union kexec_stack
         __attribute__((__section__(".data.init_task"))) = { };
 
 /* Our assembly helper, in kexec_stub.S */
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index 7b9160220698..85cb6f340846 100644
--- a/arch/powerpc/kernel/misc.S
+++ b/arch/powerpc/kernel/misc.S
@@ -116,3 +116,8 @@ _GLOBAL(longjmp)
         mtlr    r0
         mr      r3,r4
         blr
+
+_GLOBAL(__setup_cpu_power7)
+_GLOBAL(__restore_cpu_power7)
+        /* place holder */
+        blr
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 89aaaa6f3561..6321ae36f729 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -489,7 +489,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_UNIFIED_ID_CACHE)
  *
  * flush_icache_range(unsigned long start, unsigned long stop)
  */
-_GLOBAL(__flush_icache_range)
+_KPROBE(__flush_icache_range)
 BEGIN_FTR_SECTION
         blr                             /* for 601, do nothing */
 END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index 942951e76586..4dd70cf7bb4e 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -506,6 +506,39 @@ _GLOBAL(giveup_altivec)
 
 #endif /* CONFIG_ALTIVEC */
 
+#ifdef CONFIG_VSX
+/*
+ * __giveup_vsx(tsk)
+ * Disable VSX for the task given as the argument.
+ * Does NOT save vsx registers.
+ * Enables the VSX for use in the kernel on return.
+ */
+_GLOBAL(__giveup_vsx)
+        mfmsr   r5
+        oris    r5,r5,MSR_VSX@h
+        mtmsrd  r5                      /* enable use of VSX now */
+        isync
+
+        cmpdi   0,r3,0
+        beqlr-                          /* if no previous owner, done */
+        addi    r3,r3,THREAD            /* want THREAD of task */
+        ld      r5,PT_REGS(r3)
+        cmpdi   0,r5,0
+        beq     1f
+        ld      r4,_MSR-STACK_FRAME_OVERHEAD(r5)
+        lis     r3,MSR_VSX@h
+        andc    r4,r4,r3                /* disable VSX for previous task */
+        std     r4,_MSR-STACK_FRAME_OVERHEAD(r5)
+1:
+#ifndef CONFIG_SMP
+        li      r5,0
+        ld      r4,last_task_used_vsx@got(r2)
+        std     r5,0(r4)
+#endif /* CONFIG_SMP */
+        blr
+
+#endif /* CONFIG_VSX */
+
 /* kexec_wait(phys_cpu)
  *
  * wait for the flag to change, indicating this kernel is going away but
diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c
new file mode 100644
index 000000000000..af07003573c4
--- /dev/null
+++ b/arch/powerpc/kernel/module.c
@@ -0,0 +1,116 @@
+/*  Kernel module help for powerpc.
+    Copyright (C) 2001, 2003 Rusty Russell IBM Corporation.
+    Copyright (C) 2008 Freescale Semiconductor, Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    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/module.h>
+#include <linux/elf.h>
+#include <linux/moduleloader.h>
+#include <linux/err.h>
+#include <linux/vmalloc.h>
+#include <linux/bug.h>
+#include <asm/module.h>
+#include <asm/uaccess.h>
+#include <asm/firmware.h>
+#include <linux/sort.h>
+
+#include "setup.h"
+
+LIST_HEAD(module_bug_list);
+
+void *module_alloc(unsigned long size)
+{
+        if (size == 0)
+                return NULL;
+
+        return vmalloc_exec(size);
+}
+
+/* Free memory returned from module_alloc */
+void module_free(struct module *mod, void *module_region)
+{
+        vfree(module_region);
+        /* FIXME: If module_region == mod->init_region, trim exception
+           table entries. */
+}
+
+static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
+                                    const Elf_Shdr *sechdrs,
+                                    const char *name)
+{
+        char *secstrings;
+        unsigned int i;
+
+        secstrings = (char *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
+        for (i = 1; i < hdr->e_shnum; i++)
+                if (strcmp(secstrings+sechdrs[i].sh_name, name) == 0)
+                        return &sechdrs[i];
+        return NULL;
+}
+
+int module_finalize(const Elf_Ehdr *hdr,
+                const Elf_Shdr *sechdrs, struct module *me)
+{
+        const Elf_Shdr *sect;
+        int err;
+
+        err = module_bug_finalize(hdr, sechdrs, me);
+        if (err)
+                return err;
+
+        /* Apply feature fixups */
+        sect = find_section(hdr, sechdrs, "__ftr_fixup");
+        if (sect != NULL)
+                do_feature_fixups(cur_cpu_spec->cpu_features,
+                                  (void *)sect->sh_addr,
+                                  (void *)sect->sh_addr + sect->sh_size);
+
+#ifdef CONFIG_PPC64
+        sect = find_section(hdr, sechdrs, "__fw_ftr_fixup");
+        if (sect != NULL)
+                do_feature_fixups(powerpc_firmware_features,
+                                  (void *)sect->sh_addr,
+                                  (void *)sect->sh_addr + sect->sh_size);
+#endif
+
+        sect = find_section(hdr, sechdrs, "__lwsync_fixup");
+        if (sect != NULL)
+                do_lwsync_fixups(cur_cpu_spec->cpu_features,
+                                 (void *)sect->sh_addr,
+                                 (void *)sect->sh_addr + sect->sh_size);
+
+        return 0;
+}
+
+void module_arch_cleanup(struct module *mod)
+{
+        module_bug_cleanup(mod);
+}
+
+struct bug_entry *module_find_bug(unsigned long bugaddr)
+{
+        struct mod_arch_specific *mod;
+        unsigned int i;
+        struct bug_entry *bug;
+
+        list_for_each_entry(mod, &module_bug_list, bug_list) {
+                bug = mod->bug_table;
+                for (i = 0; i < mod->num_bugs; ++i, ++bug)
+                        if (bugaddr == bug->bug_addr)
+                                return bug;
+        }
+        return NULL;
+}
diff --git a/arch/powerpc/kernel/module_32.c b/arch/powerpc/kernel/module_32.c
index eab313858315..2df91a03462a 100644
--- a/arch/powerpc/kernel/module_32.c
+++ b/arch/powerpc/kernel/module_32.c
@@ -34,23 +34,6 @@
 #define DEBUGP(fmt , ...)
 #endif
 
-LIST_HEAD(module_bug_list);
-
-void *module_alloc(unsigned long size)
-{
-        if (size == 0)
-                return NULL;
-        return vmalloc(size);
-}
-
-/* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
-{
-        vfree(module_region);
-        /* FIXME: If module_region == mod->init_region, trim exception
-           table entries. */
-}
-
 /* Count how many different relocations (different symbol, different
    addend) */
 static unsigned int count_relocs(const Elf32_Rela *rela, unsigned int num)
@@ -325,58 +308,3 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
         }
         return 0;
 }
-
-static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
-                                    const Elf_Shdr *sechdrs,
-                                    const char *name)
-{
-        char *secstrings;
-        unsigned int i;
-
-        secstrings = (char *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
-        for (i = 1; i < hdr->e_shnum; i++)
-                if (strcmp(secstrings+sechdrs[i].sh_name, name) == 0)
-                        return &sechdrs[i];
-        return NULL;
-}
-
-int module_finalize(const Elf_Ehdr *hdr,
-                    const Elf_Shdr *sechdrs,
-                    struct module *me)
-{
-        const Elf_Shdr *sect;
-        int err;
-
-        err = module_bug_finalize(hdr, sechdrs, me);
-        if (err)                /* never true, currently */
-                return err;
-
-        /* Apply feature fixups */
-        sect = find_section(hdr, sechdrs, "__ftr_fixup");
-        if (sect != NULL)
-                do_feature_fixups(cur_cpu_spec->cpu_features,
-                                  (void *)sect->sh_addr,
-                                  (void *)sect->sh_addr + sect->sh_size);
-
-        return 0;
-}
-
-void module_arch_cleanup(struct module *mod)
-{
-        module_bug_cleanup(mod);
-}
-
-struct bug_entry *module_find_bug(unsigned long bugaddr)
-{
-        struct mod_arch_specific *mod;
-        unsigned int i;
-        struct bug_entry *bug;
-
-        list_for_each_entry(mod, &module_bug_list, bug_list) {
-                bug = mod->bug_table;
-                for (i = 0; i < mod->num_bugs; ++i, ++bug)
-                        if (bugaddr == bug->bug_addr)
-                                return bug;
-        }
-        return NULL;
-}
diff --git a/arch/powerpc/kernel/module_64.c b/arch/powerpc/kernel/module_64.c
index 3a82b02b784b..ee6a2982d567 100644
--- a/arch/powerpc/kernel/module_64.c
+++ b/arch/powerpc/kernel/module_64.c
@@ -24,6 +24,7 @@
 #include <asm/module.h>
 #include <asm/uaccess.h>
 #include <asm/firmware.h>
+#include <asm/code-patching.h>
 #include <linux/sort.h>
 
 #include "setup.h"
@@ -101,22 +102,6 @@ static unsigned int count_relocs(const Elf64_Rela *rela, unsigned int num)
         return _count_relocs;
 }
 
-void *module_alloc(unsigned long size)
-{
-        if (size == 0)
-                return NULL;
-
-        return vmalloc_exec(size);
-}
-
-/* Free memory returned from module_alloc */
-void module_free(struct module *mod, void *module_region)
-{
-        vfree(module_region);
-        /* FIXME: If module_region == mod->init_region, trim exception
-           table entries. */
-}
-
 static int relacmp(const void *_x, const void *_y)
 {
         const Elf64_Rela *x, *y;
@@ -346,7 +331,7 @@ static unsigned long stub_for_addr(Elf64_Shdr *sechdrs,
    restore r2. */
 static int restore_r2(u32 *instruction, struct module *me)
 {
-        if (*instruction != 0x60000000) {
+        if (*instruction != PPC_NOP_INSTR) {
                 printk("%s: Expect noop after relocate, got %08x\n",
                        me->name, *instruction);
                 return 0;
@@ -466,65 +451,3 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
 
         return 0;
 }
-
-LIST_HEAD(module_bug_list);
-
-static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
-                                    const Elf_Shdr *sechdrs,
-                                    const char *name)
-{
-        char *secstrings;
-        unsigned int i;
-
-        secstrings = (char *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
-        for (i = 1; i < hdr->e_shnum; i++)
-                if (strcmp(secstrings+sechdrs[i].sh_name, name) == 0)
-                        return &sechdrs[i];
-        return NULL;
-}
-
-int module_finalize(const Elf_Ehdr *hdr,
-                const Elf_Shdr *sechdrs, struct module *me)
-{
-        const Elf_Shdr *sect;
-        int err;
-
-        err = module_bug_finalize(hdr, sechdrs, me);
-        if (err)
-                return err;
-
-        /* Apply feature fixups */
-        sect = find_section(hdr, sechdrs, "__ftr_fixup");
-        if (sect != NULL)
-                do_feature_fixups(cur_cpu_spec->cpu_features,
-                                  (void *)sect->sh_addr,
-                                  (void *)sect->sh_addr + sect->sh_size);
-
-        sect = find_section(hdr, sechdrs, "__fw_ftr_fixup");
-        if (sect != NULL)
-                do_feature_fixups(powerpc_firmware_features,
-                                  (void *)sect->sh_addr,
-                                  (void *)sect->sh_addr + sect->sh_size);
-
-        return 0;
-}
-
-void module_arch_cleanup(struct module *mod)
-{
-        module_bug_cleanup(mod);
-}
-
-struct bug_entry *module_find_bug(unsigned long bugaddr)
-{
-        struct mod_arch_specific *mod;
-        unsigned int i;
-        struct bug_entry *bug;
-
-        list_for_each_entry(mod, &module_bug_list, bug_list) {
-                bug = mod->bug_table;
-                for (i = 0; i < mod->num_bugs; ++i, ++bug)
-                        if (bugaddr == bug->bug_addr)
-                                return bug;
-        }
-        return NULL;
-}
diff --git a/arch/powerpc/kernel/msi.c b/arch/powerpc/kernel/msi.c
index c62d1012c013..3bb7d3dd28be 100644
--- a/arch/powerpc/kernel/msi.c
+++ b/arch/powerpc/kernel/msi.c
@@ -34,5 +34,5 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 
 void arch_teardown_msi_irqs(struct pci_dev *dev)
 {
-        return ppc_md.teardown_msi_irqs(dev);
+        ppc_md.teardown_msi_irqs(dev);
 }
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index 5748ddb47d9f..e9be908f199b 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -89,54 +89,6 @@ struct of_device *of_device_alloc(struct device_node *np,
 }
 EXPORT_SYMBOL(of_device_alloc);
 
-ssize_t of_device_get_modalias(struct of_device *ofdev,
-                                char *str, ssize_t len)
-{
-        const char *compat;
-        int cplen, i;
-        ssize_t tsize, csize, repend;
-
-        /* Name & Type */
-        csize = snprintf(str, len, "of:N%sT%s",
-                                ofdev->node->name, ofdev->node->type);
-
-        /* Get compatible property if any */
-        compat = of_get_property(ofdev->node, "compatible", &cplen);
-        if (!compat)
-                return csize;
-
-        /* Find true end (we tolerate multiple \0 at the end */
-        for (i=(cplen-1); i>=0 && !compat[i]; i--)
-                cplen--;
-        if (!cplen)
-                return csize;
-        cplen++;
-
-        /* Check space (need cplen+1 chars including final \0) */
-        tsize = csize + cplen;
-        repend = tsize;
-
-        if (csize>=len)         /* @ the limit, all is already filled */
-                return tsize;
-
-        if (tsize>=len) {               /* limit compat list */
-                cplen = len-csize-1;
-                repend = len;
-        }
-
-        /* Copy and do char replacement */
-        memcpy(&str[csize+1], compat, cplen);
-        for (i=csize; i<repend; i++) {
-                char c = str[i];
-                if (c=='\0')
-                        str[i] = 'C';
-                else if (c==' ')
-                        str[i] = '_';
-        }
-
-        return tsize;
-}
-
 int of_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         struct of_device *ofdev;
diff --git a/arch/powerpc/kernel/ppc32.h b/arch/powerpc/kernel/ppc32.h
index 90e562771791..dc16aefe1dd0 100644
--- a/arch/powerpc/kernel/ppc32.h
+++ b/arch/powerpc/kernel/ppc32.h
@@ -120,6 +120,7 @@ struct mcontext32 {
         elf_fpregset_t          mc_fregs;
         unsigned int            mc_pad[2];
         elf_vrregset_t32        mc_vregs __attribute__((__aligned__(16)));
+        elf_vsrreghalf_t32      mc_vsregs __attribute__((__aligned__(16)));
 };
 
 struct ucontext32 { 
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index a8d02506468a..e1ea4fe5cfbd 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -107,6 +107,9 @@ EXPORT_SYMBOL(giveup_fpu);
 #ifdef CONFIG_ALTIVEC
 EXPORT_SYMBOL(giveup_altivec);
 #endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_VSX
+EXPORT_SYMBOL(giveup_vsx);
+#endif /* CONFIG_VSX */
 #ifdef CONFIG_SPE
 EXPORT_SYMBOL(giveup_spe);
 #endif /* CONFIG_SPE */
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 7de41c3948ec..219f3634115e 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -53,6 +53,7 @@ extern unsigned long _get_SP(void);
 #ifndef CONFIG_SMP
 struct task_struct *last_task_used_math = NULL;
 struct task_struct *last_task_used_altivec = NULL;
+struct task_struct *last_task_used_vsx = NULL;
 struct task_struct *last_task_used_spe = NULL;
 #endif
 
@@ -104,17 +105,6 @@ void enable_kernel_fp(void)
 }
 EXPORT_SYMBOL(enable_kernel_fp);
 
-int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpregs)
-{
-        if (!tsk->thread.regs)
-                return 0;
-        flush_fp_to_thread(current);
-
-        memcpy(fpregs, &tsk->thread.fpr[0], sizeof(*fpregs));
-
-        return 1;
-}
-
 #ifdef CONFIG_ALTIVEC
 void enable_kernel_altivec(void)
 {
@@ -148,36 +138,48 @@ void flush_altivec_to_thread(struct task_struct *tsk)
                 preempt_enable();
         }
 }
+#endif /* CONFIG_ALTIVEC */
 
-int dump_task_altivec(struct task_struct *tsk, elf_vrregset_t *vrregs)
+#ifdef CONFIG_VSX
+#if 0
+/* not currently used, but some crazy RAID module might want to later */
+void enable_kernel_vsx(void)
 {
-        /* ELF_NVRREG includes the VSCR and VRSAVE which we need to save
-         * separately, see below */
-        const int nregs = ELF_NVRREG - 2;
-        elf_vrreg_t *reg;
-        u32 *dest;
-
-        if (tsk == current)
-                flush_altivec_to_thread(tsk);
-
-        reg = (elf_vrreg_t *)vrregs;
-
-        /* copy the 32 vr registers */
-        memcpy(reg, &tsk->thread.vr[0], nregs * sizeof(*reg));
-        reg += nregs;
+        WARN_ON(preemptible());
 
-        /* copy the vscr */
-        memcpy(reg, &tsk->thread.vscr, sizeof(*reg));
-        reg++;
+#ifdef CONFIG_SMP
+        if (current->thread.regs && (current->thread.regs->msr & MSR_VSX))
+                giveup_vsx(current);
+        else
+                giveup_vsx(NULL);       /* just enable vsx for kernel - force */
+#else
+        giveup_vsx(last_task_used_vsx);
+#endif /* CONFIG_SMP */
+}
+EXPORT_SYMBOL(enable_kernel_vsx);
+#endif
 
-        /* vrsave is stored in the high 32bit slot of the final 128bits */
-        memset(reg, 0, sizeof(*reg));
-        dest = (u32 *)reg;
-        *dest = tsk->thread.vrsave;
+void giveup_vsx(struct task_struct *tsk)
+{
+        giveup_fpu(tsk);
+        giveup_altivec(tsk);
+        __giveup_vsx(tsk);
+}
 
-        return 1;
+void flush_vsx_to_thread(struct task_struct *tsk)
+{
+        if (tsk->thread.regs) {
+                preempt_disable();
+                if (tsk->thread.regs->msr & MSR_VSX) {
+#ifdef CONFIG_SMP
+                        BUG_ON(tsk != current);
+#endif
+                        giveup_vsx(tsk);
+                }
+                preempt_enable();
+        }
 }
-#endif /* CONFIG_ALTIVEC */
+#endif /* CONFIG_VSX */
 
 #ifdef CONFIG_SPE
 
@@ -209,14 +211,6 @@ void flush_spe_to_thread(struct task_struct *tsk)
                 preempt_enable();
         }
 }
-
-int dump_spe(struct pt_regs *regs, elf_vrregset_t *evrregs)
-{
-        flush_spe_to_thread(current);
-        /* We copy u32 evr[32] + u64 acc + u32 spefscr -> 35 */
-        memcpy(evrregs, &current->thread.evr[0], sizeof(u32) * 35);
-        return 1;
-}
 #endif /* CONFIG_SPE */
 
 #ifndef CONFIG_SMP
@@ -233,6 +227,10 @@ void discard_lazy_cpu_state(void)
         if (last_task_used_altivec == current)
                 last_task_used_altivec = NULL;
 #endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_VSX
+        if (last_task_used_vsx == current)
+                last_task_used_vsx = NULL;
+#endif /* CONFIG_VSX */
 #ifdef CONFIG_SPE
         if (last_task_used_spe == current)
                 last_task_used_spe = NULL;
@@ -297,6 +295,11 @@ struct task_struct *__switch_to(struct task_struct *prev,
         if (prev->thread.regs && (prev->thread.regs->msr & MSR_VEC))
                 giveup_altivec(prev);
 #endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_VSX
+        if (prev->thread.regs && (prev->thread.regs->msr & MSR_VSX))
+                /* VMX and FPU registers are already save here */
+                __giveup_vsx(prev);
+#endif /* CONFIG_VSX */
 #ifdef CONFIG_SPE
         /*
          * If the previous thread used spe in the last quantum
@@ -317,6 +320,10 @@ struct task_struct *__switch_to(struct task_struct *prev,
         if (new->thread.regs && last_task_used_altivec == new)
                 new->thread.regs->msr |= MSR_VEC;
 #endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_VSX
+        if (new->thread.regs && last_task_used_vsx == new)
+                new->thread.regs->msr |= MSR_VSX;
+#endif /* CONFIG_VSX */
 #ifdef CONFIG_SPE
         /* Avoid the trap.  On smp this this never happens since
          * we don't set last_task_used_spe
@@ -417,6 +424,8 @@ static struct regbit {
         {MSR_EE,        "EE"},
         {MSR_PR,        "PR"},
         {MSR_FP,        "FP"},
+        {MSR_VEC,       "VEC"},
+        {MSR_VSX,       "VSX"},
         {MSR_ME,        "ME"},
         {MSR_IR,        "IR"},
         {MSR_DR,        "DR"},
@@ -484,10 +493,8 @@ void show_regs(struct pt_regs * regs)
          * Lookup NIP late so we have the best change of getting the
          * above info out without failing
          */
-        printk("NIP ["REG"] ", regs->nip);
-        print_symbol("%s\n", regs->nip);
-        printk("LR ["REG"] ", regs->link);
-        print_symbol("%s\n", regs->link);
+        printk("NIP ["REG"] %pS\n", regs->nip, (void *)regs->nip);
+        printk("LR ["REG"] %pS\n", regs->link, (void *)regs->link);
 #endif
         show_stack(current, (unsigned long *) regs->gpr[1]);
         if (!user_mode(regs))
@@ -534,6 +541,7 @@ void prepare_to_copy(struct task_struct *tsk)
 {
         flush_fp_to_thread(current);
         flush_altivec_to_thread(current);
+        flush_vsx_to_thread(current);
         flush_spe_to_thread(current);
 }
 
@@ -689,6 +697,9 @@ void start_thread(struct pt_regs *regs, unsigned long start, unsigned long sp)
 #endif
 
         discard_lazy_cpu_state();
+#ifdef CONFIG_VSX
+        current->thread.used_vsr = 0;
+#endif
         memset(current->thread.fpr, 0, sizeof(current->thread.fpr));
         current->thread.fpscr.val = 0;
 #ifdef CONFIG_ALTIVEC
@@ -971,8 +982,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
                 newsp = stack[0];
                 ip = stack[STACK_FRAME_LR_SAVE];
                 if (!firstframe || ip != lr) {
-                        printk("["REG"] ["REG"] ", sp, ip);
-                        print_symbol("%s", ip);
+                        printk("["REG"] ["REG"] %pS", sp, ip, (void *)ip);
                         if (firstframe)
                                 printk(" (unreliable)");
                         printk("\n");
@@ -987,10 +997,9 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
                     && stack[STACK_FRAME_MARKER] == STACK_FRAME_REGS_MARKER) {
                         struct pt_regs *regs = (struct pt_regs *)
                                 (sp + STACK_FRAME_OVERHEAD);
-                        printk("--- Exception: %lx", regs->trap);
-                        print_symbol(" at %s\n", regs->nip);
                         lr = regs->link;
-                        print_symbol("    LR = %s\n", lr);
+                        printk("--- Exception: %lx at %pS\n    LR = %pS\n",
+                               regs->trap, (void *)regs->nip, (void *)lr);
                         firstframe = 1;
                 }
 
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 2aefe2a4129a..87d83c56b31e 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -609,6 +609,10 @@ static struct feature_property {
         {"altivec", 0, CPU_FTR_ALTIVEC, PPC_FEATURE_HAS_ALTIVEC},
         {"ibm,vmx", 1, CPU_FTR_ALTIVEC, PPC_FEATURE_HAS_ALTIVEC},
 #endif /* CONFIG_ALTIVEC */
+#ifdef CONFIG_VSX
+        /* Yes, this _really_ is ibm,vmx == 2 to enable VSX */
+        {"ibm,vmx", 2, CPU_FTR_VSX, PPC_FEATURE_HAS_VSX},
+#endif /* CONFIG_VSX */
 #ifdef CONFIG_PPC64
         {"ibm,dfp", 1, 0, PPC_FEATURE_HAS_DFP},
         {"ibm,purr", 1, CPU_FTR_PURR, 0},
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 6d6df1e60325..1ea8c8d3ce89 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -620,6 +620,7 @@ static void __init early_cmdline_parse(void)
 #define OV1_PPC_2_03            0x10    /* set if we support PowerPC 2.03 */
 #define OV1_PPC_2_04            0x08    /* set if we support PowerPC 2.04 */
 #define OV1_PPC_2_05            0x04    /* set if we support PowerPC 2.05 */
+#define OV1_PPC_2_06            0x02    /* set if we support PowerPC 2.06 */
 
 /* Option vector 2: Open Firmware options supported */
 #define OV2_REAL_MODE           0x20    /* set if we want OF in real mode */
@@ -650,6 +651,8 @@ static void __init early_cmdline_parse(void)
 static unsigned char ibm_architecture_vec[] = {
         W(0xfffe0000), W(0x003a0000),   /* POWER5/POWER5+ */
         W(0xffff0000), W(0x003e0000),   /* POWER6 */
+        W(0xffff0000), W(0x003f0000),   /* POWER7 */
+        W(0xffffffff), W(0x0f000003),   /* all 2.06-compliant */
         W(0xffffffff), W(0x0f000002),   /* all 2.05-compliant */
         W(0xfffffffe), W(0x0f000001),   /* all 2.04-compliant and earlier */
         5 - 1,                          /* 5 option vectors */
@@ -658,7 +661,7 @@ static unsigned char ibm_architecture_vec[] = {
         3 - 2,                          /* length */
         0,                              /* don't ignore, don't halt */
         OV1_PPC_2_00 | OV1_PPC_2_01 | OV1_PPC_2_02 | OV1_PPC_2_03 |
-        OV1_PPC_2_04 | OV1_PPC_2_05,
+        OV1_PPC_2_04 | OV1_PPC_2_05 | OV1_PPC_2_06,
 
         /* option vector 2: Open Firmware options supported */
         34 - 2,                         /* length */
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 2a9fe97e4521..8feb93e7890c 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -215,29 +215,56 @@ static int fpr_get(struct task_struct *target, const struct user_regset *regset,
                    unsigned int pos, unsigned int count,
                    void *kbuf, void __user *ubuf)
 {
+#ifdef CONFIG_VSX
+        double buf[33];
+        int i;
+#endif
         flush_fp_to_thread(target);
 
+#ifdef CONFIG_VSX
+        /* copy to local buffer then write that out */
+        for (i = 0; i < 32 ; i++)
+                buf[i] = target->thread.TS_FPR(i);
+        memcpy(&buf[32], &target->thread.fpscr, sizeof(double));
+        return user_regset_copyout(&pos, &count, &kbuf, &ubuf, buf, 0, -1);
+
+#else
         BUILD_BUG_ON(offsetof(struct thread_struct, fpscr) !=
-                     offsetof(struct thread_struct, fpr[32]));
+                     offsetof(struct thread_struct, TS_FPR(32)));
 
         return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
                                    &target->thread.fpr, 0, -1);
+#endif
 }
 
 static int fpr_set(struct task_struct *target, const struct user_regset *regset,
                    unsigned int pos, unsigned int count,
                    const void *kbuf, const void __user *ubuf)
 {
+#ifdef CONFIG_VSX
+        double buf[33];
+        int i;
+#endif
         flush_fp_to_thread(target);
 
+#ifdef CONFIG_VSX
+        /* copy to local buffer then write that out */
+        i = user_regset_copyin(&pos, &count, &kbuf, &ubuf, buf, 0, -1);
+        if (i)
+                return i;
+        for (i = 0; i < 32 ; i++)
+                target->thread.TS_FPR(i) = buf[i];
+        memcpy(&target->thread.fpscr, &buf[32], sizeof(double));
+        return 0;
+#else
         BUILD_BUG_ON(offsetof(struct thread_struct, fpscr) !=
-                     offsetof(struct thread_struct, fpr[32]));
+                     offsetof(struct thread_struct, TS_FPR(32)));
 
         return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
                                   &target->thread.fpr, 0, -1);
+#endif
 }
 
-
 #ifdef CONFIG_ALTIVEC
 /*
  * Get/set all the altivec registers vr0..vr31, vscr, vrsave, in one go.
@@ -323,6 +350,56 @@ static int vr_set(struct task_struct *target, const struct user_regset *regset,
 }
 #endif /* CONFIG_ALTIVEC */
 
+#ifdef CONFIG_VSX
+/*
+ * Currently to set and and get all the vsx state, you need to call
+ * the fp and VMX calls aswell.  This only get/sets the lower 32
+ * 128bit VSX registers.
+ */
+
+static int vsr_active(struct task_struct *target,
+                      const struct user_regset *regset)
+{
+        flush_vsx_to_thread(target);
+        return target->thread.used_vsr ? regset->n : 0;
+}
+
+static int vsr_get(struct task_struct *target, const struct user_regset *regset,
+                   unsigned int pos, unsigned int count,
+                   void *kbuf, void __user *ubuf)
+{
+        double buf[32];
+        int ret, i;
+
+        flush_vsx_to_thread(target);
+
+        for (i = 0; i < 32 ; i++)
+                buf[i] = current->thread.fpr[i][TS_VSRLOWOFFSET];
+        ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
+                                  buf, 0, 32 * sizeof(double));
+
+        return ret;
+}
+
+static int vsr_set(struct task_struct *target, const struct user_regset *regset,
+                   unsigned int pos, unsigned int count,
+                   const void *kbuf, const void __user *ubuf)
+{
+        double buf[32];
+        int ret,i;
+
+        flush_vsx_to_thread(target);
+
+        ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
+                                 buf, 0, 32 * sizeof(double));
+        for (i = 0; i < 32 ; i++)
+                current->thread.fpr[i][TS_VSRLOWOFFSET] = buf[i];
+
+
+        return ret;
+}
+#endif /* CONFIG_VSX */
+
 #ifdef CONFIG_SPE
 
 /*
@@ -399,6 +476,9 @@ enum powerpc_regset {
 #ifdef CONFIG_ALTIVEC
         REGSET_VMX,
 #endif
+#ifdef CONFIG_VSX
+        REGSET_VSX,
+#endif
 #ifdef CONFIG_SPE
         REGSET_SPE,
 #endif
@@ -422,6 +502,13 @@ static const struct user_regset native_regsets[] = {
                 .active = vr_active, .get = vr_get, .set = vr_set
         },
 #endif
+#ifdef CONFIG_VSX
+        [REGSET_VSX] = {
+                .core_note_type = NT_PPC_VSX, .n = 32,
+                .size = sizeof(double), .align = sizeof(double),
+                .active = vsr_active, .get = vsr_get, .set = vsr_set
+        },
+#endif
 #ifdef CONFIG_SPE
         [REGSET_SPE] = {
                 .n = 35,
@@ -728,7 +815,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         tmp = ptrace_get_reg(child, (int) index);
                 } else {
                         flush_fp_to_thread(child);
-                        tmp = ((unsigned long *)child->thread.fpr)[index - PT_FPR0];
+                        tmp = ((unsigned long *)child->thread.fpr)
+                                [TS_FPRWIDTH * (index - PT_FPR0)];
                 }
                 ret = put_user(tmp,(unsigned long __user *) data);
                 break;
@@ -755,7 +843,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                         ret = ptrace_put_reg(child, index, data);
                 } else {
                         flush_fp_to_thread(child);
-                        ((unsigned long *)child->thread.fpr)[index - PT_FPR0] = data;
+                        ((unsigned long *)child->thread.fpr)
+                                [TS_FPRWIDTH * (index - PT_FPR0)] = data;
                         ret = 0;
                 }
                 break;
@@ -820,6 +909,21 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                                                  sizeof(u32)),
                                              (const void __user *) data);
 #endif
+#ifdef CONFIG_VSX
+        case PTRACE_GETVSRREGS:
+                return copy_regset_to_user(child, &user_ppc_native_view,
+                                           REGSET_VSX,
+                                           0, (32 * sizeof(vector128) +
+                                               sizeof(u32)),
+                                           (void __user *) data);
+
+        case PTRACE_SETVSRREGS:
+                return copy_regset_from_user(child, &user_ppc_native_view,
+                                             REGSET_VSX,
+                                             0, (32 * sizeof(vector128) +
+                                                 sizeof(u32)),
+                                             (const void __user *) data);
+#endif
 #ifdef CONFIG_SPE
         case PTRACE_GETEVRREGS:
                 /* Get the child spe register state. */
diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c
index 4c1de6af4c09..67bf1a1e7e14 100644
--- a/arch/powerpc/kernel/ptrace32.c
+++ b/arch/powerpc/kernel/ptrace32.c
@@ -64,6 +64,11 @@ static long compat_ptrace_old(struct task_struct *child, long request,
         return -EPERM;
 }
 
+/* Macros to workout the correct index for the FPR in the thread struct */
+#define FPRNUMBER(i) (((i) - PT_FPR0) >> 1)
+#define FPRHALF(i) (((i) - PT_FPR0) & 1)
+#define FPRINDEX(i) TS_FPRWIDTH * FPRNUMBER(i) + FPRHALF(i)
+
 long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
                         compat_ulong_t caddr, compat_ulong_t cdata)
 {
@@ -122,7 +127,8 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
                          * to be an array of unsigned int (32 bits) - the
                          * index passed in is based on this assumption.
                          */
-                        tmp = ((unsigned int *)child->thread.fpr)[index - PT_FPR0];
+                        tmp = ((unsigned int *)child->thread.fpr)
+                                [FPRINDEX(index)];
                 }
                 ret = put_user((unsigned int)tmp, (u32 __user *)data);
                 break;
@@ -162,7 +168,8 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
                 CHECK_FULL_REGS(child->thread.regs);
                 if (numReg >= PT_FPR0) {
                         flush_fp_to_thread(child);
-                        tmp = ((unsigned long int *)child->thread.fpr)[numReg - PT_FPR0];
+                        tmp = ((unsigned long int *)child->thread.fpr)
+                                [FPRINDEX(numReg)];
                 } else { /* register within PT_REGS struct */
                         tmp = ptrace_get_reg(child, numReg);
                 } 
@@ -217,7 +224,8 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
                          * to be an array of unsigned int (32 bits) - the
                          * index passed in is based on this assumption.
                          */
-                        ((unsigned int *)child->thread.fpr)[index - PT_FPR0] = data;
+                        ((unsigned int *)child->thread.fpr)
+                                [FPRINDEX(index)] = data;
                         ret = 0;
                 }
                 break;
diff --git a/arch/powerpc/kernel/rtas-proc.c b/arch/powerpc/kernel/rtas-proc.c
index f9c6abc84a94..1be9fe38bcb5 100644
--- a/arch/powerpc/kernel/rtas-proc.c
+++ b/arch/powerpc/kernel/rtas-proc.c
@@ -160,7 +160,7 @@ static int sensors_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_sensors_show, NULL);
 }
 
-const struct file_operations ppc_rtas_sensors_operations = {
+static const struct file_operations ppc_rtas_sensors_operations = {
         .open           = sensors_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -172,7 +172,7 @@ static int poweron_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_poweron_show, NULL);
 }
 
-const struct file_operations ppc_rtas_poweron_operations = {
+static const struct file_operations ppc_rtas_poweron_operations = {
         .open           = poweron_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -185,7 +185,7 @@ static int progress_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_progress_show, NULL);
 }
 
-const struct file_operations ppc_rtas_progress_operations = {
+static const struct file_operations ppc_rtas_progress_operations = {
         .open           = progress_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -198,7 +198,7 @@ static int clock_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_clock_show, NULL);
 }
 
-const struct file_operations ppc_rtas_clock_operations = {
+static const struct file_operations ppc_rtas_clock_operations = {
         .open           = clock_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -211,7 +211,7 @@ static int tone_freq_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_tone_freq_show, NULL);
 }
 
-const struct file_operations ppc_rtas_tone_freq_operations = {
+static const struct file_operations ppc_rtas_tone_freq_operations = {
         .open           = tone_freq_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -224,7 +224,7 @@ static int tone_volume_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_tone_volume_show, NULL);
 }
 
-const struct file_operations ppc_rtas_tone_volume_operations = {
+static const struct file_operations ppc_rtas_tone_volume_operations = {
         .open           = tone_volume_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
@@ -237,7 +237,7 @@ static int rmo_buf_open(struct inode *inode, struct file *file)
         return single_open(file, ppc_rtas_rmo_buf_show, NULL);
 }
 
-const struct file_operations ppc_rtas_rmo_buf_ops = {
+static const struct file_operations ppc_rtas_rmo_buf_ops = {
         .open           = rmo_buf_open,
         .read           = seq_read,
         .llseek         = seq_lseek,
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 647f3e8677dc..c680f1bbd387 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -340,8 +340,8 @@ int rtas_get_error_log_max(void)
 EXPORT_SYMBOL(rtas_get_error_log_max);
 
 
-char rtas_err_buf[RTAS_ERROR_LOG_MAX];
-int rtas_last_error_token;
+static char rtas_err_buf[RTAS_ERROR_LOG_MAX];
+static int rtas_last_error_token;
 
 /** Return a copy of the detailed error text associated with the
  *  most recent failed call to rtas.  Because the error text
@@ -484,7 +484,7 @@ unsigned int rtas_busy_delay(int status)
 }
 EXPORT_SYMBOL(rtas_busy_delay);
 
-int rtas_error_rc(int rtas_rc)
+static int rtas_error_rc(int rtas_rc)
 {
         int rc;
 
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
index 0a5e22b22729..09ded5c424a9 100644
--- a/arch/powerpc/kernel/rtas_flash.c
+++ b/arch/powerpc/kernel/rtas_flash.c
@@ -731,7 +731,7 @@ static const struct file_operations validate_flash_operations = {
         .release        = validate_flash_release,
 };
 
-int __init rtas_flash_init(void)
+static int __init rtas_flash_init(void)
 {
         int rc;
 
@@ -817,7 +817,7 @@ cleanup:
         return rc;
 }
 
-void __exit rtas_flash_cleanup(void)
+static void __exit rtas_flash_cleanup(void)
 {
         rtas_flash_term_hook = NULL;
 
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index 3ab88a9dc70d..589a2797eac2 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -155,12 +155,12 @@ static int rtas_pci_write_config(struct pci_bus *bus,
         return PCIBIOS_DEVICE_NOT_FOUND;
 }
 
-struct pci_ops rtas_pci_ops = {
+static struct pci_ops rtas_pci_ops = {
         .read = rtas_pci_read_config,
         .write = rtas_pci_write_config,
 };
 
-int is_python(struct device_node *dev)
+static int is_python(struct device_node *dev)
 {
         const char *model = of_get_property(dev, "model", NULL);
 
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index db540eab09f4..61a3f4132087 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -500,6 +500,7 @@ void __init smp_setup_cpu_sibling_map(void)
 }
 #endif /* CONFIG_SMP */
 
+#ifdef CONFIG_PCSPKR_PLATFORM
 static __init int add_pcspkr(void)
 {
         struct device_node *np;
@@ -522,6 +523,7 @@ static __init int add_pcspkr(void)
         return ret;
 }
 device_initcall(add_pcspkr);
+#endif  /* CONFIG_PCSPKR_PLATFORM */
 
 void probe_machine(void)
 {
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 19e8fcb9cea8..4efebe88e64a 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -101,6 +101,10 @@ notrace unsigned long __init early_init(unsigned long dt_ptr)
                           PTRRELOC(&__start___ftr_fixup),
                           PTRRELOC(&__stop___ftr_fixup));
 
+        do_lwsync_fixups(spec->cpu_features,
+                         PTRRELOC(&__start___lwsync_fixup),
+                         PTRRELOC(&__stop___lwsync_fixup));
+
         return KERNELBASE + offset;
 }
 
@@ -127,6 +131,11 @@ notrace void __init machine_init(unsigned long dt_ptr, unsigned long phys)
                 ppc_md.power_save = ppc6xx_idle;
 #endif
 
+#ifdef CONFIG_E500
+        if (cpu_has_feature(CPU_FTR_CAN_DOZE) ||
+            cpu_has_feature(CPU_FTR_CAN_NAP))
+                ppc_md.power_save = e500_idle;
+#endif
         if (ppc_md.progress)
                 ppc_md.progress("id mach(): done", 0x200);
 }
@@ -248,6 +257,28 @@ static void __init irqstack_early_init(void)
 #define irqstack_early_init()
 #endif
 
+#if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
+static void __init exc_lvl_early_init(void)
+{
+        unsigned int i;
+
+        /* interrupt stacks must be in lowmem, we get that for free on ppc32
+         * as the lmb is limited to lowmem by LMB_REAL_LIMIT */
+        for_each_possible_cpu(i) {
+                critirq_ctx[i] = (struct thread_info *)
+                        __va(lmb_alloc(THREAD_SIZE, THREAD_SIZE));
+#ifdef CONFIG_BOOKE
+                dbgirq_ctx[i] = (struct thread_info *)
+                        __va(lmb_alloc(THREAD_SIZE, THREAD_SIZE));
+                mcheckirq_ctx[i] = (struct thread_info *)
+                        __va(lmb_alloc(THREAD_SIZE, THREAD_SIZE));
+#endif
+        }
+}
+#else
+#define exc_lvl_early_init()
+#endif
+
 /* Warning, IO base is not yet inited */
 void __init setup_arch(char **cmdline_p)
 {
@@ -305,6 +336,8 @@ void __init setup_arch(char **cmdline_p)
         init_mm.end_data = (unsigned long) _edata;
         init_mm.brk = klimit;
 
+        exc_lvl_early_init();
+
         irqstack_early_init();
 
         /* set up the bootmem stuff with available memory */
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 098fd96a394a..04d8de9f0fc6 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -363,6 +363,8 @@ void __init setup_system(void)
                           &__start___ftr_fixup, &__stop___ftr_fixup);
         do_feature_fixups(powerpc_firmware_features,
                           &__start___fw_ftr_fixup, &__stop___fw_ftr_fixup);
+        do_lwsync_fixups(cur_cpu_spec->cpu_features,
+                         &__start___lwsync_fixup, &__stop___lwsync_fixup);
 
         /*
          * Unflatten the device-tree passed by prom_init or kexec
diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index a65a44fbe523..ad55488939c3 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -120,7 +120,7 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
         int ret;
         int is32 = is_32bit_task();
 
-        if (test_thread_flag(TIF_RESTORE_SIGMASK))
+        if (current_thread_info()->local_flags & _TLF_RESTORE_SIGMASK)
                 oldset = &current->saved_sigmask;
         else if (!oldset)
                 oldset = &current->blocked;
@@ -131,9 +131,10 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
         check_syscall_restart(regs, &ka, signr > 0);
 
         if (signr <= 0) {
+                struct thread_info *ti = current_thread_info();
                 /* No signal to deliver -- put the saved sigmask back */
-                if (test_thread_flag(TIF_RESTORE_SIGMASK)) {
-                        clear_thread_flag(TIF_RESTORE_SIGMASK);
+                if (ti->local_flags & _TLF_RESTORE_SIGMASK) {
+                        ti->local_flags &= ~_TLF_RESTORE_SIGMASK;
                         sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
                 }
                 return 0;               /* no signals delivered */
@@ -169,10 +170,9 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
 
                 /*
                  * A signal was successfully delivered; the saved sigmask is in
-                 * its frame, and we can clear the TIF_RESTORE_SIGMASK flag.
+                 * its frame, and we can clear the TLF_RESTORE_SIGMASK flag.
                  */
-                if (test_thread_flag(TIF_RESTORE_SIGMASK))
-                        clear_thread_flag(TIF_RESTORE_SIGMASK);
+                current_thread_info()->local_flags &= ~_TLF_RESTORE_SIGMASK;
         }
 
         return ret;
diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h
index 77efb3d5465a..28f4b9f5fe5e 100644
--- a/arch/powerpc/kernel/signal.h
+++ b/arch/powerpc/kernel/signal.h
@@ -24,6 +24,16 @@ extern int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
                               siginfo_t *info, sigset_t *oldset,
                               struct pt_regs *regs);
 
+extern unsigned long copy_fpr_to_user(void __user *to,
+                                      struct task_struct *task);
+extern unsigned long copy_fpr_from_user(struct task_struct *task,
+                                        void __user *from);
+#ifdef CONFIG_VSX
+extern unsigned long copy_vsx_to_user(void __user *to,
+                                      struct task_struct *task);
+extern unsigned long copy_vsx_from_user(struct task_struct *task,
+                                        void __user *from);
+#endif
 
 #ifdef CONFIG_PPC64
 
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index ad6943468ee9..3e80aa32b8b0 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -68,6 +68,13 @@
 #define ucontext        ucontext32
 
 /*
+ * Userspace code may pass a ucontext which doesn't include VSX added
+ * at the end.  We need to check for this case.
+ */
+#define UCONTEXTSIZEWITHOUTVSX \
+                (sizeof(struct ucontext) - sizeof(elf_vsrreghalf_t32))
+
+/*
  * Returning 0 means we return to userspace via
  * ret_from_except and thus restore all user
  * registers from *regs.  This is what we need
@@ -243,7 +250,7 @@ long sys_sigsuspend(old_sigset_t mask)
 
         current->state = TASK_INTERRUPTIBLE;
         schedule();
-        set_thread_flag(TIF_RESTORE_SIGMASK);
+        set_restore_sigmask();
         return -ERESTARTNOHAND;
 }
 
@@ -328,6 +335,75 @@ struct rt_sigframe {
         int                     abigap[56];
 };
 
+#ifdef CONFIG_VSX
+unsigned long copy_fpr_to_user(void __user *to,
+                               struct task_struct *task)
+{
+        double buf[ELF_NFPREG];
+        int i;
+
+        /* save FPR copy to local buffer then write to the thread_struct */
+        for (i = 0; i < (ELF_NFPREG - 1) ; i++)
+                buf[i] = task->thread.TS_FPR(i);
+        memcpy(&buf[i], &task->thread.fpscr, sizeof(double));
+        return __copy_to_user(to, buf, ELF_NFPREG * sizeof(double));
+}
+
+unsigned long copy_fpr_from_user(struct task_struct *task,
+                                 void __user *from)
+{
+        double buf[ELF_NFPREG];
+        int i;
+
+        if (__copy_from_user(buf, from, ELF_NFPREG * sizeof(double)))
+                return 1;
+        for (i = 0; i < (ELF_NFPREG - 1) ; i++)
+                task->thread.TS_FPR(i) = buf[i];
+        memcpy(&task->thread.fpscr, &buf[i], sizeof(double));
+
+        return 0;
+}
+
+unsigned long copy_vsx_to_user(void __user *to,
+                               struct task_struct *task)
+{
+        double buf[ELF_NVSRHALFREG];
+        int i;
+
+        /* save FPR copy to local buffer then write to the thread_struct */
+        for (i = 0; i < ELF_NVSRHALFREG; i++)
+                buf[i] = task->thread.fpr[i][TS_VSRLOWOFFSET];
+        return __copy_to_user(to, buf, ELF_NVSRHALFREG * sizeof(double));
+}
+
+unsigned long copy_vsx_from_user(struct task_struct *task,
+                                 void __user *from)
+{
+        double buf[ELF_NVSRHALFREG];
+        int i;
+
+        if (__copy_from_user(buf, from, ELF_NVSRHALFREG * sizeof(double)))
+                return 1;
+        for (i = 0; i < ELF_NVSRHALFREG ; i++)
+                task->thread.fpr[i][TS_VSRLOWOFFSET] = buf[i];
+        return 0;
+}
+#else
+inline unsigned long copy_fpr_to_user(void __user *to,
+                                      struct task_struct *task)
+{
+        return __copy_to_user(to, task->thread.fpr,
+                              ELF_NFPREG * sizeof(double));
+}
+
+inline unsigned long copy_fpr_from_user(struct task_struct *task,
+                                        void __user *from)
+{
+        return __copy_from_user(task->thread.fpr, from,
+                              ELF_NFPREG * sizeof(double));
+}
+#endif
+
 /*
  * Save the current user registers on the user stack.
  * We only save the altivec/spe registers if the process has used
@@ -336,13 +412,13 @@ struct rt_sigframe {
 static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,
                 int sigret)
 {
+        unsigned long msr = regs->msr;
+
         /* Make sure floating point registers are stored in regs */
         flush_fp_to_thread(current);
 
-        /* save general and floating-point registers */
-        if (save_general_regs(regs, frame) ||
-            __copy_to_user(&frame->mc_fregs, current->thread.fpr,
-                    ELF_NFPREG * sizeof(double)))
+        /* save general registers */
+        if (save_general_regs(regs, frame))
                 return 1;
 
 #ifdef CONFIG_ALTIVEC
@@ -354,8 +430,7 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,
                         return 1;
                 /* set MSR_VEC in the saved MSR value to indicate that
                    frame->mc_vregs contains valid data */
-                if (__put_user(regs->msr | MSR_VEC, &frame->mc_gregs[PT_MSR]))
-                        return 1;
+                msr |= MSR_VEC;
         }
         /* else assert((regs->msr & MSR_VEC) == 0) */
 
@@ -367,7 +442,22 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,
         if (__put_user(current->thread.vrsave, (u32 __user *)&frame->mc_vregs[32]))
                 return 1;
 #endif /* CONFIG_ALTIVEC */
-
+        if (copy_fpr_to_user(&frame->mc_fregs, current))
+                return 1;
+#ifdef CONFIG_VSX
+        /*
+         * Copy VSR 0-31 upper half from thread_struct to local
+         * buffer, then write that to userspace.  Also set MSR_VSX in
+         * the saved MSR value to indicate that frame->mc_vregs
+         * contains valid data
+         */
+        if (current->thread.used_vsr) {
+                __giveup_vsx(current);
+                if (copy_vsx_to_user(&frame->mc_vsregs, current))
+                        return 1;
+                msr |= MSR_VSX;
+        }
+#endif /* CONFIG_VSX */
 #ifdef CONFIG_SPE
         /* save spe registers */
         if (current->thread.used_spe) {
@@ -377,8 +467,7 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,
                         return 1;
                 /* set MSR_SPE in the saved MSR value to indicate that
                    frame->mc_vregs contains valid data */
-                if (__put_user(regs->msr | MSR_SPE, &frame->mc_gregs[PT_MSR]))
-                        return 1;
+                msr |= MSR_SPE;
         }
         /* else assert((regs->msr & MSR_SPE) == 0) */
 
@@ -387,6 +476,8 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,
                 return 1;
 #endif /* CONFIG_SPE */
 
+        if (__put_user(msr, &frame->mc_gregs[PT_MSR]))
+                return 1;
         if (sigret) {
                 /* Set up the sigreturn trampoline: li r0,sigret; sc */
                 if (__put_user(0x38000000UL + sigret, &frame->tramp[0])
@@ -409,6 +500,9 @@ static long restore_user_regs(struct pt_regs *regs,
         long err;
         unsigned int save_r2 = 0;
         unsigned long msr;
+#ifdef CONFIG_VSX
+        int i;
+#endif
 
         /*
          * restore general registers but not including MSR or SOFTE. Also
@@ -436,16 +530,11 @@ static long restore_user_regs(struct pt_regs *regs,
          */
         discard_lazy_cpu_state();
 
-        /* force the process to reload the FP registers from
-           current->thread when it next does FP instructions */
-        regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1);
-        if (__copy_from_user(current->thread.fpr, &sr->mc_fregs,
-                             sizeof(sr->mc_fregs)))
-                return 1;
-
 #ifdef CONFIG_ALTIVEC
-        /* force the process to reload the altivec registers from
-           current->thread when it next does altivec instructions */
+        /*
+         * Force the process to reload the altivec registers from
+         * current->thread when it next does altivec instructions
+         */
         regs->msr &= ~MSR_VEC;
         if (msr & MSR_VEC) {
                 /* restore altivec registers from the stack */
@@ -459,6 +548,31 @@ static long restore_user_regs(struct pt_regs *regs,
         if (__get_user(current->thread.vrsave, (u32 __user *)&sr->mc_vregs[32]))
                 return 1;
 #endif /* CONFIG_ALTIVEC */
+        if (copy_fpr_from_user(current, &sr->mc_fregs))
+                return 1;
+
+#ifdef CONFIG_VSX
+        /*
+         * Force the process to reload the VSX registers from
+         * current->thread when it next does VSX instruction.
+         */
+        regs->msr &= ~MSR_VSX;
+        if (msr & MSR_VSX) {
+                /*
+                 * Restore altivec registers from the stack to a local
+                 * buffer, then write this out to the thread_struct
+                 */
+                if (copy_vsx_from_user(current, &sr->mc_vsregs))
+                        return 1;
+        } else if (current->thread.used_vsr)
+                for (i = 0; i < 32 ; i++)
+                        current->thread.fpr[i][TS_VSRLOWOFFSET] = 0;
+#endif /* CONFIG_VSX */
+        /*
+         * force the process to reload the FP registers from
+         * current->thread when it next does FP instructions
+         */
+        regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1);
 
 #ifdef CONFIG_SPE
         /* force the process to reload the spe registers from
@@ -823,12 +937,42 @@ long sys_swapcontext(struct ucontext __user *old_ctx,
 {
         unsigned char tmp;
 
+#ifdef CONFIG_PPC64
+        unsigned long new_msr = 0;
+
+        if (new_ctx &&
+            __get_user(new_msr, &new_ctx->uc_mcontext.mc_gregs[PT_MSR]))
+                return -EFAULT;
+        /*
+         * Check that the context is not smaller than the original
+         * size (with VMX but without VSX)
+         */
+        if (ctx_size < UCONTEXTSIZEWITHOUTVSX)
+                return -EINVAL;
+        /*
+         * If the new context state sets the MSR VSX bits but
+         * it doesn't provide VSX state.
+         */
+        if ((ctx_size < sizeof(struct ucontext)) &&
+            (new_msr & MSR_VSX))
+                return -EINVAL;
+#ifdef CONFIG_VSX
+        /*
+         * If userspace doesn't provide enough room for VSX data,
+         * but current thread has used VSX, we don't have anywhere
+         * to store the full context back into.
+         */
+        if ((ctx_size < sizeof(struct ucontext)) &&
+            (current->thread.used_vsr && old_ctx))
+                return -EINVAL;
+#endif
+#else
         /* Context size is for future use. Right now, we only make sure
          * we are passed something we understand
          */
         if (ctx_size < sizeof(struct ucontext))
                 return -EINVAL;
-
+#endif
         if (old_ctx != NULL) {
                 struct mcontext __user *mctx;
 
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index da7c058e3731..65ad925c3a8f 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -112,11 +112,29 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
 #else /* CONFIG_ALTIVEC */
         err |= __put_user(0, &sc->v_regs);
 #endif /* CONFIG_ALTIVEC */
+        flush_fp_to_thread(current);
+        /* copy fpr regs and fpscr */
+        err |= copy_fpr_to_user(&sc->fp_regs, current);
+#ifdef CONFIG_VSX
+        /*
+         * Copy VSX low doubleword to local buffer for formatting,
+         * then out to userspace.  Update v_regs to point after the
+         * VMX data.
+         */
+        if (current->thread.used_vsr) {
+                __giveup_vsx(current);
+                v_regs += ELF_NVRREG;
+                err |= copy_vsx_to_user(v_regs, current);
+                /* set MSR_VSX in the MSR value in the frame to
+                 * indicate that sc->vs_reg) contains valid data.
+                 */
+                msr |= MSR_VSX;
+        }
+#endif /* CONFIG_VSX */
         err |= __put_user(&sc->gp_regs, &sc->regs);
         WARN_ON(!FULL_REGS(regs));
         err |= __copy_to_user(&sc->gp_regs, regs, GP_REGS_SIZE);
         err |= __put_user(msr, &sc->gp_regs[PT_MSR]);
-        err |= __copy_to_user(&sc->fp_regs, &current->thread.fpr, FP_REGS_SIZE);
         err |= __put_user(signr, &sc->signal);
         err |= __put_user(handler, &sc->handler);
         if (set != NULL)
@@ -137,29 +155,32 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
 #endif
         unsigned long err = 0;
         unsigned long save_r13 = 0;
-        elf_greg_t *gregs = (elf_greg_t *)regs;
         unsigned long msr;
+#ifdef CONFIG_VSX
         int i;
+#endif
 
         /* If this is not a signal return, we preserve the TLS in r13 */
         if (!sig)
                 save_r13 = regs->gpr[13];
 
-        /* copy everything before MSR */
-        err |= __copy_from_user(regs, &sc->gp_regs,
-                                PT_MSR*sizeof(unsigned long));
-
+        /* copy the GPRs */
+        err |= __copy_from_user(regs->gpr, sc->gp_regs, sizeof(regs->gpr));
+        err |= __get_user(regs->nip, &sc->gp_regs[PT_NIP]);
         /* get MSR separately, transfer the LE bit if doing signal return */
         err |= __get_user(msr, &sc->gp_regs[PT_MSR]);
         if (sig)
                 regs->msr = (regs->msr & ~MSR_LE) | (msr & MSR_LE);
-
+        err |= __get_user(regs->orig_gpr3, &sc->gp_regs[PT_ORIG_R3]);
+        err |= __get_user(regs->ctr, &sc->gp_regs[PT_CTR]);
+        err |= __get_user(regs->link, &sc->gp_regs[PT_LNK]);
+        err |= __get_user(regs->xer, &sc->gp_regs[PT_XER]);
+        err |= __get_user(regs->ccr, &sc->gp_regs[PT_CCR]);
         /* skip SOFTE */
-        for (i = PT_MSR+1; i <= PT_RESULT; i++) {
-                if (i == PT_SOFTE)
-                        continue;
-                err |= __get_user(gregs[i], &sc->gp_regs[i]);
-        }
+        err |= __get_user(regs->trap, &sc->gp_regs[PT_TRAP]);
+        err |= __get_user(regs->dar, &sc->gp_regs[PT_DAR]);
+        err |= __get_user(regs->dsisr, &sc->gp_regs[PT_DSISR]);
+        err |= __get_user(regs->result, &sc->gp_regs[PT_RESULT]);
 
         if (!sig)
                 regs->gpr[13] = save_r13;
@@ -180,9 +201,7 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
          * This has to be done before copying stuff into current->thread.fpr/vr
          * for the reasons explained in the previous comment.
          */
-        regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC);
-
-        err |= __copy_from_user(&current->thread.fpr, &sc->fp_regs, FP_REGS_SIZE);
+        regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC | MSR_VSX);
 
 #ifdef CONFIG_ALTIVEC
         err |= __get_user(v_regs, &sc->v_regs);
@@ -202,7 +221,23 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
         else
                 current->thread.vrsave = 0;
 #endif /* CONFIG_ALTIVEC */
+        /* restore floating point */
+        err |= copy_fpr_from_user(current, &sc->fp_regs);
+#ifdef CONFIG_VSX
+        /*
+         * Get additional VSX data. Update v_regs to point after the
+         * VMX data.  Copy VSX low doubleword from userspace to local
+         * buffer for formatting, then into the taskstruct.
+         */
+        v_regs += ELF_NVRREG;
+        if ((msr & MSR_VSX) != 0)
+                err |= copy_vsx_from_user(current, v_regs);
+        else
+                for (i = 0; i < 32 ; i++)
+                        current->thread.fpr[i][TS_VSRLOWOFFSET] = 0;
 
+#else
+#endif
         return err;
 }
 
@@ -233,6 +268,13 @@ static long setup_trampoline(unsigned int syscall, unsigned int __user *tramp)
 }
 
 /*
+ * Userspace code may pass a ucontext which doesn't include VSX added
+ * at the end.  We need to check for this case.
+ */
+#define UCONTEXTSIZEWITHOUTVSX \
+                (sizeof(struct ucontext) - 32*sizeof(long))
+
+/*
  * Handle {get,set,swap}_context operations
  */
 int sys_swapcontext(struct ucontext __user *old_ctx,
@@ -241,13 +283,34 @@ int sys_swapcontext(struct ucontext __user *old_ctx,
 {
         unsigned char tmp;
         sigset_t set;
+        unsigned long new_msr = 0;
 
-        /* Context size is for future use. Right now, we only make sure
-         * we are passed something we understand
+        if (new_ctx &&
+            __get_user(new_msr, &new_ctx->uc_mcontext.gp_regs[PT_MSR]))
+                return -EFAULT;
+        /*
+         * Check that the context is not smaller than the original
+         * size (with VMX but without VSX)
          */
-        if (ctx_size < sizeof(struct ucontext))
+        if (ctx_size < UCONTEXTSIZEWITHOUTVSX)
                 return -EINVAL;
-
+        /*
+         * If the new context state sets the MSR VSX bits but
+         * it doesn't provide VSX state.
+         */
+        if ((ctx_size < sizeof(struct ucontext)) &&
+            (new_msr & MSR_VSX))
+                return -EINVAL;
+#ifdef CONFIG_VSX
+        /*
+         * If userspace doesn't provide enough room for VSX data,
+         * but current thread has used VSX, we don't have anywhere
+         * to store the full context back into.
+         */
+        if ((ctx_size < sizeof(struct ucontext)) &&
+            (current->thread.used_vsr && old_ctx))
+                return -EINVAL;
+#endif
         if (old_ctx != NULL) {
                 if (!access_ok(VERIFY_WRITE, old_ctx, sizeof(*old_ctx))
                     || setup_sigcontext(&old_ctx->uc_mcontext, regs, 0, NULL, 0)
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 5191b46a611e..f5ae9fa222ea 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -171,12 +171,8 @@ void smp_send_stop(void)
         smp_call_function(stop_this_cpu, NULL, 0);
 }
 
-extern struct gettimeofday_struct do_gtod;
-
 struct thread_info *current_set[NR_CPUS];
 
-DECLARE_PER_CPU(unsigned int, pvr);
-
 static void __devinit smp_store_cpu_info(int id)
 {
         per_cpu(pvr, id) = mfspr(SPRN_PVR);
diff --git a/arch/powerpc/kernel/softemu8xx.c b/arch/powerpc/kernel/softemu8xx.c
index 67d6f6890edc..c906c4bf6835 100644
--- a/arch/powerpc/kernel/softemu8xx.c
+++ b/arch/powerpc/kernel/softemu8xx.c
@@ -124,7 +124,7 @@ int Soft_emulate_8xx(struct pt_regs *regs)
         disp = instword & 0xffff;
 
         ea = (u32 *)(regs->gpr[idxreg] + disp);
-        ip = (u32 *)&current->thread.fpr[flreg];
+        ip = (u32 *)&current->thread.TS_FPR(flreg);
 
         switch ( inst )
         {
@@ -168,7 +168,7 @@ int Soft_emulate_8xx(struct pt_regs *regs)
                 break;
         case FMR:
                 /* assume this is a fp move -- Cort */
-                memcpy(ip, &current->thread.fpr[(instword>>11)&0x1f],
+                memcpy(ip, &current->thread.TS_FPR((instword>>11)&0x1f),
                        sizeof(double));
                 break;
         default:
diff --git a/arch/powerpc/kernel/stacktrace.c b/arch/powerpc/kernel/stacktrace.c
index 3cf0d94ba340..071bee3ec749 100644
--- a/arch/powerpc/kernel/stacktrace.c
+++ b/arch/powerpc/kernel/stacktrace.c
@@ -10,34 +10,35 @@
  *      2 of the License, or (at your option) any later version.
  */
 
+#include <linux/module.h>
 #include <linux/sched.h>
 #include <linux/stacktrace.h>
 #include <linux/module.h>
 #include <asm/ptrace.h>
+#include <asm/processor.h>
 
 /*
  * Save stack-backtrace addresses into a stack_trace buffer.
  */
-void save_stack_trace(struct stack_trace *trace)
+static void save_context_stack(struct stack_trace *trace, unsigned long sp,
+                        struct task_struct *tsk, int savesched)
 {
-        unsigned long sp;
-
-        asm("mr %0,1" : "=r" (sp));
-
         for (;;) {
                 unsigned long *stack = (unsigned long *) sp;
                 unsigned long newsp, ip;
 
-                if (!validate_sp(sp, current, STACK_FRAME_OVERHEAD))
+                if (!validate_sp(sp, tsk, STACK_FRAME_OVERHEAD))
                         return;
 
                 newsp = stack[0];
                 ip = stack[STACK_FRAME_LR_SAVE];
 
-                if (!trace->skip)
-                        trace->entries[trace->nr_entries++] = ip;
-                else
-                        trace->skip--;
+                if (savesched || !in_sched_functions(ip)) {
+                        if (!trace->skip)
+                                trace->entries[trace->nr_entries++] = ip;
+                        else
+                                trace->skip--;
+                }
 
                 if (trace->nr_entries >= trace->max_entries)
                         return;
@@ -45,4 +46,19 @@ void save_stack_trace(struct stack_trace *trace)
                 sp = newsp;
         }
 }
+
+void save_stack_trace(struct stack_trace *trace)
+{
+        unsigned long sp;
+
+        asm("mr %0,1" : "=r" (sp));
+
+        save_context_stack(trace, sp, current, 1);
+}
 EXPORT_SYMBOL_GPL(save_stack_trace);
+
+void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
+{
+        save_context_stack(trace, tsk->thread.regs->gpr[1], tsk, 0);
+}
+EXPORT_SYMBOL_GPL(save_stack_trace_tsk);
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c
index 4fe69ca24481..c04832c4a02e 100644
--- a/arch/powerpc/kernel/syscalls.c
+++ b/arch/powerpc/kernel/syscalls.c
@@ -143,6 +143,9 @@ static inline unsigned long do_mmap2(unsigned long addr, size_t len,
         struct file * file = NULL;
         unsigned long ret = -EINVAL;
 
+        if (!arch_validate_prot(prot))
+                goto out;
+
         if (shift) {
                 if (off & ((1 << shift) - 1))
                         goto out;
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index f1a38a6c1e2d..e2ee66b5831d 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -129,7 +129,7 @@ static unsigned long __initdata iSeries_recal_titan;
 static signed long __initdata iSeries_recal_tb;
 
 /* Forward declaration is only needed for iSereis compiles */
-void __init clocksource_init(void);
+static void __init clocksource_init(void);
 #endif
 
 #define XSEC_PER_SEC (1024*1024)
@@ -150,8 +150,8 @@ u64 tb_to_xs;
 unsigned tb_to_us;
 
 #define TICKLEN_SCALE   NTP_SCALE_SHIFT
-u64 last_tick_len;      /* units are ns / 2^TICKLEN_SCALE */
-u64 ticklen_to_xs;      /* 0.64 fraction */
+static u64 last_tick_len;       /* units are ns / 2^TICKLEN_SCALE */
+static u64 ticklen_to_xs;       /* 0.64 fraction */
 
 /* If last_tick_len corresponds to about 1/HZ seconds, then
    last_tick_len << TICKLEN_SHIFT will be about 2^63. */
@@ -164,7 +164,7 @@ static u64 tb_to_ns_scale __read_mostly;
 static unsigned tb_to_ns_shift __read_mostly;
 static unsigned long boot_tb __read_mostly;
 
-struct gettimeofday_struct do_gtod;
+static struct gettimeofday_struct do_gtod;
 
 extern struct timezone sys_tz;
 static long timezone_offset;
@@ -742,10 +742,6 @@ void __init generic_calibrate_decr(void)
         }
 
 #if defined(CONFIG_BOOKE) || defined(CONFIG_40x)
-        /* Set the time base to zero */
-        mtspr(SPRN_TBWL, 0);
-        mtspr(SPRN_TBWU, 0);
-
         /* Clear any pending timer interrupts */
         mtspr(SPRN_TSR, TSR_ENW | TSR_WIS | TSR_DIS | TSR_FIS);
 
@@ -832,7 +828,7 @@ void update_vsyscall_tz(void)
         ++vdso_data->tb_update_count;
 }
 
-void __init clocksource_init(void)
+static void __init clocksource_init(void)
 {
         struct clocksource *clock;
 
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 4b5b7ff4f78b..878fbddb6ae1 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -967,6 +967,20 @@ void altivec_unavailable_exception(struct pt_regs *regs)
         die("Unrecoverable VMX/Altivec Unavailable Exception", regs, SIGABRT);
 }
 
+void vsx_unavailable_exception(struct pt_regs *regs)
+{
+        if (user_mode(regs)) {
+                /* A user program has executed an vsx instruction,
+                   but this kernel doesn't support vsx. */
+                _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
+                return;
+        }
+
+        printk(KERN_EMERG "Unrecoverable VSX Unavailable Exception "
+                        "%lx at %lx\n", regs->trap, regs->nip);
+        die("Unrecoverable VSX Unavailable Exception", regs, SIGABRT);
+}
+
 void performance_monitor_exception(struct pt_regs *regs)
 {
         perf_irq(regs);
@@ -1030,21 +1044,29 @@ void SoftwareEmulation(struct pt_regs *regs)
 
 #if defined(CONFIG_40x) || defined(CONFIG_BOOKE)
 
-void DebugException(struct pt_regs *regs, unsigned long debug_status)
+void __kprobes DebugException(struct pt_regs *regs, unsigned long debug_status)
 {
         if (debug_status & DBSR_IC) {   /* instruction completion */
                 regs->msr &= ~MSR_DE;
+
+                /* Disable instruction completion */
+                mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) & ~DBCR0_IC);
+                /* Clear the instruction completion event */
+                mtspr(SPRN_DBSR, DBSR_IC);
+
+                if (notify_die(DIE_SSTEP, "single_step", regs, 5,
+                               5, SIGTRAP) == NOTIFY_STOP) {
+                        return;
+                }
+
+                if (debugger_sstep(regs))
+                        return;
+
                 if (user_mode(regs)) {
                         current->thread.dbcr0 &= ~DBCR0_IC;
-                } else {
-                        /* Disable instruction completion */
-                        mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) & ~DBCR0_IC);
-                        /* Clear the instruction completion event */
-                        mtspr(SPRN_DBSR, DBSR_IC);
-                        if (debugger_sstep(regs))
-                                return;
                 }
-                _exception(SIGTRAP, regs, TRAP_TRACE, 0);
+
+                _exception(SIGTRAP, regs, TRAP_TRACE, regs->nip);
         }
 }
 #endif /* CONFIG_4xx || CONFIG_BOOKE */
@@ -1091,6 +1113,21 @@ void altivec_assist_exception(struct pt_regs *regs)
 }
 #endif /* CONFIG_ALTIVEC */
 
+#ifdef CONFIG_VSX
+void vsx_assist_exception(struct pt_regs *regs)
+{
+        if (!user_mode(regs)) {
+                printk(KERN_EMERG "VSX assist exception in kernel mode"
+                       " at %lx\n", regs->nip);
+                die("Kernel VSX assist exception", regs, SIGILL);
+        }
+
+        flush_vsx_to_thread(current);
+        printk(KERN_INFO "VSX assist not supported at %lx\n", regs->nip);
+        _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
+}
+#endif /* CONFIG_VSX */
+
 #ifdef CONFIG_FSL_BOOKE
 void CacheLockingException(struct pt_regs *regs, unsigned long address,
                            unsigned long error_code)
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index ce245a850db2..f177c60ea766 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -571,6 +571,11 @@ static __init int vdso_fixup_features(struct lib32_elfinfo *v32,
         if (start64)
                 do_feature_fixups(powerpc_firmware_features,
                                   start64, start64 + size64);
+
+        start64 = find_section64(v64->hdr, "__lwsync_fixup", &size64);
+        if (start64)
+                do_lwsync_fixups(cur_cpu_spec->cpu_features,
+                                 start64, start64 + size64);
 #endif /* CONFIG_PPC64 */
 
         start32 = find_section32(v32->hdr, "__ftr_fixup", &size32);
@@ -585,6 +590,11 @@ static __init int vdso_fixup_features(struct lib32_elfinfo *v32,
                                   start32, start32 + size32);
 #endif /* CONFIG_PPC64 */
 
+        start32 = find_section32(v32->hdr, "__lwsync_fixup", &size32);
+        if (start32)
+                do_lwsync_fixups(cur_cpu_spec->cpu_features,
+                                 start32, start32 + size32);
+
         return 0;
 }
 
diff --git a/arch/powerpc/kernel/vdso32/vdso32.lds.S b/arch/powerpc/kernel/vdso32/vdso32.lds.S
index 9352ab5200e5..be3b6a41dc09 100644
--- a/arch/powerpc/kernel/vdso32/vdso32.lds.S
+++ b/arch/powerpc/kernel/vdso32/vdso32.lds.S
@@ -24,7 +24,7 @@ SECTIONS
 
         . = ALIGN(16);
         .text           : {
-                *(.text .stub .text.* .gnu.linkonce.t.*)
+                *(.text .stub .text.* .gnu.linkonce.t.* __ftr_alt_*)
         }
         PROVIDE(__etext = .);
         PROVIDE(_etext = .);
@@ -33,6 +33,9 @@ SECTIONS
         . = ALIGN(8);
         __ftr_fixup     : { *(__ftr_fixup) }
 
+        . = ALIGN(8);
+        __lwsync_fixup  : { *(__lwsync_fixup) }
+
 #ifdef CONFIG_PPC64
         . = ALIGN(8);
         __fw_ftr_fixup  : { *(__fw_ftr_fixup) }
diff --git a/arch/powerpc/kernel/vdso64/vdso64.lds.S b/arch/powerpc/kernel/vdso64/vdso64.lds.S
index 932b3fdb34b9..d0b2526dd38d 100644
--- a/arch/powerpc/kernel/vdso64/vdso64.lds.S
+++ b/arch/powerpc/kernel/vdso64/vdso64.lds.S
@@ -24,7 +24,7 @@ SECTIONS
 
         . = ALIGN(16);
         .text           : {
-                *(.text .stub .text.* .gnu.linkonce.t.*)
+                *(.text .stub .text.* .gnu.linkonce.t.* __ftr_alt_*)
                 *(.sfpr .glink)
         }                                               :text
         PROVIDE(__etext = .);
@@ -35,6 +35,9 @@ SECTIONS
         __ftr_fixup     : { *(__ftr_fixup) }
 
         . = ALIGN(8);
+        __lwsync_fixup  : { *(__lwsync_fixup) }
+
+        . = ALIGN(8);
         __fw_ftr_fixup  : { *(__fw_ftr_fixup) }
 
         /*
@@ -43,15 +46,15 @@ SECTIONS
         .rodata         : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
         .rodata1        : { *(.rodata1) }
 
+        .dynamic        : { *(.dynamic) }               :text   :dynamic
+
         .eh_frame_hdr   : { *(.eh_frame_hdr) }          :text   :eh_frame_hdr
         .eh_frame       : { KEEP (*(.eh_frame)) }       :text
         .gcc_except_table : { *(.gcc_except_table) }
+        .rela.dyn ALIGN(8) : { *(.rela.dyn) }
 
         .opd ALIGN(8)   : { KEEP (*(.opd)) }
         .got ALIGN(8)   : { *(.got .toc) }
-        .rela.dyn ALIGN(8) : { *(.rela.dyn) }
-
-        .dynamic        : { *(.dynamic) }               :text   :dynamic
 
         _end = .;
         PROVIDE(end = .);
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 53d57d17a894..87a72c66ce27 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -35,7 +35,7 @@ SECTIONS
                 ALIGN_FUNCTION();
                 *(.text.head)
                 _text = .;
-                *(.text .fixup .text.init.refok .exit.text.refok)
+                *(.text .fixup .text.init.refok .exit.text.refok __ftr_alt_*)
                 SCHED_TEXT
                 LOCK_TEXT
                 KPROBES_TEXT
@@ -125,6 +125,12 @@ SECTIONS
                 *(__ftr_fixup)
                 __stop___ftr_fixup = .;
         }
+        . = ALIGN(8);
+        __lwsync_fixup : AT(ADDR(__lwsync_fixup) - LOAD_OFFSET) {
+                __start___lwsync_fixup = .;
+                *(__lwsync_fixup)
+                __stop___lwsync_fixup = .;
+        }
 #ifdef CONFIG_PPC64
         . = ALIGN(8);
         __fw_ftr_fixup : AT(ADDR(__fw_ftr_fixup) - LOAD_OFFSET) {
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index e522b06cc42f..2a88e8b9a3c6 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -24,3 +24,7 @@ obj-$(CONFIG_SMP)	+= locks.o
 endif
 
 obj-$(CONFIG_PPC_LIB_RHEAP) += rheap.o
+
+obj-y                   += code-patching.o
+obj-y                   += feature-fixups.o
+obj-$(CONFIG_FTR_FIXUP_SELFTEST) += feature-fixups-test.o
diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c
new file mode 100644
index 000000000000..0559fe086eb4
--- /dev/null
+++ b/arch/powerpc/lib/code-patching.c
@@ -0,0 +1,448 @@
+/*
+ *  Copyright 2008 Michael Ellerman, IBM Corporation.
+ *
+ *  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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/vmalloc.h>
+#include <linux/init.h>
+#include <asm/page.h>
+#include <asm/code-patching.h>
+
+
+void patch_instruction(unsigned int *addr, unsigned int instr)
+{
+        *addr = instr;
+        asm ("dcbst 0, %0; sync; icbi 0,%0; sync; isync" : : "r" (addr));
+}
+
+void patch_branch(unsigned int *addr, unsigned long target, int flags)
+{
+        patch_instruction(addr, create_branch(addr, target, flags));
+}
+
+unsigned int create_branch(const unsigned int *addr,
+                           unsigned long target, int flags)
+{
+        unsigned int instruction;
+        long offset;
+
+        offset = target;
+        if (! (flags & BRANCH_ABSOLUTE))
+                offset = offset - (unsigned long)addr;
+
+        /* Check we can represent the target in the instruction format */
+        if (offset < -0x2000000 || offset > 0x1fffffc || offset & 0x3)
+                return 0;
+
+        /* Mask out the flags and target, so they don't step on each other. */
+        instruction = 0x48000000 | (flags & 0x3) | (offset & 0x03FFFFFC);
+
+        return instruction;
+}
+
+unsigned int create_cond_branch(const unsigned int *addr,
+                                unsigned long target, int flags)
+{
+        unsigned int instruction;
+        long offset;
+
+        offset = target;
+        if (! (flags & BRANCH_ABSOLUTE))
+                offset = offset - (unsigned long)addr;
+
+        /* Check we can represent the target in the instruction format */
+        if (offset < -0x8000 || offset > 0x7FFF || offset & 0x3)
+                return 0;
+
+        /* Mask out the flags and target, so they don't step on each other. */
+        instruction = 0x40000000 | (flags & 0x3FF0003) | (offset & 0xFFFC);
+
+        return instruction;
+}
+
+static unsigned int branch_opcode(unsigned int instr)
+{
+        return (instr >> 26) & 0x3F;
+}
+
+static int instr_is_branch_iform(unsigned int instr)
+{
+        return branch_opcode(instr) == 18;
+}
+
+static int instr_is_branch_bform(unsigned int instr)
+{
+        return branch_opcode(instr) == 16;
+}
+
+int instr_is_relative_branch(unsigned int instr)
+{
+        if (instr & BRANCH_ABSOLUTE)
+                return 0;
+
+        return instr_is_branch_iform(instr) || instr_is_branch_bform(instr);
+}
+
+static unsigned long branch_iform_target(const unsigned int *instr)
+{
+        signed long imm;
+
+        imm = *instr & 0x3FFFFFC;
+
+        /* If the top bit of the immediate value is set this is negative */
+        if (imm & 0x2000000)
+                imm -= 0x4000000;
+
+        if ((*instr & BRANCH_ABSOLUTE) == 0)
+                imm += (unsigned long)instr;
+
+        return (unsigned long)imm;
+}
+
+static unsigned long branch_bform_target(const unsigned int *instr)
+{
+        signed long imm;
+
+        imm = *instr & 0xFFFC;
+
+        /* If the top bit of the immediate value is set this is negative */
+        if (imm & 0x8000)
+                imm -= 0x10000;
+
+        if ((*instr & BRANCH_ABSOLUTE) == 0)
+                imm += (unsigned long)instr;
+
+        return (unsigned long)imm;
+}
+
+unsigned long branch_target(const unsigned int *instr)
+{
+        if (instr_is_branch_iform(*instr))
+                return branch_iform_target(instr);
+        else if (instr_is_branch_bform(*instr))
+                return branch_bform_target(instr);
+
+        return 0;
+}
+
+int instr_is_branch_to_addr(const unsigned int *instr, unsigned long addr)
+{
+        if (instr_is_branch_iform(*instr) || instr_is_branch_bform(*instr))
+                return branch_target(instr) == addr;
+
+        return 0;
+}
+
+unsigned int translate_branch(const unsigned int *dest, const unsigned int *src)
+{
+        unsigned long target;
+
+        target = branch_target(src);
+
+        if (instr_is_branch_iform(*src))
+                return create_branch(dest, target, *src);
+        else if (instr_is_branch_bform(*src))
+                return create_cond_branch(dest, target, *src);
+
+        return 0;
+}
+
+
+#ifdef CONFIG_CODE_PATCHING_SELFTEST
+
+static void __init test_trampoline(void)
+{
+        asm ("nop;\n");
+}
+
+#define check(x)        \
+        if (!(x)) printk("code-patching: test failed at line %d\n", __LINE__);
+
+static void __init test_branch_iform(void)
+{
+        unsigned int instr;
+        unsigned long addr;
+
+        addr = (unsigned long)&instr;
+
+        /* The simplest case, branch to self, no flags */
+        check(instr_is_branch_iform(0x48000000));
+        /* All bits of target set, and flags */
+        check(instr_is_branch_iform(0x4bffffff));
+        /* High bit of opcode set, which is wrong */
+        check(!instr_is_branch_iform(0xcbffffff));
+        /* Middle bits of opcode set, which is wrong */
+        check(!instr_is_branch_iform(0x7bffffff));
+
+        /* Simplest case, branch to self with link */
+        check(instr_is_branch_iform(0x48000001));
+        /* All bits of targets set */
+        check(instr_is_branch_iform(0x4bfffffd));
+        /* Some bits of targets set */
+        check(instr_is_branch_iform(0x4bff00fd));
+        /* Must be a valid branch to start with */
+        check(!instr_is_branch_iform(0x7bfffffd));
+
+        /* Absolute branch to 0x100 */
+        instr = 0x48000103;
+        check(instr_is_branch_to_addr(&instr, 0x100));
+        /* Absolute branch to 0x420fc */
+        instr = 0x480420ff;
+        check(instr_is_branch_to_addr(&instr, 0x420fc));
+        /* Maximum positive relative branch, + 20MB - 4B */
+        instr = 0x49fffffc;
+        check(instr_is_branch_to_addr(&instr, addr + 0x1FFFFFC));
+        /* Smallest negative relative branch, - 4B */
+        instr = 0x4bfffffc;
+        check(instr_is_branch_to_addr(&instr, addr - 4));
+        /* Largest negative relative branch, - 32 MB */
+        instr = 0x4a000000;
+        check(instr_is_branch_to_addr(&instr, addr - 0x2000000));
+
+        /* Branch to self, with link */
+        instr = create_branch(&instr, addr, BRANCH_SET_LINK);
+        check(instr_is_branch_to_addr(&instr, addr));
+
+        /* Branch to self - 0x100, with link */
+        instr = create_branch(&instr, addr - 0x100, BRANCH_SET_LINK);
+        check(instr_is_branch_to_addr(&instr, addr - 0x100));
+
+        /* Branch to self + 0x100, no link */
+        instr = create_branch(&instr, addr + 0x100, 0);
+        check(instr_is_branch_to_addr(&instr, addr + 0x100));
+
+        /* Maximum relative negative offset, - 32 MB */
+        instr = create_branch(&instr, addr - 0x2000000, BRANCH_SET_LINK);
+        check(instr_is_branch_to_addr(&instr, addr - 0x2000000));
+
+        /* Out of range relative negative offset, - 32 MB + 4*/
+        instr = create_branch(&instr, addr - 0x2000004, BRANCH_SET_LINK);
+        check(instr == 0);
+
+        /* Out of range relative positive offset, + 32 MB */
+        instr = create_branch(&instr, addr + 0x2000000, BRANCH_SET_LINK);
+        check(instr == 0);
+
+        /* Unaligned target */
+        instr = create_branch(&instr, addr + 3, BRANCH_SET_LINK);
+        check(instr == 0);
+
+        /* Check flags are masked correctly */
+        instr = create_branch(&instr, addr, 0xFFFFFFFC);
+        check(instr_is_branch_to_addr(&instr, addr));
+        check(instr == 0x48000000);
+}
+
+static void __init test_create_function_call(void)
+{
+        unsigned int *iptr;
+        unsigned long dest;
+
+        /* Check we can create a function call */
+        iptr = (unsigned int *)ppc_function_entry(test_trampoline);
+        dest = ppc_function_entry(test_create_function_call);
+        patch_instruction(iptr, create_branch(iptr, dest, BRANCH_SET_LINK));
+        check(instr_is_branch_to_addr(iptr, dest));
+}
+
+static void __init test_branch_bform(void)
+{
+        unsigned long addr;
+        unsigned int *iptr, instr, flags;
+
+        iptr = &instr;
+        addr = (unsigned long)iptr;
+
+        /* The simplest case, branch to self, no flags */
+        check(instr_is_branch_bform(0x40000000));
+        /* All bits of target set, and flags */
+        check(instr_is_branch_bform(0x43ffffff));
+        /* High bit of opcode set, which is wrong */
+        check(!instr_is_branch_bform(0xc3ffffff));
+        /* Middle bits of opcode set, which is wrong */
+        check(!instr_is_branch_bform(0x7bffffff));
+
+        /* Absolute conditional branch to 0x100 */
+        instr = 0x43ff0103;
+        check(instr_is_branch_to_addr(&instr, 0x100));
+        /* Absolute conditional branch to 0x20fc */
+        instr = 0x43ff20ff;
+        check(instr_is_branch_to_addr(&instr, 0x20fc));
+        /* Maximum positive relative conditional branch, + 32 KB - 4B */
+        instr = 0x43ff7ffc;
+        check(instr_is_branch_to_addr(&instr, addr + 0x7FFC));
+        /* Smallest negative relative conditional branch, - 4B */
+        instr = 0x43fffffc;
+        check(instr_is_branch_to_addr(&instr, addr - 4));
+        /* Largest negative relative conditional branch, - 32 KB */
+        instr = 0x43ff8000;
+        check(instr_is_branch_to_addr(&instr, addr - 0x8000));
+
+        /* All condition code bits set & link */
+        flags = 0x3ff000 | BRANCH_SET_LINK;
+
+        /* Branch to self */
+        instr = create_cond_branch(iptr, addr, flags);
+        check(instr_is_branch_to_addr(&instr, addr));
+
+        /* Branch to self - 0x100 */
+        instr = create_cond_branch(iptr, addr - 0x100, flags);
+        check(instr_is_branch_to_addr(&instr, addr - 0x100));
+
+        /* Branch to self + 0x100 */
+        instr = create_cond_branch(iptr, addr + 0x100, flags);
+        check(instr_is_branch_to_addr(&instr, addr + 0x100));
+
+        /* Maximum relative negative offset, - 32 KB */
+        instr = create_cond_branch(iptr, addr - 0x8000, flags);
+        check(instr_is_branch_to_addr(&instr, addr - 0x8000));
+
+        /* Out of range relative negative offset, - 32 KB + 4*/
+        instr = create_cond_branch(iptr, addr - 0x8004, flags);
+        check(instr == 0);
+
+        /* Out of range relative positive offset, + 32 KB */
+        instr = create_cond_branch(iptr, addr + 0x8000, flags);
+        check(instr == 0);
+
+        /* Unaligned target */
+        instr = create_cond_branch(iptr, addr + 3, flags);
+        check(instr == 0);
+
+        /* Check flags are masked correctly */
+        instr = create_cond_branch(iptr, addr, 0xFFFFFFFC);
+        check(instr_is_branch_to_addr(&instr, addr));
+        check(instr == 0x43FF0000);
+}
+
+static void __init test_translate_branch(void)
+{
+        unsigned long addr;
+        unsigned int *p, *q;
+        void *buf;
+
+        buf = vmalloc(PAGE_ALIGN(0x2000000 + 1));
+        check(buf);
+        if (!buf)
+                return;
+
+        /* Simple case, branch to self moved a little */
+        p = buf;
+        addr = (unsigned long)p;
+        patch_branch(p, addr, 0);
+        check(instr_is_branch_to_addr(p, addr));
+        q = p + 1;
+        patch_instruction(q, translate_branch(q, p));
+        check(instr_is_branch_to_addr(q, addr));
+
+        /* Maximum negative case, move b . to addr + 32 MB */
+        p = buf;
+        addr = (unsigned long)p;
+        patch_branch(p, addr, 0);
+        q = buf + 0x2000000;
+        patch_instruction(q, translate_branch(q, p));
+        check(instr_is_branch_to_addr(p, addr));
+        check(instr_is_branch_to_addr(q, addr));
+        check(*q == 0x4a000000);
+
+        /* Maximum positive case, move x to x - 32 MB + 4 */
+        p = buf + 0x2000000;
+        addr = (unsigned long)p;
+        patch_branch(p, addr, 0);
+        q = buf + 4;
+        patch_instruction(q, translate_branch(q, p));
+        check(instr_is_branch_to_addr(p, addr));
+        check(instr_is_branch_to_addr(q, addr));
+        check(*q == 0x49fffffc);
+
+        /* Jump to x + 16 MB moved to x + 20 MB */
+        p = buf;
+        addr = 0x1000000 + (unsigned long)buf;
+        patch_branch(p, addr, BRANCH_SET_LINK);
+        q = buf + 0x1400000;
+        patch_instruction(q, translate_branch(q, p));
+        check(instr_is_branch_to_addr(p, addr));
+        check(instr_is_branch_to_addr(q, addr));
+
+        /* Jump to x + 16 MB moved to x - 16 MB + 4 */
+        p = buf + 0x1000000;
+        addr = 0x2000000 + (unsigned long)buf;
+        patch_branch(p, addr, 0);
+        q = buf + 4;
+        patch_instruction(q, translate_branch(q, p));
+        check(instr_is_branch_to_addr(p, addr));
+        check(instr_is_branch_to_addr(q, addr));
+
+
+        /* Conditional branch tests */
+
+        /* Simple case, branch to self moved a little */
+        p = buf;
+        addr = (unsigned long)p;
+        patch_instruction(p, create_cond_branch(p, addr, 0));
+        check(instr_is_branch_to_addr(p, addr));
+        q = p + 1;
+        patch_instruction(q, translate_branch(q, p));
+        check(instr_is_branch_to_addr(q, addr));
+
+        /* Maximum negative case, move b . to addr + 32 KB */
+        p = buf;
+        addr = (unsigned long)p;
+        patch_instruction(p, create_cond_branch(p, addr, 0xFFFFFFFC));
+        q = buf + 0x8000;
+        patch_instruction(q, translate_branch(q, p));
+        check(instr_is_branch_to_addr(p, addr));
+        check(instr_is_branch_to_addr(q, addr));
+        check(*q == 0x43ff8000);
+
+        /* Maximum positive case, move x to x - 32 KB + 4 */
+        p = buf + 0x8000;
+        addr = (unsigned long)p;
+        patch_instruction(p, create_cond_branch(p, addr, 0xFFFFFFFC));
+        q = buf + 4;
+        patch_instruction(q, translate_branch(q, p));
+        check(instr_is_branch_to_addr(p, addr));
+        check(instr_is_branch_to_addr(q, addr));
+        check(*q == 0x43ff7ffc);
+
+        /* Jump to x + 12 KB moved to x + 20 KB */
+        p = buf;
+        addr = 0x3000 + (unsigned long)buf;
+        patch_instruction(p, create_cond_branch(p, addr, BRANCH_SET_LINK));
+        q = buf + 0x5000;
+        patch_instruction(q, translate_branch(q, p));
+        check(instr_is_branch_to_addr(p, addr));
+        check(instr_is_branch_to_addr(q, addr));
+
+        /* Jump to x + 8 KB moved to x - 8 KB + 4 */
+        p = buf + 0x2000;
+        addr = 0x4000 + (unsigned long)buf;
+        patch_instruction(p, create_cond_branch(p, addr, 0));
+        q = buf + 4;
+        patch_instruction(q, translate_branch(q, p));
+        check(instr_is_branch_to_addr(p, addr));
+        check(instr_is_branch_to_addr(q, addr));
+
+        /* Free the buffer we were using */
+        vfree(buf);
+}
+
+static int __init test_code_patching(void)
+{
+        printk(KERN_DEBUG "Running code patching self-tests ...\n");
+
+        test_branch_iform();
+        test_branch_bform();
+        test_create_function_call();
+        test_translate_branch();
+
+        return 0;
+}
+late_initcall(test_code_patching);
+
+#endif /* CONFIG_CODE_PATCHING_SELFTEST */
diff --git a/arch/powerpc/lib/dma-noncoherent.c b/arch/powerpc/lib/dma-noncoherent.c
index 6656d47841d0..5d83907f6591 100644
--- a/arch/powerpc/lib/dma-noncoherent.c
+++ b/arch/powerpc/lib/dma-noncoherent.c
@@ -348,8 +348,15 @@ void __dma_sync(void *vaddr, size_t size, int direction)
         switch (direction) {
         case DMA_NONE:
                 BUG();
-        case DMA_FROM_DEVICE:   /* invalidate only */
-                invalidate_dcache_range(start, end);
+        case DMA_FROM_DEVICE:
+                /*
+                 * invalidate only when cache-line aligned otherwise there is
+                 * the potential for discarding uncommitted data from the cache
+                 */
+                if ((start & (L1_CACHE_BYTES - 1)) || (size & (L1_CACHE_BYTES - 1)))
+                        flush_dcache_range(start, end);
+                else
+                        invalidate_dcache_range(start, end);
                 break;
         case DMA_TO_DEVICE:             /* writeback only */
                 clean_dcache_range(start, end);
diff --git a/arch/powerpc/lib/feature-fixups-test.S b/arch/powerpc/lib/feature-fixups-test.S
new file mode 100644
index 000000000000..cb737484c5aa
--- /dev/null
+++ b/arch/powerpc/lib/feature-fixups-test.S
@@ -0,0 +1,742 @@
+/*
+ * Copyright 2008 Michael Ellerman, IBM Corporation.
+ *
+ *
+ * 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.
+ */
+
+#include <asm/feature-fixups.h>
+#include <asm/ppc_asm.h>
+#include <asm/synch.h>
+
+        .text
+
+#define globl(x)                \
+        .globl x;       \
+x:
+
+globl(ftr_fixup_test1)
+        or      1,1,1
+        or      2,2,2   /* fixup will nop out this instruction */
+        or      3,3,3
+
+globl(end_ftr_fixup_test1)
+
+globl(ftr_fixup_test1_orig)
+        or      1,1,1
+        or      2,2,2
+        or      3,3,3
+
+globl(ftr_fixup_test1_expected)
+        or      1,1,1
+        nop
+        or      3,3,3
+
+globl(ftr_fixup_test2)
+        or      1,1,1
+        or      2,2,2   /* fixup will replace this with ftr_fixup_test2_alt */
+        or      3,3,3
+
+globl(end_ftr_fixup_test2)
+
+globl(ftr_fixup_test2_orig)
+        or      1,1,1
+        or      2,2,2
+        or      3,3,3
+
+globl(ftr_fixup_test2_alt)
+        or      31,31,31
+
+globl(ftr_fixup_test2_expected)
+        or      1,1,1
+        or      31,31,31
+        or      3,3,3
+
+globl(ftr_fixup_test3)
+        or      1,1,1
+        or      2,2,2   /* fixup will fail to replace this */
+        or      3,3,3
+
+globl(end_ftr_fixup_test3)
+
+globl(ftr_fixup_test3_orig)
+        or      1,1,1
+        or      2,2,2
+        or      3,3,3
+
+globl(ftr_fixup_test3_alt)
+        or      31,31,31
+        or      31,31,31
+
+globl(ftr_fixup_test4)
+        or      1,1,1
+        or      2,2,2
+        or      2,2,2
+        or      2,2,2
+        or      2,2,2
+        or      3,3,3
+
+globl(end_ftr_fixup_test4)
+
+globl(ftr_fixup_test4_expected)
+        or      1,1,1
+        or      31,31,31
+        or      31,31,31
+        nop
+        nop
+        or      3,3,3
+
+globl(ftr_fixup_test4_orig)
+        or      1,1,1
+        or      2,2,2
+        or      2,2,2
+        or      2,2,2
+        or      2,2,2
+        or      3,3,3
+
+globl(ftr_fixup_test4_alt)
+        or      31,31,31
+        or      31,31,31
+
+
+globl(ftr_fixup_test5)
+        or      1,1,1
+BEGIN_FTR_SECTION
+        or      2,2,2
+        or      2,2,2
+        or      2,2,2
+        or      2,2,2
+        or      2,2,2
+        or      2,2,2
+        or      2,2,2
+FTR_SECTION_ELSE
+2:      b       3f
+3:      or      5,5,5
+        beq     3b
+        b       1f
+        or      6,6,6
+        b       2b
+1:      bdnz    3b
+ALT_FTR_SECTION_END(0, 1)
+        or      1,1,1
+
+globl(end_ftr_fixup_test5)
+
+globl(ftr_fixup_test5_expected)
+        or      1,1,1
+2:      b       3f
+3:      or      5,5,5
+        beq     3b
+        b       1f
+        or      6,6,6
+        b       2b
+1:      bdnz    3b
+        or      1,1,1
+
+globl(ftr_fixup_test6)
+1:      or      1,1,1
+BEGIN_FTR_SECTION
+        or      5,5,5
+2:      PPC_LCMPI       r3,0
+        beq     4f
+        blt     2b
+        b       1b
+        b       4f
+FTR_SECTION_ELSE
+2:      or      2,2,2
+        PPC_LCMPI       r3,1
+        beq     3f
+        blt     2b
+        b       3f
+        b       1b
+ALT_FTR_SECTION_END(0, 1)
+3:      or      1,1,1
+        or      2,2,2
+4:      or      3,3,3
+
+globl(end_ftr_fixup_test6)
+
+globl(ftr_fixup_test6_expected)
+1:      or      1,1,1
+2:      or      2,2,2
+        PPC_LCMPI       r3,1
+        beq     3f
+        blt     2b
+        b       3f
+        b       1b
+2:      or      1,1,1
+        or      2,2,2
+3:      or      3,3,3
+
+
+#define MAKE_MACRO_TEST(TYPE)                                           \
+globl(ftr_fixup_test_ ##TYPE##_macros)                                  \
+        or      1,1,1;                                                  \
+        /* Basic test, this section should all be nop'ed */             \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+END_##TYPE##_SECTION(0, 1)                                              \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Basic test, this section should NOT be nop'ed */             \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+END_##TYPE##_SECTION(0, 0)                                              \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nesting test, inner section should be nop'ed */              \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(80)                                       \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+END_##TYPE##_SECTION_NESTED(0, 1, 80)                                   \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+END_##TYPE##_SECTION(0, 0)                                              \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nesting test, whole section should be nop'ed */              \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(80)                                       \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+END_##TYPE##_SECTION_NESTED(0, 0, 80)                                   \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+END_##TYPE##_SECTION(0, 1)                                              \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nesting test, none should be nop'ed */                       \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(80)                                       \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+END_##TYPE##_SECTION_NESTED(0, 0, 80)                                   \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+END_##TYPE##_SECTION(0, 0)                                              \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Basic alt section test, default case should be taken */      \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+##TYPE##_SECTION_ELSE                                                   \
+        or      5,5,5;                                                  \
+        or      5,5,5;                                                  \
+ALT_##TYPE##_SECTION_END(0, 0)                                          \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Basic alt section test, else case should be taken */         \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+##TYPE##_SECTION_ELSE                                                   \
+        or      31,31,31;                                               \
+        or      31,31,31;                                               \
+        or      31,31,31;                                               \
+ALT_##TYPE##_SECTION_END(0, 1)                                          \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Alt with smaller else case, should be padded with nops */    \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+##TYPE##_SECTION_ELSE                                                   \
+        or      31,31,31;                                               \
+ALT_##TYPE##_SECTION_END(0, 1)                                          \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Alt section with nested section in default case */           \
+        /* Default case should be taken, with nop'ed inner section */   \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      3,3,3;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(95)                                       \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+END_##TYPE##_SECTION_NESTED(0, 1, 95)                                   \
+        or      3,3,3;                                                  \
+##TYPE##_SECTION_ELSE                                                   \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+ALT_##TYPE##_SECTION_END(0, 0)                                          \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Alt section with nested section in else, default taken */    \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+##TYPE##_SECTION_ELSE                                                   \
+        or      5,5,5;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(95)                                       \
+        or      3,3,3;                                                  \
+END_##TYPE##_SECTION_NESTED(0, 1, 95)                                   \
+        or      5,5,5;                                                  \
+ALT_##TYPE##_SECTION_END(0, 0)                                          \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Alt section with nested section in else, else taken & nop */ \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+##TYPE##_SECTION_ELSE                                                   \
+        or      5,5,5;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(95)                                       \
+        or      3,3,3;                                                  \
+END_##TYPE##_SECTION_NESTED(0, 1, 95)                                   \
+        or      5,5,5;                                                  \
+ALT_##TYPE##_SECTION_END(0, 1)                                          \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Feature section with nested alt section, default taken */    \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(95)                                       \
+        or      1,1,1;                                                  \
+##TYPE##_SECTION_ELSE_NESTED(95)                                        \
+        or      5,5,5;                                                  \
+ALT_##TYPE##_SECTION_END_NESTED(0, 0, 95)                               \
+        or      2,2,2;                                                  \
+END_##TYPE##_SECTION(0, 0)                                              \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Feature section with nested alt section, else taken */       \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(95)                                       \
+        or      1,1,1;                                                  \
+##TYPE##_SECTION_ELSE_NESTED(95)                                        \
+        or      5,5,5;                                                  \
+ALT_##TYPE##_SECTION_END_NESTED(0, 1, 95)                               \
+        or      2,2,2;                                                  \
+END_##TYPE##_SECTION(0, 0)                                              \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Feature section with nested alt section, all nop'ed */       \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(95)                                       \
+        or      1,1,1;                                                  \
+##TYPE##_SECTION_ELSE_NESTED(95)                                        \
+        or      5,5,5;                                                  \
+ALT_##TYPE##_SECTION_END_NESTED(0, 0, 95)                               \
+        or      2,2,2;                                                  \
+END_##TYPE##_SECTION(0, 1)                                              \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nested alt sections, default with inner default taken */     \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(95)                                       \
+        or      1,1,1;                                                  \
+##TYPE##_SECTION_ELSE_NESTED(95)                                        \
+        or      5,5,5;                                                  \
+ALT_##TYPE##_SECTION_END_NESTED(0, 0, 95)                               \
+        or      2,2,2;                                                  \
+##TYPE##_SECTION_ELSE                                                   \
+        or      31,31,31;                                               \
+BEGIN_##TYPE##_SECTION_NESTED(94)                                       \
+        or      5,5,5;                                                  \
+##TYPE##_SECTION_ELSE_NESTED(94)                                        \
+        or      1,1,1;                                                  \
+ALT_##TYPE##_SECTION_END_NESTED(0, 0, 94)                               \
+        or      31,31,31;                                               \
+ALT_##TYPE##_SECTION_END(0, 0)                                          \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nested alt sections, default with inner else taken */        \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(95)                                       \
+        or      1,1,1;                                                  \
+##TYPE##_SECTION_ELSE_NESTED(95)                                        \
+        or      5,5,5;                                                  \
+ALT_##TYPE##_SECTION_END_NESTED(0, 1, 95)                               \
+        or      2,2,2;                                                  \
+##TYPE##_SECTION_ELSE                                                   \
+        or      31,31,31;                                               \
+BEGIN_##TYPE##_SECTION_NESTED(94)                                       \
+        or      5,5,5;                                                  \
+##TYPE##_SECTION_ELSE_NESTED(94)                                        \
+        or      1,1,1;                                                  \
+ALT_##TYPE##_SECTION_END_NESTED(0, 0, 94)                               \
+        or      31,31,31;                                               \
+ALT_##TYPE##_SECTION_END(0, 0)                                          \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nested alt sections, else with inner default taken */        \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(95)                                       \
+        or      1,1,1;                                                  \
+##TYPE##_SECTION_ELSE_NESTED(95)                                        \
+        or      5,5,5;                                                  \
+ALT_##TYPE##_SECTION_END_NESTED(0, 1, 95)                               \
+        or      2,2,2;                                                  \
+##TYPE##_SECTION_ELSE                                                   \
+        or      31,31,31;                                               \
+BEGIN_##TYPE##_SECTION_NESTED(94)                                       \
+        or      5,5,5;                                                  \
+##TYPE##_SECTION_ELSE_NESTED(94)                                        \
+        or      1,1,1;                                                  \
+ALT_##TYPE##_SECTION_END_NESTED(0, 0, 94)                               \
+        or      31,31,31;                                               \
+ALT_##TYPE##_SECTION_END(0, 1)                                          \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nested alt sections, else with inner else taken */           \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+BEGIN_##TYPE##_SECTION_NESTED(95)                                       \
+        or      1,1,1;                                                  \
+##TYPE##_SECTION_ELSE_NESTED(95)                                        \
+        or      5,5,5;                                                  \
+ALT_##TYPE##_SECTION_END_NESTED(0, 1, 95)                               \
+        or      2,2,2;                                                  \
+##TYPE##_SECTION_ELSE                                                   \
+        or      31,31,31;                                               \
+BEGIN_##TYPE##_SECTION_NESTED(94)                                       \
+        or      5,5,5;                                                  \
+##TYPE##_SECTION_ELSE_NESTED(94)                                        \
+        or      1,1,1;                                                  \
+ALT_##TYPE##_SECTION_END_NESTED(0, 1, 94)                               \
+        or      31,31,31;                                               \
+ALT_##TYPE##_SECTION_END(0, 1)                                          \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nested alt sections, else can have large else case */        \
+BEGIN_##TYPE##_SECTION                                                  \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+##TYPE##_SECTION_ELSE                                                   \
+BEGIN_##TYPE##_SECTION_NESTED(94)                                       \
+        or      5,5,5;                                                  \
+        or      5,5,5;                                                  \
+        or      5,5,5;                                                  \
+        or      5,5,5;                                                  \
+##TYPE##_SECTION_ELSE_NESTED(94)                                        \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+ALT_##TYPE##_SECTION_END_NESTED(0, 1, 94)                               \
+ALT_##TYPE##_SECTION_END(0, 1)                                          \
+        or      1,1,1;                                                  \
+        or      1,1,1;
+
+#define MAKE_MACRO_TEST_EXPECTED(TYPE)                                  \
+globl(ftr_fixup_test_ ##TYPE##_macros_expected)                         \
+        or      1,1,1;                                                  \
+        /* Basic test, this section should all be nop'ed */             \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        nop;                                                            \
+        nop;                                                            \
+        nop;                                                            \
+/* END_##TYPE##_SECTION(0, 1) */                                        \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Basic test, this section should NOT be nop'ed */             \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+/* END_##TYPE##_SECTION(0, 0) */                                        \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nesting test, inner section should be nop'ed */              \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+/* BEGIN_##TYPE##_SECTION_NESTED(80) */                                 \
+        nop;                                                            \
+        nop;                                                            \
+/* END_##TYPE##_SECTION_NESTED(0, 1, 80) */                             \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+/* END_##TYPE##_SECTION(0, 0) */                                        \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nesting test, whole section should be nop'ed */              \
+        /* NB. inner section is not nop'ed, but then entire outer is */ \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        nop;                                                            \
+        nop;                                                            \
+/* BEGIN_##TYPE##_SECTION_NESTED(80) */                                 \
+        nop;                                                            \
+        nop;                                                            \
+/* END_##TYPE##_SECTION_NESTED(0, 0, 80) */                             \
+        nop;                                                            \
+        nop;                                                            \
+/* END_##TYPE##_SECTION(0, 1) */                                        \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nesting test, none should be nop'ed */                       \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+/* BEGIN_##TYPE##_SECTION_NESTED(80) */                                 \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+/* END_##TYPE##_SECTION_NESTED(0, 0, 80) */                             \
+        or      2,2,2;                                                  \
+        or      2,2,2;                                                  \
+/* END_##TYPE##_SECTION(0, 0) */                                        \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Basic alt section test, default case should be taken */      \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+/* ##TYPE##_SECTION_ELSE */                                             \
+        /* or   5,5,5; */                                               \
+        /* or   5,5,5; */                                               \
+/* ALT_##TYPE##_SECTION_END(0, 0) */                                    \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Basic alt section test, else case should be taken */         \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        /* or   3,3,3; */                                               \
+        /* or   3,3,3; */                                               \
+        /* or   3,3,3; */                                               \
+/* ##TYPE##_SECTION_ELSE */                                             \
+        or      31,31,31;                                               \
+        or      31,31,31;                                               \
+        or      31,31,31;                                               \
+/* ALT_##TYPE##_SECTION_END(0, 1) */                                    \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Alt with smaller else case, should be padded with nops */    \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        /* or   3,3,3; */                                               \
+        /* or   3,3,3; */                                               \
+        /* or   3,3,3; */                                               \
+/* ##TYPE##_SECTION_ELSE */                                             \
+        or      31,31,31;                                               \
+        nop;                                                            \
+        nop;                                                            \
+/* ALT_##TYPE##_SECTION_END(0, 1) */                                    \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Alt section with nested section in default case */           \
+        /* Default case should be taken, with nop'ed inner section */   \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        or      3,3,3;                                                  \
+/* BEGIN_##TYPE##_SECTION_NESTED(95) */                                 \
+        nop;                                                            \
+        nop;                                                            \
+/* END_##TYPE##_SECTION_NESTED(0, 1, 95) */                             \
+        or      3,3,3;                                                  \
+/* ##TYPE##_SECTION_ELSE */                                             \
+        /* or   2,2,2; */                                               \
+        /* or   2,2,2; */                                               \
+/* ALT_##TYPE##_SECTION_END(0, 0) */                                    \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Alt section with nested section in else, default taken */    \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+        or      3,3,3;                                                  \
+/* ##TYPE##_SECTION_ELSE */                                             \
+        /* or   5,5,5; */                                               \
+/* BEGIN_##TYPE##_SECTION_NESTED(95) */                                 \
+        /* or   3,3,3; */                                               \
+/* END_##TYPE##_SECTION_NESTED(0, 1, 95) */                             \
+        /* or   5,5,5; */                                               \
+/* ALT_##TYPE##_SECTION_END(0, 0) */                                    \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Alt section with nested section in else, else taken & nop */ \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        /* or   3,3,3; */                                               \
+        /* or   3,3,3; */                                               \
+        /* or   3,3,3; */                                               \
+/* ##TYPE##_SECTION_ELSE */                                             \
+        or      5,5,5;                                                  \
+/* BEGIN_##TYPE##_SECTION_NESTED(95) */                                 \
+        nop;                                                            \
+/* END_##TYPE##_SECTION_NESTED(0, 1, 95) */                             \
+        or      5,5,5;                                                  \
+/* ALT_##TYPE##_SECTION_END(0, 1) */                                    \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Feature section with nested alt section, default taken */    \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        or      2,2,2;                                                  \
+/* BEGIN_##TYPE##_SECTION_NESTED(95) */                                 \
+        or      1,1,1;                                                  \
+/* ##TYPE##_SECTION_ELSE_NESTED(95) */                                  \
+        /* or   5,5,5; */                                               \
+/* ALT_##TYPE##_SECTION_END_NESTED(0, 0, 95) */                         \
+        or      2,2,2;                                                  \
+/* END_##TYPE##_SECTION(0, 0) */                                        \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Feature section with nested alt section, else taken */       \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        or      2,2,2;                                                  \
+/* BEGIN_##TYPE##_SECTION_NESTED(95) */                                 \
+        /* or   1,1,1; */                                               \
+/* ##TYPE##_SECTION_ELSE_NESTED(95) */                                  \
+        or      5,5,5;                                                  \
+/* ALT_##TYPE##_SECTION_END_NESTED(0, 1, 95) */                         \
+        or      2,2,2;                                                  \
+/* END_##TYPE##_SECTION(0, 0) */                                        \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Feature section with nested alt section, all nop'ed */       \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        nop;                                                            \
+/* BEGIN_##TYPE##_SECTION_NESTED(95) */                                 \
+        nop;                                                            \
+/* ##TYPE##_SECTION_ELSE_NESTED(95) */                                  \
+        /* or   5,5,5; */                                               \
+/* ALT_##TYPE##_SECTION_END_NESTED(0, 0, 95) */                         \
+        nop;                                                            \
+/* END_##TYPE##_SECTION(0, 1) */                                        \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nested alt sections, default with inner default taken */     \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        or      2,2,2;                                                  \
+/* BEGIN_##TYPE##_SECTION_NESTED(95) */                                 \
+        or      1,1,1;                                                  \
+/* ##TYPE##_SECTION_ELSE_NESTED(95) */                                  \
+        /* or   5,5,5; */                                               \
+/* ALT_##TYPE##_SECTION_END_NESTED(0, 0, 95) */                         \
+        or      2,2,2;                                                  \
+/* ##TYPE##_SECTION_ELSE */                                             \
+        /* or   31,31,31; */                                            \
+/* BEGIN_##TYPE##_SECTION_NESTED(94) */                                 \
+        /* or   5,5,5; */                                               \
+/* ##TYPE##_SECTION_ELSE_NESTED(94) */                                  \
+        /* or   1,1,1; */                                               \
+/* ALT_##TYPE##_SECTION_END_NESTED(0, 0, 94) */                         \
+        /* or   31,31,31; */                                            \
+/* ALT_##TYPE##_SECTION_END(0, 0) */                                    \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nested alt sections, default with inner else taken */        \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        or      2,2,2;                                                  \
+/* BEGIN_##TYPE##_SECTION_NESTED(95) */                                 \
+        /* or   1,1,1; */                                               \
+/* ##TYPE##_SECTION_ELSE_NESTED(95) */                                  \
+        or      5,5,5;                                                  \
+/* ALT_##TYPE##_SECTION_END_NESTED(0, 1, 95) */                         \
+        or      2,2,2;                                                  \
+/* ##TYPE##_SECTION_ELSE */                                             \
+        /* or   31,31,31; */                                            \
+/* BEGIN_##TYPE##_SECTION_NESTED(94) */                                 \
+        /* or   5,5,5; */                                               \
+/* ##TYPE##_SECTION_ELSE_NESTED(94) */                                  \
+        /* or   1,1,1; */                                               \
+/* ALT_##TYPE##_SECTION_END_NESTED(0, 0, 94) */                         \
+        /* or   31,31,31; */                                            \
+/* ALT_##TYPE##_SECTION_END(0, 0) */                                    \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nested alt sections, else with inner default taken */        \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        /* or   2,2,2; */                                               \
+/* BEGIN_##TYPE##_SECTION_NESTED(95) */                                 \
+        /* or   1,1,1; */                                               \
+/* ##TYPE##_SECTION_ELSE_NESTED(95) */                                  \
+        /* or   5,5,5; */                                               \
+/* ALT_##TYPE##_SECTION_END_NESTED(0, 1, 95) */                         \
+        /* or   2,2,2; */                                               \
+/* ##TYPE##_SECTION_ELSE */                                             \
+        or      31,31,31;                                               \
+/* BEGIN_##TYPE##_SECTION_NESTED(94) */                                 \
+        or      5,5,5;                                                  \
+/* ##TYPE##_SECTION_ELSE_NESTED(94) */                                  \
+        /* or   1,1,1; */                                               \
+/* ALT_##TYPE##_SECTION_END_NESTED(0, 0, 94) */                         \
+        or      31,31,31;                                               \
+/* ALT_##TYPE##_SECTION_END(0, 1) */                                    \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nested alt sections, else with inner else taken */           \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        /* or   2,2,2; */                                               \
+/* BEGIN_##TYPE##_SECTION_NESTED(95) */                                 \
+        /* or   1,1,1; */                                               \
+/* ##TYPE##_SECTION_ELSE_NESTED(95) */                                  \
+        /* or   5,5,5; */                                               \
+/* ALT_##TYPE##_SECTION_END_NESTED(0, 1, 95) */                         \
+        /* or   2,2,2; */                                               \
+/* ##TYPE##_SECTION_ELSE */                                             \
+        or      31,31,31;                                               \
+/* BEGIN_##TYPE##_SECTION_NESTED(94) */                                 \
+        /* or   5,5,5; */                                               \
+/* ##TYPE##_SECTION_ELSE_NESTED(94) */                                  \
+        or      1,1,1;                                                  \
+/* ALT_##TYPE##_SECTION_END_NESTED(0, 1, 94) */                         \
+        or      31,31,31;                                               \
+/* ALT_##TYPE##_SECTION_END(0, 1) */                                    \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        /* Nested alt sections, else can have large else case */        \
+/* BEGIN_##TYPE##_SECTION */                                            \
+        /* or   2,2,2; */                                               \
+        /* or   2,2,2; */                                               \
+        /* or   2,2,2; */                                               \
+        /* or   2,2,2; */                                               \
+/* ##TYPE##_SECTION_ELSE */                                             \
+/* BEGIN_##TYPE##_SECTION_NESTED(94) */                                 \
+        /* or   5,5,5; */                                               \
+        /* or   5,5,5; */                                               \
+        /* or   5,5,5; */                                               \
+        /* or   5,5,5; */                                               \
+/* ##TYPE##_SECTION_ELSE_NESTED(94) */                                  \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+        or      1,1,1;                                                  \
+/* ALT_##TYPE##_SECTION_END_NESTED(0, 1, 94) */                         \
+/* ALT_##TYPE##_SECTION_END(0, 1) */                                    \
+        or      1,1,1;                                                  \
+        or      1,1,1;
+
+MAKE_MACRO_TEST(FTR);
+MAKE_MACRO_TEST_EXPECTED(FTR);
+
+#ifdef CONFIG_PPC64
+MAKE_MACRO_TEST(FW_FTR);
+MAKE_MACRO_TEST_EXPECTED(FW_FTR);
+#endif
+
+globl(lwsync_fixup_test)
+1:      or      1,1,1
+        LWSYNC
+globl(end_lwsync_fixup_test)
+
+globl(lwsync_fixup_test_expected_LWSYNC)
+1:      or      1,1,1
+        lwsync
+
+globl(lwsync_fixup_test_expected_SYNC)
+1:      or      1,1,1
+        sync
+
diff --git a/arch/powerpc/lib/feature-fixups.c b/arch/powerpc/lib/feature-fixups.c
new file mode 100644
index 000000000000..4e43702b9813
--- /dev/null
+++ b/arch/powerpc/lib/feature-fixups.c
@@ -0,0 +1,351 @@
+/*
+ *  Copyright (C) 2001 Ben. Herrenschmidt (benh@kernel.crashing.org)
+ *
+ *  Modifications for ppc64:
+ *      Copyright (C) 2003 Dave Engebretsen <engebret@us.ibm.com>
+ *
+ *  Copyright 2008 Michael Ellerman, IBM Corporation.
+ *
+ *  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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/string.h>
+#include <linux/init.h>
+#include <asm/cputable.h>
+#include <asm/code-patching.h>
+
+
+struct fixup_entry {
+        unsigned long   mask;
+        unsigned long   value;
+        long            start_off;
+        long            end_off;
+        long            alt_start_off;
+        long            alt_end_off;
+};
+
+static unsigned int *calc_addr(struct fixup_entry *fcur, long offset)
+{
+        /*
+         * We store the offset to the code as a negative offset from
+         * the start of the alt_entry, to support the VDSO. This
+         * routine converts that back into an actual address.
+         */
+        return (unsigned int *)((unsigned long)fcur + offset);
+}
+
+static int patch_alt_instruction(unsigned int *src, unsigned int *dest,
+                                 unsigned int *alt_start, unsigned int *alt_end)
+{
+        unsigned int instr;
+
+        instr = *src;
+
+        if (instr_is_relative_branch(*src)) {
+                unsigned int *target = (unsigned int *)branch_target(src);
+
+                /* Branch within the section doesn't need translating */
+                if (target < alt_start || target >= alt_end) {
+                        instr = translate_branch(dest, src);
+                        if (!instr)
+                                return 1;
+                }
+        }
+
+        patch_instruction(dest, instr);
+
+        return 0;
+}
+
+static int patch_feature_section(unsigned long value, struct fixup_entry *fcur)
+{
+        unsigned int *start, *end, *alt_start, *alt_end, *src, *dest;
+
+        start = calc_addr(fcur, fcur->start_off);
+        end = calc_addr(fcur, fcur->end_off);
+        alt_start = calc_addr(fcur, fcur->alt_start_off);
+        alt_end = calc_addr(fcur, fcur->alt_end_off);
+
+        if ((alt_end - alt_start) > (end - start))
+                return 1;
+
+        if ((value & fcur->mask) == fcur->value)
+                return 0;
+
+        src = alt_start;
+        dest = start;
+
+        for (; src < alt_end; src++, dest++) {
+                if (patch_alt_instruction(src, dest, alt_start, alt_end))
+                        return 1;
+        }
+
+        for (; dest < end; dest++)
+                patch_instruction(dest, PPC_NOP_INSTR);
+
+        return 0;
+}
+
+void do_feature_fixups(unsigned long value, void *fixup_start, void *fixup_end)
+{
+        struct fixup_entry *fcur, *fend;
+
+        fcur = fixup_start;
+        fend = fixup_end;
+
+        for (; fcur < fend; fcur++) {
+                if (patch_feature_section(value, fcur)) {
+                        __WARN();
+                        printk("Unable to patch feature section at %p - %p" \
+                                " with %p - %p\n",
+                                calc_addr(fcur, fcur->start_off),
+                                calc_addr(fcur, fcur->end_off),
+                                calc_addr(fcur, fcur->alt_start_off),
+                                calc_addr(fcur, fcur->alt_end_off));
+                }
+        }
+}
+
+void do_lwsync_fixups(unsigned long value, void *fixup_start, void *fixup_end)
+{
+        unsigned int *start, *end, *dest;
+
+        if (!(value & CPU_FTR_LWSYNC))
+                return ;
+
+        start = fixup_start;
+        end = fixup_end;
+
+        for (; start < end; start++) {
+                dest = (void *)start + *start;
+                patch_instruction(dest, PPC_LWSYNC_INSTR);
+        }
+}
+
+#ifdef CONFIG_FTR_FIXUP_SELFTEST
+
+#define check(x)        \
+        if (!(x)) printk("feature-fixups: test failed at line %d\n", __LINE__);
+
+/* This must be after the text it fixes up, vmlinux.lds.S enforces that atm */
+static struct fixup_entry fixup;
+
+static long calc_offset(struct fixup_entry *entry, unsigned int *p)
+{
+        return (unsigned long)p - (unsigned long)entry;
+}
+
+void test_basic_patching(void)
+{
+        extern unsigned int ftr_fixup_test1;
+        extern unsigned int end_ftr_fixup_test1;
+        extern unsigned int ftr_fixup_test1_orig;
+        extern unsigned int ftr_fixup_test1_expected;
+        int size = &end_ftr_fixup_test1 - &ftr_fixup_test1;
+
+        fixup.value = fixup.mask = 8;
+        fixup.start_off = calc_offset(&fixup, &ftr_fixup_test1 + 1);
+        fixup.end_off = calc_offset(&fixup, &ftr_fixup_test1 + 2);
+        fixup.alt_start_off = fixup.alt_end_off = 0;
+
+        /* Sanity check */
+        check(memcmp(&ftr_fixup_test1, &ftr_fixup_test1_orig, size) == 0);
+
+        /* Check we don't patch if the value matches */
+        patch_feature_section(8, &fixup);
+        check(memcmp(&ftr_fixup_test1, &ftr_fixup_test1_orig, size) == 0);
+
+        /* Check we do patch if the value doesn't match */
+        patch_feature_section(0, &fixup);
+        check(memcmp(&ftr_fixup_test1, &ftr_fixup_test1_expected, size) == 0);
+
+        /* Check we do patch if the mask doesn't match */
+        memcpy(&ftr_fixup_test1, &ftr_fixup_test1_orig, size);
+        check(memcmp(&ftr_fixup_test1, &ftr_fixup_test1_orig, size) == 0);
+        patch_feature_section(~8, &fixup);
+        check(memcmp(&ftr_fixup_test1, &ftr_fixup_test1_expected, size) == 0);
+}
+
+static void test_alternative_patching(void)
+{
+        extern unsigned int ftr_fixup_test2;
+        extern unsigned int end_ftr_fixup_test2;
+        extern unsigned int ftr_fixup_test2_orig;
+        extern unsigned int ftr_fixup_test2_alt;
+        extern unsigned int ftr_fixup_test2_expected;
+        int size = &end_ftr_fixup_test2 - &ftr_fixup_test2;
+
+        fixup.value = fixup.mask = 0xF;
+        fixup.start_off = calc_offset(&fixup, &ftr_fixup_test2 + 1);
+        fixup.end_off = calc_offset(&fixup, &ftr_fixup_test2 + 2);
+        fixup.alt_start_off = calc_offset(&fixup, &ftr_fixup_test2_alt);
+        fixup.alt_end_off = calc_offset(&fixup, &ftr_fixup_test2_alt + 1);
+
+        /* Sanity check */
+        check(memcmp(&ftr_fixup_test2, &ftr_fixup_test2_orig, size) == 0);
+
+        /* Check we don't patch if the value matches */
+        patch_feature_section(0xF, &fixup);
+        check(memcmp(&ftr_fixup_test2, &ftr_fixup_test2_orig, size) == 0);
+
+        /* Check we do patch if the value doesn't match */
+        patch_feature_section(0, &fixup);
+        check(memcmp(&ftr_fixup_test2, &ftr_fixup_test2_expected, size) == 0);
+
+        /* Check we do patch if the mask doesn't match */
+        memcpy(&ftr_fixup_test2, &ftr_fixup_test2_orig, size);
+        check(memcmp(&ftr_fixup_test2, &ftr_fixup_test2_orig, size) == 0);
+        patch_feature_section(~0xF, &fixup);
+        check(memcmp(&ftr_fixup_test2, &ftr_fixup_test2_expected, size) == 0);
+}
+
+static void test_alternative_case_too_big(void)
+{
+        extern unsigned int ftr_fixup_test3;
+        extern unsigned int end_ftr_fixup_test3;
+        extern unsigned int ftr_fixup_test3_orig;
+        extern unsigned int ftr_fixup_test3_alt;
+        int size = &end_ftr_fixup_test3 - &ftr_fixup_test3;
+
+        fixup.value = fixup.mask = 0xC;
+        fixup.start_off = calc_offset(&fixup, &ftr_fixup_test3 + 1);
+        fixup.end_off = calc_offset(&fixup, &ftr_fixup_test3 + 2);
+        fixup.alt_start_off = calc_offset(&fixup, &ftr_fixup_test3_alt);
+        fixup.alt_end_off = calc_offset(&fixup, &ftr_fixup_test3_alt + 2);
+
+        /* Sanity check */
+        check(memcmp(&ftr_fixup_test3, &ftr_fixup_test3_orig, size) == 0);
+
+        /* Expect nothing to be patched, and the error returned to us */
+        check(patch_feature_section(0xF, &fixup) == 1);
+        check(memcmp(&ftr_fixup_test3, &ftr_fixup_test3_orig, size) == 0);
+        check(patch_feature_section(0, &fixup) == 1);
+        check(memcmp(&ftr_fixup_test3, &ftr_fixup_test3_orig, size) == 0);
+        check(patch_feature_section(~0xF, &fixup) == 1);
+        check(memcmp(&ftr_fixup_test3, &ftr_fixup_test3_orig, size) == 0);
+}
+
+static void test_alternative_case_too_small(void)
+{
+        extern unsigned int ftr_fixup_test4;
+        extern unsigned int end_ftr_fixup_test4;
+        extern unsigned int ftr_fixup_test4_orig;
+        extern unsigned int ftr_fixup_test4_alt;
+        extern unsigned int ftr_fixup_test4_expected;
+        int size = &end_ftr_fixup_test4 - &ftr_fixup_test4;
+        unsigned long flag;
+
+        /* Check a high-bit flag */
+        flag = 1UL << ((sizeof(unsigned long) - 1) * 8);
+        fixup.value = fixup.mask = flag;
+        fixup.start_off = calc_offset(&fixup, &ftr_fixup_test4 + 1);
+        fixup.end_off = calc_offset(&fixup, &ftr_fixup_test4 + 5);
+        fixup.alt_start_off = calc_offset(&fixup, &ftr_fixup_test4_alt);
+        fixup.alt_end_off = calc_offset(&fixup, &ftr_fixup_test4_alt + 2);
+
+        /* Sanity check */
+        check(memcmp(&ftr_fixup_test4, &ftr_fixup_test4_orig, size) == 0);
+
+        /* Check we don't patch if the value matches */
+        patch_feature_section(flag, &fixup);
+        check(memcmp(&ftr_fixup_test4, &ftr_fixup_test4_orig, size) == 0);
+
+        /* Check we do patch if the value doesn't match */
+        patch_feature_section(0, &fixup);
+        check(memcmp(&ftr_fixup_test4, &ftr_fixup_test4_expected, size) == 0);
+
+        /* Check we do patch if the mask doesn't match */
+        memcpy(&ftr_fixup_test4, &ftr_fixup_test4_orig, size);
+        check(memcmp(&ftr_fixup_test4, &ftr_fixup_test4_orig, size) == 0);
+        patch_feature_section(~flag, &fixup);
+        check(memcmp(&ftr_fixup_test4, &ftr_fixup_test4_expected, size) == 0);
+}
+
+static void test_alternative_case_with_branch(void)
+{
+        extern unsigned int ftr_fixup_test5;
+        extern unsigned int end_ftr_fixup_test5;
+        extern unsigned int ftr_fixup_test5_expected;
+        int size = &end_ftr_fixup_test5 - &ftr_fixup_test5;
+
+        check(memcmp(&ftr_fixup_test5, &ftr_fixup_test5_expected, size) == 0);
+}
+
+static void test_alternative_case_with_external_branch(void)
+{
+        extern unsigned int ftr_fixup_test6;
+        extern unsigned int end_ftr_fixup_test6;
+        extern unsigned int ftr_fixup_test6_expected;
+        int size = &end_ftr_fixup_test6 - &ftr_fixup_test6;
+
+        check(memcmp(&ftr_fixup_test6, &ftr_fixup_test6_expected, size) == 0);
+}
+
+static void test_cpu_macros(void)
+{
+        extern void ftr_fixup_test_FTR_macros;
+        extern void ftr_fixup_test_FTR_macros_expected;
+        unsigned long size = &ftr_fixup_test_FTR_macros_expected -
+                             &ftr_fixup_test_FTR_macros;
+
+        /* The fixups have already been done for us during boot */
+        check(memcmp(&ftr_fixup_test_FTR_macros,
+                     &ftr_fixup_test_FTR_macros_expected, size) == 0);
+}
+
+static void test_fw_macros(void)
+{
+#ifdef CONFIG_PPC64
+        extern void ftr_fixup_test_FW_FTR_macros;
+        extern void ftr_fixup_test_FW_FTR_macros_expected;
+        unsigned long size = &ftr_fixup_test_FW_FTR_macros_expected -
+                             &ftr_fixup_test_FW_FTR_macros;
+
+        /* The fixups have already been done for us during boot */
+        check(memcmp(&ftr_fixup_test_FW_FTR_macros,
+                     &ftr_fixup_test_FW_FTR_macros_expected, size) == 0);
+#endif
+}
+
+static void test_lwsync_macros(void)
+{
+        extern void lwsync_fixup_test;
+        extern void end_lwsync_fixup_test;
+        extern void lwsync_fixup_test_expected_LWSYNC;
+        extern void lwsync_fixup_test_expected_SYNC;
+        unsigned long size = &end_lwsync_fixup_test -
+                             &lwsync_fixup_test;
+
+        /* The fixups have already been done for us during boot */
+        if (cur_cpu_spec->cpu_features & CPU_FTR_LWSYNC) {
+                check(memcmp(&lwsync_fixup_test,
+                             &lwsync_fixup_test_expected_LWSYNC, size) == 0);
+        } else {
+                check(memcmp(&lwsync_fixup_test,
+                             &lwsync_fixup_test_expected_SYNC, size) == 0);
+        }
+}
+
+static int __init test_feature_fixups(void)
+{
+        printk(KERN_DEBUG "Running feature fixup self-tests ...\n");
+
+        test_basic_patching();
+        test_alternative_patching();
+        test_alternative_case_too_big();
+        test_alternative_case_too_small();
+        test_alternative_case_with_branch();
+        test_alternative_case_with_external_branch();
+        test_cpu_macros();
+        test_fw_macros();
+        test_lwsync_macros();
+
+        return 0;
+}
+late_initcall(test_feature_fixups);
+
+#endif /* CONFIG_FTR_FIXUP_SELFTEST */
diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c
index 381306bb1590..29e545e0272e 100644
--- a/arch/powerpc/math-emu/math.c
+++ b/arch/powerpc/math-emu/math.c
@@ -230,14 +230,14 @@ do_mathemu(struct pt_regs *regs)
         case LFD:
                 idx = (insn >> 16) & 0x1f;
                 sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
                 op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
                 lfd(op0, op1, op2, op3);
                 break;
         case LFDU:
                 idx = (insn >> 16) & 0x1f;
                 sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
                 op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
                 lfd(op0, op1, op2, op3);
                 regs->gpr[idx] = (unsigned long)op1;
@@ -245,21 +245,21 @@ do_mathemu(struct pt_regs *regs)
         case STFD:
                 idx = (insn >> 16) & 0x1f;
                 sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
                 op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
                 stfd(op0, op1, op2, op3);
                 break;
         case STFDU:
                 idx = (insn >> 16) & 0x1f;
                 sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
                 op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
                 stfd(op0, op1, op2, op3);
                 regs->gpr[idx] = (unsigned long)op1;
                 break;
         case OP63:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)&current->thread.fpr[(insn >> 11) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
+                op1 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
                 fmr(op0, op1, op2, op3);
                 break;
         default:
@@ -356,28 +356,28 @@ do_mathemu(struct pt_regs *regs)
 
         switch (type) {
         case AB:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)&current->thread.fpr[(insn >> 16) & 0x1f];
-                op2 = (void *)&current->thread.fpr[(insn >> 11) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
+                op1 = (void *)&current->thread.TS_FPR((insn >> 16) & 0x1f);
+                op2 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
                 break;
 
         case AC:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)&current->thread.fpr[(insn >> 16) & 0x1f];
-                op2 = (void *)&current->thread.fpr[(insn >>  6) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
+                op1 = (void *)&current->thread.TS_FPR((insn >> 16) & 0x1f);
+                op2 = (void *)&current->thread.TS_FPR((insn >>  6) & 0x1f);
                 break;
 
         case ABC:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)&current->thread.fpr[(insn >> 16) & 0x1f];
-                op2 = (void *)&current->thread.fpr[(insn >> 11) & 0x1f];
-                op3 = (void *)&current->thread.fpr[(insn >>  6) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
+                op1 = (void *)&current->thread.TS_FPR((insn >> 16) & 0x1f);
+                op2 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
+                op3 = (void *)&current->thread.TS_FPR((insn >>  6) & 0x1f);
                 break;
 
         case D:
                 idx = (insn >> 16) & 0x1f;
                 sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
                 op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
                 break;
 
@@ -387,27 +387,27 @@ do_mathemu(struct pt_regs *regs)
                         goto illegal;
 
                 sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
                 op1 = (void *)(regs->gpr[idx] + sdisp);
                 break;
 
         case X:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
                 break;
 
         case XA:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)&current->thread.fpr[(insn >> 16) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
+                op1 = (void *)&current->thread.TS_FPR((insn >> 16) & 0x1f);
                 break;
 
         case XB:
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
-                op1 = (void *)&current->thread.fpr[(insn >> 11) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
+                op1 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
                 break;
 
         case XE:
                 idx = (insn >> 16) & 0x1f;
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
                 if (!idx) {
                         if (((insn >> 1) & 0x3ff) == STFIWX)
                                 op1 = (void *)(regs->gpr[(insn >> 11) & 0x1f]);
@@ -421,7 +421,7 @@ do_mathemu(struct pt_regs *regs)
 
         case XEU:
                 idx = (insn >> 16) & 0x1f;
-                op0 = (void *)&current->thread.fpr[(insn >> 21) & 0x1f];
+                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
                 op1 = (void *)((idx ? regs->gpr[idx] : 0)
                                 + regs->gpr[(insn >> 11) & 0x1f]);
                 break;
@@ -429,8 +429,8 @@ do_mathemu(struct pt_regs *regs)
         case XCR:
                 op0 = (void *)&regs->ccr;
                 op1 = (void *)((insn >> 23) & 0x7);
-                op2 = (void *)&current->thread.fpr[(insn >> 16) & 0x1f];
-                op3 = (void *)&current->thread.fpr[(insn >> 11) & 0x1f];
+                op2 = (void *)&current->thread.TS_FPR((insn >> 16) & 0x1f);
+                op3 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
                 break;
 
         case XCRL:
@@ -450,7 +450,7 @@ do_mathemu(struct pt_regs *regs)
 
         case XFLB:
                 op0 = (void *)((insn >> 17) & 0xff);
-                op1 = (void *)&current->thread.fpr[(insn >> 11) & 0x1f];
+                op1 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
                 break;
 
         default:
diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/44x_mmu.c
index 953fb919eb06..98052ac96580 100644
--- a/arch/powerpc/mm/44x_mmu.c
+++ b/arch/powerpc/mm/44x_mmu.c
@@ -27,6 +27,7 @@
 #include <asm/mmu.h>
 #include <asm/system.h>
 #include <asm/page.h>
+#include <asm/cacheflush.h>
 
 #include "mmu_decl.h"
 
@@ -37,11 +38,35 @@ unsigned int tlb_44x_index; /* = 0 */
 unsigned int tlb_44x_hwater = PPC44x_TLB_SIZE - 1 - PPC44x_EARLY_TLBS;
 int icache_44x_need_flush;
 
+static void __init ppc44x_update_tlb_hwater(void)
+{
+        extern unsigned int tlb_44x_patch_hwater_D[];
+        extern unsigned int tlb_44x_patch_hwater_I[];
+
+        /* The TLB miss handlers hard codes the watermark in a cmpli
+         * instruction to improve performances rather than loading it
+         * from the global variable. Thus, we patch the instructions
+         * in the 2 TLB miss handlers when updating the value
+         */
+        tlb_44x_patch_hwater_D[0] = (tlb_44x_patch_hwater_D[0] & 0xffff0000) |
+                tlb_44x_hwater;
+        flush_icache_range((unsigned long)&tlb_44x_patch_hwater_D[0],
+                           (unsigned long)&tlb_44x_patch_hwater_D[1]);
+        tlb_44x_patch_hwater_I[0] = (tlb_44x_patch_hwater_I[0] & 0xffff0000) |
+                tlb_44x_hwater;
+        flush_icache_range((unsigned long)&tlb_44x_patch_hwater_I[0],
+                           (unsigned long)&tlb_44x_patch_hwater_I[1]);
+}
+
 /*
  * "Pins" a 256MB TLB entry in AS0 for kernel lowmem
  */
 static void __init ppc44x_pin_tlb(unsigned int virt, unsigned int phys)
 {
+        unsigned int entry = tlb_44x_hwater--;
+
+        ppc44x_update_tlb_hwater();
+
         __asm__ __volatile__(
                 "tlbwe  %2,%3,%4\n"
                 "tlbwe  %1,%3,%5\n"
@@ -50,7 +75,7 @@ static void __init ppc44x_pin_tlb(unsigned int virt, unsigned int phys)
         : "r" (PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_SX | PPC44x_TLB_G),
           "r" (phys),
           "r" (virt | PPC44x_TLB_VALID | PPC44x_TLB_256M),
-          "r" (tlb_44x_hwater--), /* slot for this TLB entry */
+          "r" (entry),
           "i" (PPC44x_TLB_PAGEID),
           "i" (PPC44x_TLB_XLAT),
           "i" (PPC44x_TLB_ATTRIB));
@@ -58,6 +83,8 @@ static void __init ppc44x_pin_tlb(unsigned int virt, unsigned int phys)
 
 void __init MMU_init_hw(void)
 {
+        ppc44x_update_tlb_hwater();
+
         flush_instruction_cache();
 }
 
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 7b2510799266..1707d00331fc 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -306,7 +306,8 @@ good_area:
                                         flush_dcache_icache_page(page);
                                         set_bit(PG_arch_1, &page->flags);
                                 }
-                                pte_update(ptep, 0, _PAGE_HWEXEC);
+                                pte_update(ptep, 0, _PAGE_HWEXEC |
+                                           _PAGE_ACCESSED);
                                 _tlbie(address, mm->context.id);
                                 pte_unmap_unlock(ptep, ptl);
                                 up_read(&mm->mmap_sem);
diff --git a/arch/powerpc/mm/hash_low_64.S b/arch/powerpc/mm/hash_low_64.S
index 70f4c833fa32..a719f53921a5 100644
--- a/arch/powerpc/mm/hash_low_64.S
+++ b/arch/powerpc/mm/hash_low_64.S
@@ -388,7 +388,7 @@ _GLOBAL(__hash_page_4K)
          */
         rlwinm  r30,r4,32-9+7,31-7,31-7 /* _PAGE_RW -> _PAGE_DIRTY */
         or      r30,r30,r31
-        ori     r30,r30,_PAGE_BUSY | _PAGE_ACCESSED | _PAGE_HASHPTE
+        ori     r30,r30,_PAGE_BUSY | _PAGE_ACCESSED
         oris    r30,r30,_PAGE_COMBO@h
         /* Write the linux PTE atomically (setting busy) */
         stdcx.  r30,0,r6
@@ -468,7 +468,7 @@ END_FTR_SECTION(CPU_FTR_NOEXECUTE|CPU_FTR_COHERENT_ICACHE, CPU_FTR_NOEXECUTE)
          * go to out-of-line code to try to modify the HPTE. We look for
          * the bit at (1 >> (index + 32))
          */
-        andi.   r0,r31,_PAGE_HASHPTE
+        rldicl. r0,r31,64-12,48
         li      r26,0                   /* Default hidx */
         beq     htab_insert_pte
 
@@ -726,11 +726,11 @@ BEGIN_FTR_SECTION
         bne-    ht64_bail_ok
 END_FTR_SECTION_IFCLR(CPU_FTR_CI_LARGE_PAGE)
         /* Prepare new PTE value (turn access RW into DIRTY, then
-         * add BUSY,HASHPTE and ACCESSED)
+         * add BUSY and ACCESSED)
          */
         rlwinm  r30,r4,32-9+7,31-7,31-7 /* _PAGE_RW -> _PAGE_DIRTY */
         or      r30,r30,r31
-        ori     r30,r30,_PAGE_BUSY | _PAGE_ACCESSED | _PAGE_HASHPTE
+        ori     r30,r30,_PAGE_BUSY | _PAGE_ACCESSED
         /* Write the linux PTE atomically (setting busy) */
         stdcx.  r30,0,r6
         bne-    1b
@@ -798,18 +798,21 @@ END_FTR_SECTION(CPU_FTR_NOEXECUTE|CPU_FTR_COHERENT_ICACHE, CPU_FTR_NOEXECUTE)
         /* Check if we may already be in the hashtable, in this case, we
          * go to out-of-line code to try to modify the HPTE
          */
-        andi.   r0,r31,_PAGE_HASHPTE
+        rldicl. r0,r31,64-12,48
         bne     ht64_modify_pte
 
 ht64_insert_pte:
         /* Clear hpte bits in new pte (we also clear BUSY btw) and
-         * add _PAGE_HASHPTE
+         * add _PAGE_HPTE_SUB0
          */
         lis     r0,_PAGE_HPTEFLAGS@h
         ori     r0,r0,_PAGE_HPTEFLAGS@l
         andc    r30,r30,r0
+#ifdef CONFIG_PPC_64K_PAGES
+        oris    r30,r30,_PAGE_HPTE_SUB0@h
+#else
         ori     r30,r30,_PAGE_HASHPTE
-
+#endif
         /* Phyical address in r5 */
         rldicl  r5,r31,64-PTE_RPN_SHIFT,PTE_RPN_SHIFT
         sldi    r5,r5,PAGE_SHIFT
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 0f2d239d94c4..8d3b58ebd38e 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -120,7 +120,7 @@ static DEFINE_SPINLOCK(linear_map_hash_lock);
 
 /* Pre-POWER4 CPUs (4k pages only)
  */
-struct mmu_psize_def mmu_psize_defaults_old[] = {
+static struct mmu_psize_def mmu_psize_defaults_old[] = {
         [MMU_PAGE_4K] = {
                 .shift  = 12,
                 .sllp   = 0,
@@ -134,7 +134,7 @@ struct mmu_psize_def mmu_psize_defaults_old[] = {
  *
  * Support for 16Mb large pages
  */
-struct mmu_psize_def mmu_psize_defaults_gp[] = {
+static struct mmu_psize_def mmu_psize_defaults_gp[] = {
         [MMU_PAGE_4K] = {
                 .shift  = 12,
                 .sllp   = 0,
@@ -533,8 +533,6 @@ void __init htab_initialize(void)
         unsigned long base = 0, size = 0, limit;
         int i;
 
-        extern unsigned long tce_alloc_start, tce_alloc_end;
-
         DBG(" -> htab_initialize()\n");
 
         /* Initialize segment sizes */
@@ -697,6 +695,28 @@ unsigned int hash_page_do_lazy_icache(unsigned int pp, pte_t pte, int trap)
         return pp;
 }
 
+#ifdef CONFIG_PPC_MM_SLICES
+unsigned int get_paca_psize(unsigned long addr)
+{
+        unsigned long index, slices;
+
+        if (addr < SLICE_LOW_TOP) {
+                slices = get_paca()->context.low_slices_psize;
+                index = GET_LOW_SLICE_INDEX(addr);
+        } else {
+                slices = get_paca()->context.high_slices_psize;
+                index = GET_HIGH_SLICE_INDEX(addr);
+        }
+        return (slices >> (index * 4)) & 0xF;
+}
+
+#else
+unsigned int get_paca_psize(unsigned long addr)
+{
+        return get_paca()->context.user_psize;
+}
+#endif
+
 /*
  * Demote a segment to using 4k pages.
  * For now this makes the whole process use 4k pages.
@@ -704,13 +724,13 @@ unsigned int hash_page_do_lazy_icache(unsigned int pp, pte_t pte, int trap)
 #ifdef CONFIG_PPC_64K_PAGES
 void demote_segment_4k(struct mm_struct *mm, unsigned long addr)
 {
-        if (mm->context.user_psize == MMU_PAGE_4K)
+        if (get_slice_psize(mm, addr) == MMU_PAGE_4K)
                 return;
-        slice_set_user_psize(mm, MMU_PAGE_4K);
+        slice_set_range_psize(mm, addr, 1, MMU_PAGE_4K);
 #ifdef CONFIG_SPU_BASE
         spu_flush_all_slbs(mm);
 #endif
-        if (get_paca()->context.user_psize != MMU_PAGE_4K) {
+        if (get_paca_psize(addr) != MMU_PAGE_4K) {
                 get_paca()->context = mm->context;
                 slb_flush_and_rebolt();
         }
@@ -794,11 +814,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)
                         DBG_LOW(" user region with no mm !\n");
                         return 1;
                 }
-#ifdef CONFIG_PPC_MM_SLICES
                 psize = get_slice_psize(mm, ea);
-#else
-                psize = mm->context.user_psize;
-#endif
                 ssize = user_segment_size(ea);
                 vsid = get_vsid(mm->context.id, ea, ssize);
                 break;
@@ -870,7 +886,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)
         /* Do actual hashing */
 #ifdef CONFIG_PPC_64K_PAGES
         /* If _PAGE_4K_PFN is set, make sure this is a 4k segment */
-        if (pte_val(*ptep) & _PAGE_4K_PFN) {
+        if ((pte_val(*ptep) & _PAGE_4K_PFN) && psize == MMU_PAGE_64K) {
                 demote_segment_4k(mm, ea);
                 psize = MMU_PAGE_4K;
         }
@@ -899,7 +915,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)
                 }
         }
         if (user_region) {
-                if (psize != get_paca()->context.user_psize) {
+                if (psize != get_paca_psize(ea)) {
                         get_paca()->context = mm->context;
                         slb_flush_and_rebolt();
                 }
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index a02266dad215..0d12fba31bc5 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -458,8 +458,7 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access,
                 old_pte = pte_val(*ptep);
                 if (old_pte & _PAGE_BUSY)
                         goto out;
-                new_pte = old_pte | _PAGE_BUSY |
-                        _PAGE_ACCESSED | _PAGE_HASHPTE;
+                new_pte = old_pte | _PAGE_BUSY | _PAGE_ACCESSED;
         } while(old_pte != __cmpxchg_u64((unsigned long *)ptep,
                                          old_pte, new_pte));
 
@@ -499,12 +498,14 @@ repeat:
                               HPTES_PER_GROUP) & ~0x7UL;
 
                 /* clear HPTE slot informations in new PTE */
+#ifdef CONFIG_PPC_64K_PAGES
+                new_pte = (new_pte & ~_PAGE_HPTEFLAGS) | _PAGE_HPTE_SUB0;
+#else
                 new_pte = (new_pte & ~_PAGE_HPTEFLAGS) | _PAGE_HASHPTE;
-
+#endif
                 /* Add in WIMG bits */
-                /* XXX We should store these in the pte */
-                /* --BenH: I think they are ... */
-                rflags |= _PAGE_COHERENT;
+                rflags |= (new_pte & (_PAGE_WRITETHRU | _PAGE_NO_CACHE |
+                                      _PAGE_COHERENT | _PAGE_GUARDED));
 
                 /* Insert into the hash table, primary slot */
                 slot = ppc_md.hpte_insert(hpte_group, va, pa, rflags, 0,
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index 1952b4d3fa7f..388ceda632f3 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -43,6 +43,7 @@
 #include <asm/btext.h>
 #include <asm/tlb.h>
 #include <asm/sections.h>
+#include <asm/system.h>
 
 #include "mmu_decl.h"
 
@@ -56,8 +57,8 @@
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
-unsigned long total_memory;
-unsigned long total_lowmem;
+phys_addr_t total_memory;
+phys_addr_t total_lowmem;
 
 phys_addr_t memstart_addr = (phys_addr_t)~0ull;
 EXPORT_SYMBOL(memstart_addr);
@@ -76,8 +77,6 @@ void MMU_init(void);
 /* XXX should be in current.h  -- paulus */
 extern struct task_struct *current_set[NR_CPUS];
 
-extern int init_bootmem_done;
-
 /*
  * this tells the system to map all of ram with the segregs
  * (i.e. page tables) instead of the bats.
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 6aa65375abf5..6ef63caca682 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -185,7 +185,7 @@ void pgtable_cache_init(void)
  * do this by hand as the proffered address may not be correctly aligned.
  * Subtraction of non-aligned pointers produces undefined results.
  */
-unsigned long __meminit vmemmap_section_start(unsigned long page)
+static unsigned long __meminit vmemmap_section_start(unsigned long page)
 {
         unsigned long offset = page - ((unsigned long)(vmemmap));
 
@@ -198,7 +198,7 @@ unsigned long __meminit vmemmap_section_start(unsigned long page)
  * which overlaps this vmemmap page is initialised then this page is
  * initialised already.
  */
-int __meminit vmemmap_populated(unsigned long start, int page_size)
+static int __meminit vmemmap_populated(unsigned long start, int page_size)
 {
         unsigned long end = start + page_size;
 
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 51f82d83bf14..1ca2235f0965 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -44,6 +44,7 @@
 #include <asm/btext.h>
 #include <asm/tlb.h>
 #include <asm/sections.h>
+#include <asm/sparsemem.h>
 #include <asm/vdso.h>
 #include <asm/fixmap.h>
 
@@ -329,7 +330,7 @@ static int __init mark_nonram_nosave(void)
 void __init paging_init(void)
 {
         unsigned long total_ram = lmb_phys_mem_size();
-        unsigned long top_of_ram = lmb_end_of_DRAM();
+        phys_addr_t top_of_ram = lmb_end_of_DRAM();
         unsigned long max_zone_pfns[MAX_NR_ZONES];
 
 #ifdef CONFIG_PPC32
@@ -348,10 +349,10 @@ void __init paging_init(void)
         kmap_prot = PAGE_KERNEL;
 #endif /* CONFIG_HIGHMEM */
 
-        printk(KERN_DEBUG "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",
-               top_of_ram, total_ram);
+        printk(KERN_DEBUG "Top of RAM: 0x%llx, Total RAM: 0x%lx\n",
+               (u64)top_of_ram, total_ram);
         printk(KERN_DEBUG "Memory hole size: %ldMB\n",
-               (top_of_ram - total_ram) >> 20);
+               (long int)((top_of_ram - total_ram) >> 20));
         memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
 #ifdef CONFIG_HIGHMEM
         max_zone_pfns[ZONE_DMA] = lowmem_end_addr >> PAGE_SHIFT;
diff --git a/arch/powerpc/mm/mmu_decl.h b/arch/powerpc/mm/mmu_decl.h
index 04802252a64f..fab3cfad4099 100644
--- a/arch/powerpc/mm/mmu_decl.h
+++ b/arch/powerpc/mm/mmu_decl.h
@@ -29,7 +29,7 @@ extern void hash_preload(struct mm_struct *mm, unsigned long ea,
 #ifdef CONFIG_PPC32
 extern void mapin_ram(void);
 extern int map_page(unsigned long va, phys_addr_t pa, int flags);
-extern void setbat(int index, unsigned long virt, unsigned long phys,
+extern void setbat(int index, unsigned long virt, phys_addr_t phys,
                    unsigned int size, int flags);
 extern void settlbcam(int index, unsigned long virt, phys_addr_t phys,
                       unsigned int size, int flags, unsigned int pid);
@@ -49,8 +49,8 @@ extern unsigned int num_tlbcam_entries;
 extern unsigned long ioremap_bot;
 extern unsigned long __max_low_memory;
 extern phys_addr_t __initial_memory_limit_addr;
-extern unsigned long total_memory;
-extern unsigned long total_lowmem;
+extern phys_addr_t total_memory;
+extern phys_addr_t total_lowmem;
 extern phys_addr_t memstart_addr;
 extern phys_addr_t lowmem_end_addr;
 
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index dc704da363eb..cf4bffba6f7c 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -268,6 +268,144 @@ static unsigned long __devinit read_n_cells(int n, const unsigned int **buf)
         return result;
 }
 
+struct of_drconf_cell {
+        u64     base_addr;
+        u32     drc_index;
+        u32     reserved;
+        u32     aa_index;
+        u32     flags;
+};
+
+#define DRCONF_MEM_ASSIGNED     0x00000008
+#define DRCONF_MEM_AI_INVALID   0x00000040
+#define DRCONF_MEM_RESERVED     0x00000080
+
+/*
+ * Read the next lmb list entry from the ibm,dynamic-memory property
+ * and return the information in the provided of_drconf_cell structure.
+ */
+static void read_drconf_cell(struct of_drconf_cell *drmem, const u32 **cellp)
+{
+        const u32 *cp;
+
+        drmem->base_addr = read_n_cells(n_mem_addr_cells, cellp);
+
+        cp = *cellp;
+        drmem->drc_index = cp[0];
+        drmem->reserved = cp[1];
+        drmem->aa_index = cp[2];
+        drmem->flags = cp[3];
+
+        *cellp = cp + 4;
+}
+
+/*
+ * Retreive and validate the ibm,dynamic-memory property of the device tree.
+ *
+ * The layout of the ibm,dynamic-memory property is a number N of lmb
+ * list entries followed by N lmb list entries.  Each lmb list entry
+ * contains information as layed out in the of_drconf_cell struct above.
+ */
+static int of_get_drconf_memory(struct device_node *memory, const u32 **dm)
+{
+        const u32 *prop;
+        u32 len, entries;
+
+        prop = of_get_property(memory, "ibm,dynamic-memory", &len);
+        if (!prop || len < sizeof(unsigned int))
+                return 0;
+
+        entries = *prop++;
+
+        /* Now that we know the number of entries, revalidate the size
+         * of the property read in to ensure we have everything
+         */
+        if (len < (entries * (n_mem_addr_cells + 4) + 1) * sizeof(unsigned int))
+                return 0;
+
+        *dm = prop;
+        return entries;
+}
+
+/*
+ * Retreive and validate the ibm,lmb-size property for drconf memory
+ * from the device tree.
+ */
+static u64 of_get_lmb_size(struct device_node *memory)
+{
+        const u32 *prop;
+        u32 len;
+
+        prop = of_get_property(memory, "ibm,lmb-size", &len);
+        if (!prop || len < sizeof(unsigned int))
+                return 0;
+
+        return read_n_cells(n_mem_size_cells, &prop);
+}
+
+struct assoc_arrays {
+        u32     n_arrays;
+        u32     array_sz;
+        const u32 *arrays;
+};
+
+/*
+ * Retreive and validate the list of associativity arrays for drconf
+ * memory from the ibm,associativity-lookup-arrays property of the
+ * device tree..
+ *
+ * The layout of the ibm,associativity-lookup-arrays property is a number N
+ * indicating the number of associativity arrays, followed by a number M
+ * indicating the size of each associativity array, followed by a list
+ * of N associativity arrays.
+ */
+static int of_get_assoc_arrays(struct device_node *memory,
+                               struct assoc_arrays *aa)
+{
+        const u32 *prop;
+        u32 len;
+
+        prop = of_get_property(memory, "ibm,associativity-lookup-arrays", &len);
+        if (!prop || len < 2 * sizeof(unsigned int))
+                return -1;
+
+        aa->n_arrays = *prop++;
+        aa->array_sz = *prop++;
+
+        /* Now that we know the number of arrrays and size of each array,
+         * revalidate the size of the property read in.
+         */
+        if (len < (aa->n_arrays * aa->array_sz + 2) * sizeof(unsigned int))
+                return -1;
+
+        aa->arrays = prop;
+        return 0;
+}
+
+/*
+ * This is like of_node_to_nid_single() for memory represented in the
+ * ibm,dynamic-reconfiguration-memory node.
+ */
+static int of_drconf_to_nid_single(struct of_drconf_cell *drmem,
+                                   struct assoc_arrays *aa)
+{
+        int default_nid = 0;
+        int nid = default_nid;
+        int index;
+
+        if (min_common_depth > 0 && min_common_depth <= aa->array_sz &&
+            !(drmem->flags & DRCONF_MEM_AI_INVALID) &&
+            drmem->aa_index < aa->n_arrays) {
+                index = drmem->aa_index * aa->array_sz + min_common_depth - 1;
+                nid = aa->arrays[index];
+
+                if (nid == 0xffff || nid >= MAX_NUMNODES)
+                        nid = default_nid;
+        }
+
+        return nid;
+}
+
 /*
  * Figure out to which domain a cpu belongs and stick it there.
  * Return the id of the domain used.
@@ -355,57 +493,50 @@ static unsigned long __init numa_enforce_memory_limit(unsigned long start,
  */
 static void __init parse_drconf_memory(struct device_node *memory)
 {
-        const unsigned int *lm, *dm, *aa;
-        unsigned int ls, ld, la;
-        unsigned int n, aam, aalen;
-        unsigned long lmb_size, size, start;
-        int nid, default_nid = 0;
-        unsigned int ai, flags;
-
-        lm = of_get_property(memory, "ibm,lmb-size", &ls);
-        dm = of_get_property(memory, "ibm,dynamic-memory", &ld);
-        aa = of_get_property(memory, "ibm,associativity-lookup-arrays", &la);
-        if (!lm || !dm || !aa ||
-            ls < sizeof(unsigned int) || ld < sizeof(unsigned int) ||
-            la < 2 * sizeof(unsigned int))
+        const u32 *dm;
+        unsigned int n, rc;
+        unsigned long lmb_size, size;
+        int nid;
+        struct assoc_arrays aa;
+
+        n = of_get_drconf_memory(memory, &dm);
+        if (!n)
+                return;
+
+        lmb_size = of_get_lmb_size(memory);
+        if (!lmb_size)
                 return;
 
-        lmb_size = read_n_cells(n_mem_size_cells, &lm);
-        n = *dm++;              /* number of LMBs */
-        aam = *aa++;            /* number of associativity lists */
-        aalen = *aa++;          /* length of each associativity list */
-        if (ld < (n * (n_mem_addr_cells + 4) + 1) * sizeof(unsigned int) ||
-            la < (aam * aalen + 2) * sizeof(unsigned int))
+        rc = of_get_assoc_arrays(memory, &aa);
+        if (rc)
                 return;
 
         for (; n != 0; --n) {
-                start = read_n_cells(n_mem_addr_cells, &dm);
-                ai = dm[2];
-                flags = dm[3];
-                dm += 4;
-                /* 0x80 == reserved, 0x8 = assigned to us */
-                if ((flags & 0x80) || !(flags & 0x8))
+                struct of_drconf_cell drmem;
+
+                read_drconf_cell(&drmem, &dm);
+
+                /* skip this block if the reserved bit is set in flags (0x80)
+                   or if the block is not assigned to this partition (0x8) */
+                if ((drmem.flags & DRCONF_MEM_RESERVED)
+                    || !(drmem.flags & DRCONF_MEM_ASSIGNED))
                         continue;
-                nid = default_nid;
-                /* flags & 0x40 means associativity index is invalid */
-                if (min_common_depth > 0 && min_common_depth <= aalen &&
-                    (flags & 0x40) == 0 && ai < aam) {
-                        /* this is like of_node_to_nid_single */
-                        nid = aa[ai * aalen + min_common_depth - 1];
-                        if (nid == 0xffff || nid >= MAX_NUMNODES)
-                                nid = default_nid;
-                }
 
-                fake_numa_create_new_node(((start + lmb_size) >> PAGE_SHIFT),
-                                                &nid);
+                nid = of_drconf_to_nid_single(&drmem, &aa);
+
+                fake_numa_create_new_node(
+                                ((drmem.base_addr + lmb_size) >> PAGE_SHIFT),
+                                           &nid);
+
                 node_set_online(nid);
 
-                size = numa_enforce_memory_limit(start, lmb_size);
+                size = numa_enforce_memory_limit(drmem.base_addr, lmb_size);
                 if (!size)
                         continue;
 
-                add_active_range(nid, start >> PAGE_SHIFT,
-                                 (start >> PAGE_SHIFT) + (size >> PAGE_SHIFT));
+                add_active_range(nid, drmem.base_addr >> PAGE_SHIFT,
+                                 (drmem.base_addr >> PAGE_SHIFT)
+                                 + (size >> PAGE_SHIFT));
         }
 }
 
@@ -770,6 +901,79 @@ early_param("numa", early_numa);
 
 #ifdef CONFIG_MEMORY_HOTPLUG
 /*
+ * Validate the node associated with the memory section we are
+ * trying to add.
+ */
+int valid_hot_add_scn(int *nid, unsigned long start, u32 lmb_size,
+                      unsigned long scn_addr)
+{
+        nodemask_t nodes;
+
+        if (*nid < 0 || !node_online(*nid))
+                *nid = any_online_node(NODE_MASK_ALL);
+
+        if ((scn_addr >= start) && (scn_addr < (start + lmb_size))) {
+                nodes_setall(nodes);
+                while (NODE_DATA(*nid)->node_spanned_pages == 0) {
+                        node_clear(*nid, nodes);
+                        *nid = any_online_node(nodes);
+                }
+
+                return 1;
+        }
+
+        return 0;
+}
+
+/*
+ * Find the node associated with a hot added memory section represented
+ * by the ibm,dynamic-reconfiguration-memory node.
+ */
+static int hot_add_drconf_scn_to_nid(struct device_node *memory,
+                                     unsigned long scn_addr)
+{
+        const u32 *dm;
+        unsigned int n, rc;
+        unsigned long lmb_size;
+        int default_nid = any_online_node(NODE_MASK_ALL);
+        int nid;
+        struct assoc_arrays aa;
+
+        n = of_get_drconf_memory(memory, &dm);
+        if (!n)
+                return default_nid;;
+
+        lmb_size = of_get_lmb_size(memory);
+        if (!lmb_size)
+                return default_nid;
+
+        rc = of_get_assoc_arrays(memory, &aa);
+        if (rc)
+                return default_nid;
+
+        for (; n != 0; --n) {
+                struct of_drconf_cell drmem;
+
+                read_drconf_cell(&drmem, &dm);
+
+                /* skip this block if it is reserved or not assigned to
+                 * this partition */
+                if ((drmem.flags & DRCONF_MEM_RESERVED)
+                    || !(drmem.flags & DRCONF_MEM_ASSIGNED))
+                        continue;
+
+                nid = of_drconf_to_nid_single(&drmem, &aa);
+
+                if (valid_hot_add_scn(&nid, drmem.base_addr, lmb_size,
+                                      scn_addr))
+                        return nid;
+        }
+
+        BUG();  /* section address should be found above */
+        return 0;
+}
+
+/*
  * Find the node associated with a hot added memory section.  Section
  * corresponds to a SPARSEMEM section, not an LMB.  It is assumed that
  * sections are fully contained within a single LMB.
@@ -777,12 +981,17 @@ early_param("numa", early_numa);
 int hot_add_scn_to_nid(unsigned long scn_addr)
 {
         struct device_node *memory = NULL;
-        nodemask_t nodes;
-        int default_nid = any_online_node(NODE_MASK_ALL);
         int nid;
 
         if (!numa_enabled || (min_common_depth < 0))
-                return default_nid;
+                return any_online_node(NODE_MASK_ALL);
+
+        memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
+        if (memory) {
+                nid = hot_add_drconf_scn_to_nid(memory, scn_addr);
+                of_node_put(memory);
+                return nid;
+        }
 
         while ((memory = of_find_node_by_type(memory, "memory")) != NULL) {
                 unsigned long start, size;
@@ -801,13 +1010,9 @@ ha_new_range:
                 size = read_n_cells(n_mem_size_cells, &memcell_buf);
                 nid = of_node_to_nid_single(memory);
 
-                /* Domains not present at boot default to 0 */
-                if (nid < 0 || !node_online(nid))
-                        nid = default_nid;
-
-                if ((scn_addr >= start) && (scn_addr < (start + size))) {
+                if (valid_hot_add_scn(&nid, start, size, scn_addr)) {
                         of_node_put(memory);
-                        goto got_nid;
+                        return nid;
                 }
 
                 if (--ranges)           /* process all ranges in cell */
@@ -815,14 +1020,5 @@ ha_new_range:
         }
         BUG();  /* section address should be found above */
         return 0;
-
-        /* Temporary code to ensure that returned node is not empty */
-got_nid:
-        nodes_setall(nodes);
-        while (NODE_DATA(nid)->node_spanned_pages == 0) {
-                node_clear(nid, nodes);
-                nid = any_online_node(nodes);
-        }
-        return nid;
 }
 #endif /* CONFIG_MEMORY_HOTPLUG */
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index e0ff59f21135..c7584072dfcc 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -53,9 +53,9 @@ extern void hash_page_sync(void);
 #endif
 
 #ifdef HAVE_BATS
-extern unsigned long v_mapped_by_bats(unsigned long va);
-extern unsigned long p_mapped_by_bats(unsigned long pa);
-void setbat(int index, unsigned long virt, unsigned long phys,
+extern phys_addr_t v_mapped_by_bats(unsigned long va);
+extern unsigned long p_mapped_by_bats(phys_addr_t pa);
+void setbat(int index, unsigned long virt, phys_addr_t phys,
             unsigned int size, int flags);
 
 #else /* !HAVE_BATS */
diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index cef9f156874b..c53145f61942 100644
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c
@@ -38,21 +38,18 @@ struct hash_pte *Hash, *Hash_end;
 unsigned long Hash_size, Hash_mask;
 unsigned long _SDR1;
 
-union ubat {                    /* BAT register values to be loaded */
-        struct ppc_bat bat;
-        u32     word[2];
-} BATS[8][2];                   /* 8 pairs of IBAT, DBAT */
+struct ppc_bat BATS[8][2];      /* 8 pairs of IBAT, DBAT */
 
 struct batrange {               /* stores address ranges mapped by BATs */
         unsigned long start;
         unsigned long limit;
-        unsigned long phys;
+        phys_addr_t phys;
 } bat_addrs[8];
 
 /*
  * Return PA for this VA if it is mapped by a BAT, or 0
  */
-unsigned long v_mapped_by_bats(unsigned long va)
+phys_addr_t v_mapped_by_bats(unsigned long va)
 {
         int b;
         for (b = 0; b < 4; ++b)
@@ -64,7 +61,7 @@ unsigned long v_mapped_by_bats(unsigned long va)
 /*
  * Return VA for a given PA or 0 if not mapped
  */
-unsigned long p_mapped_by_bats(unsigned long pa)
+unsigned long p_mapped_by_bats(phys_addr_t pa)
 {
         int b;
         for (b = 0; b < 4; ++b)
@@ -119,12 +116,12 @@ unsigned long __init mmu_mapin_ram(void)
  * The parameters are not checked; in particular size must be a power
  * of 2 between 128k and 256M.
  */
-void __init setbat(int index, unsigned long virt, unsigned long phys,
+void __init setbat(int index, unsigned long virt, phys_addr_t phys,
                    unsigned int size, int flags)
 {
         unsigned int bl;
         int wimgxpp;
-        union ubat *bat = BATS[index];
+        struct ppc_bat *bat = BATS[index];
 
         if (((flags & _PAGE_NO_CACHE) == 0) &&
             cpu_has_feature(CPU_FTR_NEED_COHERENT))
@@ -137,15 +134,15 @@ void __init setbat(int index, unsigned long virt, unsigned long phys,
                 wimgxpp = flags & (_PAGE_WRITETHRU | _PAGE_NO_CACHE
                                    | _PAGE_COHERENT | _PAGE_GUARDED);
                 wimgxpp |= (flags & _PAGE_RW)? BPP_RW: BPP_RX;
-                bat[1].word[0] = virt | (bl << 2) | 2; /* Vs=1, Vp=0 */
-                bat[1].word[1] = phys | wimgxpp;
+                bat[1].batu = virt | (bl << 2) | 2; /* Vs=1, Vp=0 */
+                bat[1].batl = BAT_PHYS_ADDR(phys) | wimgxpp;
 #ifndef CONFIG_KGDB /* want user access for breakpoints */
                 if (flags & _PAGE_USER)
 #endif
-                        bat[1].bat.batu.vp = 1;
+                        bat[1].batu |= 1;       /* Vp = 1 */
                 if (flags & _PAGE_GUARDED) {
                         /* G bit must be zero in IBATs */
-                        bat[0].word[0] = bat[0].word[1] = 0;
+                        bat[0].batu = bat[0].batl = 0;
                 } else {
                         /* make IBAT same as DBAT */
                         bat[0] = bat[1];
@@ -158,8 +155,8 @@ void __init setbat(int index, unsigned long virt, unsigned long phys,
                                    | _PAGE_COHERENT);
                 wimgxpp |= (flags & _PAGE_RW)?
                         ((flags & _PAGE_USER)? PP_RWRW: PP_RWXX): PP_RXRX;
-                bat->word[0] = virt | wimgxpp | 4;      /* Ks=0, Ku=1 */
-                bat->word[1] = phys | bl | 0x40;        /* V=1 */
+                bat->batu = virt | wimgxpp | 4; /* Ks=0, Ku=1 */
+                bat->batl = phys | bl | 0x40;   /* V=1 */
         }
 
         bat_addrs[index].start = virt;
diff --git a/arch/powerpc/mm/slice.c b/arch/powerpc/mm/slice.c
index 2bd12d965db1..db44e02e045b 100644
--- a/arch/powerpc/mm/slice.c
+++ b/arch/powerpc/mm/slice.c
@@ -215,10 +215,7 @@ static void slice_convert(struct mm_struct *mm, struct slice_mask mask, int psiz
                   mm->context.high_slices_psize);
 
         spin_unlock_irqrestore(&slice_convert_lock, flags);
-        mb();
 
-        /* XXX this is sub-optimal but will do for now */
-        on_each_cpu(slice_flush_segments, mm, 1);
 #ifdef CONFIG_SPU_BASE
         spu_flush_all_slbs(mm);
 #endif
@@ -384,17 +381,34 @@ static unsigned long slice_find_area(struct mm_struct *mm, unsigned long len,
                 return slice_find_area_bottomup(mm, len, mask, psize, use_cache);
 }
 
+#define or_mask(dst, src)       do {                    \
+        (dst).low_slices |= (src).low_slices;           \
+        (dst).high_slices |= (src).high_slices;         \
+} while (0)
+
+#define andnot_mask(dst, src)   do {                    \
+        (dst).low_slices &= ~(src).low_slices;          \
+        (dst).high_slices &= ~(src).high_slices;        \
+} while (0)
+
+#ifdef CONFIG_PPC_64K_PAGES
+#define MMU_PAGE_BASE   MMU_PAGE_64K
+#else
+#define MMU_PAGE_BASE   MMU_PAGE_4K
+#endif
+
 unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
                                       unsigned long flags, unsigned int psize,
                                       int topdown, int use_cache)
 {
-        struct slice_mask mask;
+        struct slice_mask mask = {0, 0};
         struct slice_mask good_mask;
         struct slice_mask potential_mask = {0,0} /* silence stupid warning */;
-        int pmask_set = 0;
+        struct slice_mask compat_mask = {0, 0};
         int fixed = (flags & MAP_FIXED);
         int pshift = max_t(int, mmu_psize_defs[psize].shift, PAGE_SHIFT);
         struct mm_struct *mm = current->mm;
+        unsigned long newaddr;
 
         /* Sanity checks */
         BUG_ON(mm->task_size == 0);
@@ -416,21 +430,48 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
         if (!fixed && addr) {
                 addr = _ALIGN_UP(addr, 1ul << pshift);
                 slice_dbg(" aligned addr=%lx\n", addr);
+                /* Ignore hint if it's too large or overlaps a VMA */
+                if (addr > mm->task_size - len ||
+                    !slice_area_is_free(mm, addr, len))
+                        addr = 0;
         }
 
-        /* First makeup a "good" mask of slices that have the right size
+        /* First make up a "good" mask of slices that have the right size
          * already
          */
         good_mask = slice_mask_for_size(mm, psize);
         slice_print_mask(" good_mask", good_mask);
 
-        /* First check hint if it's valid or if we have MAP_FIXED */
-        if ((addr != 0 || fixed) && (mm->task_size - len) >= addr) {
+        /*
+         * Here "good" means slices that are already the right page size,
+         * "compat" means slices that have a compatible page size (i.e.
+         * 4k in a 64k pagesize kernel), and "free" means slices without
+         * any VMAs.
+         *
+         * If MAP_FIXED:
+         *      check if fits in good | compat => OK
+         *      check if fits in good | compat | free => convert free
+         *      else bad
+         * If have hint:
+         *      check if hint fits in good => OK
+         *      check if hint fits in good | free => convert free
+         * Otherwise:
+         *      search in good, found => OK
+         *      search in good | free, found => convert free
+         *      search in good | compat | free, found => convert free.
+         */
 
-                /* Don't bother with hint if it overlaps a VMA */
-                if (!fixed && !slice_area_is_free(mm, addr, len))
-                        goto search;
+#ifdef CONFIG_PPC_64K_PAGES
+        /* If we support combo pages, we can allow 64k pages in 4k slices */
+        if (psize == MMU_PAGE_64K) {
+                compat_mask = slice_mask_for_size(mm, MMU_PAGE_4K);
+                if (fixed)
+                        or_mask(good_mask, compat_mask);
+        }
+#endif
 
+        /* First check hint if it's valid or if we have MAP_FIXED */
+        if (addr != 0 || fixed) {
                 /* Build a mask for the requested range */
                 mask = slice_range_to_mask(addr, len);
                 slice_print_mask(" mask", mask);
@@ -442,54 +483,66 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
                         slice_dbg(" fits good !\n");
                         return addr;
                 }
-
-                /* We don't fit in the good mask, check what other slices are
-                 * empty and thus can be converted
+        } else {
+                /* Now let's see if we can find something in the existing
+                 * slices for that size
                  */
-                potential_mask = slice_mask_for_free(mm);
-                potential_mask.low_slices |= good_mask.low_slices;
-                potential_mask.high_slices |= good_mask.high_slices;
-                pmask_set = 1;
-                slice_print_mask(" potential", potential_mask);
-                if (slice_check_fit(mask, potential_mask)) {
-                        slice_dbg(" fits potential !\n");
-                        goto convert;
+                newaddr = slice_find_area(mm, len, good_mask, psize, topdown,
+                                          use_cache);
+                if (newaddr != -ENOMEM) {
+                        /* Found within the good mask, we don't have to setup,
+                         * we thus return directly
+                         */
+                        slice_dbg(" found area at 0x%lx\n", newaddr);
+                        return newaddr;
                 }
         }
 
-        /* If we have MAP_FIXED and failed the above step, then error out */
+        /* We don't fit in the good mask, check what other slices are
+         * empty and thus can be converted
+         */
+        potential_mask = slice_mask_for_free(mm);
+        or_mask(potential_mask, good_mask);
+        slice_print_mask(" potential", potential_mask);
+
+        if ((addr != 0 || fixed) && slice_check_fit(mask, potential_mask)) {
+                slice_dbg(" fits potential !\n");
+                goto convert;
+        }
+
+        /* If we have MAP_FIXED and failed the above steps, then error out */
         if (fixed)
                 return -EBUSY;
 
- search:
         slice_dbg(" search...\n");
 
-        /* Now let's see if we can find something in the existing slices
-         * for that size
+        /* If we had a hint that didn't work out, see if we can fit
+         * anywhere in the good area.
          */
-        addr = slice_find_area(mm, len, good_mask, psize, topdown, use_cache);
-        if (addr != -ENOMEM) {
-                /* Found within the good mask, we don't have to setup,
-                 * we thus return directly
-                 */
-                slice_dbg(" found area at 0x%lx\n", addr);
-                return addr;
-        }
-
-        /* Won't fit, check what can be converted */
-        if (!pmask_set) {
-                potential_mask = slice_mask_for_free(mm);
-                potential_mask.low_slices |= good_mask.low_slices;
-                potential_mask.high_slices |= good_mask.high_slices;
-                pmask_set = 1;
-                slice_print_mask(" potential", potential_mask);
+        if (addr) {
+                addr = slice_find_area(mm, len, good_mask, psize, topdown,
+                                       use_cache);
+                if (addr != -ENOMEM) {
+                        slice_dbg(" found area at 0x%lx\n", addr);
+                        return addr;
+                }
         }
 
         /* Now let's see if we can find something in the existing slices
-         * for that size
+         * for that size plus free slices
          */
         addr = slice_find_area(mm, len, potential_mask, psize, topdown,
                                use_cache);
+
+#ifdef CONFIG_PPC_64K_PAGES
+        if (addr == -ENOMEM && psize == MMU_PAGE_64K) {
+                /* retry the search with 4k-page slices included */
+                or_mask(potential_mask, compat_mask);
+                addr = slice_find_area(mm, len, potential_mask, psize,
+                                       topdown, use_cache);
+        }
+#endif
+
         if (addr == -ENOMEM)
                 return -ENOMEM;
 
@@ -498,7 +551,13 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len,
         slice_print_mask(" mask", mask);
 
  convert:
-        slice_convert(mm, mask, psize);
+        andnot_mask(mask, good_mask);
+        andnot_mask(mask, compat_mask);
+        if (mask.low_slices || mask.high_slices) {
+                slice_convert(mm, mask, psize);
+                if (psize > MMU_PAGE_BASE)
+                        on_each_cpu(slice_flush_segments, mm, 1);
+        }
         return addr;
 
 }
@@ -598,6 +657,36 @@ void slice_set_user_psize(struct mm_struct *mm, unsigned int psize)
         spin_unlock_irqrestore(&slice_convert_lock, flags);
 }
 
+void slice_set_psize(struct mm_struct *mm, unsigned long address,
+                     unsigned int psize)
+{
+        unsigned long i, flags;
+        u64 *p;
+
+        spin_lock_irqsave(&slice_convert_lock, flags);
+        if (address < SLICE_LOW_TOP) {
+                i = GET_LOW_SLICE_INDEX(address);
+                p = &mm->context.low_slices_psize;
+        } else {
+                i = GET_HIGH_SLICE_INDEX(address);
+                p = &mm->context.high_slices_psize;
+        }
+        *p = (*p & ~(0xful << (i * 4))) | ((unsigned long) psize << (i * 4));
+        spin_unlock_irqrestore(&slice_convert_lock, flags);
+
+#ifdef CONFIG_SPU_BASE
+        spu_flush_all_slbs(mm);
+#endif
+}
+
+void slice_set_range_psize(struct mm_struct *mm, unsigned long start,
+                           unsigned long len, unsigned int psize)
+{
+        struct slice_mask mask = slice_range_to_mask(start, len);
+
+        slice_convert(mm, mask, psize);
+}
+
 /*
  * is_hugepage_only_range() is used by generic code to verify wether
  * a normal mmap mapping (non hugetlbfs) is valid on a given area.
diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c
index efbbd13d93e5..60e6032a8088 100644
--- a/arch/powerpc/mm/stab.c
+++ b/arch/powerpc/mm/stab.c
@@ -30,8 +30,8 @@ struct stab_entry {
 };
 
 #define NR_STAB_CACHE_ENTRIES 8
-DEFINE_PER_CPU(long, stab_cache_ptr);
-DEFINE_PER_CPU(long, stab_cache[NR_STAB_CACHE_ENTRIES]);
+static DEFINE_PER_CPU(long, stab_cache_ptr);
+static DEFINE_PER_CPU(long, stab_cache[NR_STAB_CACHE_ENTRIES]);
 
 /*
  * Create a segment table entry for the given esid/vsid pair.
diff --git a/arch/powerpc/mm/tlb_64.c b/arch/powerpc/mm/tlb_64.c
index 69ad829a7fa3..a01b5c608ff9 100644
--- a/arch/powerpc/mm/tlb_64.c
+++ b/arch/powerpc/mm/tlb_64.c
@@ -37,8 +37,8 @@ DEFINE_PER_CPU(struct ppc64_tlb_batch, ppc64_tlb_batch);
  * include/asm-powerpc/tlb.h file -- tgall
  */
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
-DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);
-unsigned long pte_freelist_forced_free;
+static DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);
+static unsigned long pte_freelist_forced_free;
 
 struct pte_freelist_batch
 {
@@ -47,9 +47,6 @@ struct pte_freelist_batch
         pgtable_free_t  tables[0];
 };
 
-DEFINE_PER_CPU(struct pte_freelist_batch *, pte_freelist_cur);
-unsigned long pte_freelist_forced_free;
-
 #define PTE_FREELIST_SIZE \
         ((PAGE_SIZE - sizeof(struct pte_freelist_batch)) \
           / sizeof(pgtable_free_t))
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 6abe91357eee..249ba01c6674 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -17,6 +17,15 @@ config EBONY
         help
           This option enables support for the IBM PPC440GP evaluation board.
 
+config SAM440EP
+        bool "Sam440ep"
+        depends on 44x
+        default n
+        select 440EP
+        select PCI
+        help
+          This option enables support for the ACube Sam440ep board.
+
 config SEQUOIA
         bool "Sequoia"
         depends on 44x
@@ -102,6 +111,22 @@ config YOSEMITE
 #       help
 #         This option enables support for the IBM PPC440GX evaluation board.
 
+config XILINX_VIRTEX440_GENERIC_BOARD
+        bool "Generic Xilinx Virtex 440 board"
+        depends on 44x
+        default n
+        select XILINX_VIRTEX_5_FXT
+        help
+          This option enables generic support for Xilinx Virtex based boards
+          that use a 440 based processor in the Virtex 5 FXT FPGA architecture.
+
+          The generic virtex board support matches any device tree which
+          specifies 'xlnx,virtex440' in its compatible field.  This includes
+          the Xilinx ML5xx reference designs using the powerpc core.
+
+          Most Virtex 5 designs should use this unless it needs to do some
+          special configuration at board probe time.
+
 # 44x specific CPU modules, selected based on the board above.
 config 440EP
         bool
@@ -152,3 +177,13 @@ config 460EX
 # 44x errata/workaround config symbols, selected by the CPU models above
 config IBM440EP_ERR42
         bool
+
+# Xilinx specific config options.
+config XILINX_VIRTEX
+        bool
+
+# Xilinx Virtex 5 FXT FPGA architecture, selected by a Xilinx board above
+config XILINX_VIRTEX_5_FXT
+        bool
+        select XILINX_VIRTEX
+
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index 774165f9acdd..8d0b1a192d62 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -3,9 +3,11 @@ obj-$(CONFIG_EBONY)	+= ebony.o
 obj-$(CONFIG_TAISHAN)   += taishan.o
 obj-$(CONFIG_BAMBOO)    += bamboo.o
 obj-$(CONFIG_YOSEMITE)  += bamboo.o
+obj-$(CONFIG_SAM440EP)  += sam440ep.o
 obj-$(CONFIG_SEQUOIA)   += sequoia.o
 obj-$(CONFIG_KATMAI)    += katmai.o
 obj-$(CONFIG_RAINIER)   += rainier.o
 obj-$(CONFIG_WARP)      += warp.o
 obj-$(CONFIG_WARP)      += warp-nand.o
 obj-$(CONFIG_CANYONLANDS) += canyonlands.o
+obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
diff --git a/arch/powerpc/platforms/44x/sam440ep.c b/arch/powerpc/platforms/44x/sam440ep.c
new file mode 100644
index 000000000000..47f10e647735
--- /dev/null
+++ b/arch/powerpc/platforms/44x/sam440ep.c
@@ -0,0 +1,79 @@
+/*
+ * Sam440ep board specific routines based off bamboo.c code
+ * original copyrights below
+ *
+ * Wade Farnsworth <wfarnsworth@mvista.com>
+ * Copyright 2004 MontaVista Software Inc.
+ *
+ * Rewritten and ported to the merged powerpc tree:
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ * Copyright 2007 IBM Corporation
+ *
+ * Modified from bamboo.c for sam440ep:
+ * Copyright 2008 Giuseppe Coviello <gicoviello@gmail.com>
+ *
+ * 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.
+ */
+#include <linux/init.h>
+#include <linux/of_platform.h>
+
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/time.h>
+#include <asm/uic.h>
+#include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
+#include <linux/i2c.h>
+
+static __initdata struct of_device_id sam440ep_of_bus[] = {
+        { .compatible = "ibm,plb4", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
+        {},
+};
+
+static int __init sam440ep_device_probe(void)
+{
+        of_platform_bus_probe(NULL, sam440ep_of_bus, NULL);
+
+        return 0;
+}
+machine_device_initcall(sam440ep, sam440ep_device_probe);
+
+static int __init sam440ep_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "acube,sam440ep"))
+                return 0;
+
+        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
+
+        return 1;
+}
+
+define_machine(sam440ep) {
+        .name                   = "Sam440ep",
+        .probe                  = sam440ep_probe,
+        .progress               = udbg_progress,
+        .init_IRQ               = uic_init_tree,
+        .get_irq                = uic_get_irq,
+        .restart                = ppc4xx_reset_system,
+        .calibrate_decr         = generic_calibrate_decr,
+};
+
+static struct i2c_board_info sam440ep_rtc_info = {
+        .type = "m41st85",
+        .addr = 0x68,
+        .irq = -1,
+};
+
+static int sam440ep_setup_rtc(void)
+{
+        return i2c_register_board_info(0, &sam440ep_rtc_info, 1);
+}
+machine_device_initcall(sam440ep, sam440ep_setup_rtc);
diff --git a/arch/powerpc/platforms/44x/virtex.c b/arch/powerpc/platforms/44x/virtex.c
new file mode 100644
index 000000000000..68637faf70ae
--- /dev/null
+++ b/arch/powerpc/platforms/44x/virtex.c
@@ -0,0 +1,60 @@
+/*
+ * Xilinx Virtex 5FXT based board support, derived from
+ * the Xilinx Virtex (IIpro & 4FX) based board support
+ *
+ * Copyright 2007 Secret Lab Technologies Ltd.
+ * Copyright 2008 Xilinx, Inc.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/init.h>
+#include <linux/of_platform.h>
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/time.h>
+#include <asm/xilinx_intc.h>
+#include <asm/reg.h>
+#include <asm/ppc4xx.h>
+#include "44x.h"
+
+static struct of_device_id xilinx_of_bus_ids[] __initdata = {
+        { .compatible = "simple-bus", },
+        { .compatible = "xlnx,plb-v46-1.00.a", },
+        { .compatible = "xlnx,plb-v46-1.02.a", },
+        { .compatible = "xlnx,plb-v34-1.01.a", },
+        { .compatible = "xlnx,plb-v34-1.02.a", },
+        { .compatible = "xlnx,opb-v20-1.10.c", },
+        { .compatible = "xlnx,dcr-v29-1.00.a", },
+        { .compatible = "xlnx,compound", },
+        {}
+};
+
+static int __init virtex_device_probe(void)
+{
+        of_platform_bus_probe(NULL, xilinx_of_bus_ids, NULL);
+
+        return 0;
+}
+machine_device_initcall(virtex, virtex_device_probe);
+
+static int __init virtex_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "xlnx,virtex440"))
+                return 0;
+
+        return 1;
+}
+
+define_machine(virtex) {
+        .name                   = "Xilinx Virtex440",
+        .probe                  = virtex_probe,
+        .init_IRQ               = xilinx_intc_init_tree,
+        .get_irq                = xilinx_intc_get_irq,
+        .calibrate_decr         = generic_calibrate_decr,
+        .restart                = ppc4xx_reset_system,
+};
diff --git a/arch/powerpc/platforms/44x/warp-nand.c b/arch/powerpc/platforms/44x/warp-nand.c
index 9150318cfc56..e55746b824b4 100644
--- a/arch/powerpc/platforms/44x/warp-nand.c
+++ b/arch/powerpc/platforms/44x/warp-nand.c
@@ -11,8 +11,10 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/ndfc.h>
+#include <linux/of.h>
 #include <asm/machdep.h>
 
+
 #ifdef CONFIG_MTD_NAND_NDFC
 
 #define CS_NAND_0       1       /* use chip select 1 for NAND device 0 */
@@ -35,13 +37,23 @@ static struct mtd_partition nand_parts[] = {
         {
                 .name   = "root",
                 .offset = 0x0200000,
-                .size   = 0x3400000
+                .size   = 0x3E00000
+        },
+        {
+                .name   = "persistent",
+                .offset = 0x4000000,
+                .size   = 0x4000000
         },
         {
-                .name   = "user",
-                .offset = 0x3600000,
-                .size   = 0x0A00000
+                .name   = "persistent1",
+                .offset = 0x8000000,
+                .size   = 0x4000000
         },
+        {
+                .name   = "persistent2",
+                .offset = 0xC000000,
+                .size   = 0x4000000
+        }
 };
 
 struct ndfc_controller_settings warp_ndfc_settings = {
@@ -67,27 +79,22 @@ static struct platform_device warp_ndfc_device = {
         .resource = &warp_ndfc,
 };
 
-static struct nand_ecclayout nand_oob_16 = {
-        .eccbytes = 3,
-        .eccpos = { 0, 1, 2, 3, 6, 7 },
-        .oobfree = { {.offset = 8, .length = 16} }
-};
-
+/* Do NOT set the ecclayout: let it default so it is correct for both
+ * 64M and 256M flash chips.
+ */
 static struct platform_nand_chip warp_nand_chip0 = {
         .nr_chips = 1,
         .chip_offset = CS_NAND_0,
         .nr_partitions = ARRAY_SIZE(nand_parts),
         .partitions = nand_parts,
-        .chip_delay = 50,
-        .ecclayout = &nand_oob_16,
+        .chip_delay = 20,
         .priv = &warp_chip0_settings,
 };
 
 static struct platform_device warp_nand_device = {
         .name = "ndfc-chip",
         .id = 0,
-        .num_resources = 1,
-        .resource = &warp_ndfc,
+        .num_resources = 0,
         .dev = {
                 .platform_data = &warp_nand_chip0,
                 .parent = &warp_ndfc_device.dev,
@@ -96,6 +103,28 @@ static struct platform_device warp_nand_device = {
 
 static int warp_setup_nand_flash(void)
 {
+        struct device_node *np;
+
+        /* Try to detect a rev A based on NOR size. */
+        np = of_find_compatible_node(NULL, NULL, "cfi-flash");
+        if (np) {
+                struct property *pp;
+
+                pp = of_find_property(np, "reg", NULL);
+                if (pp && (pp->length == 12)) {
+                        u32 *v = pp->value;
+                        if (v[2] == 0x4000000) {
+                                /* Rev A = 64M NAND */
+                                warp_nand_chip0.nr_partitions = 3;
+
+                                nand_parts[1].size   = 0x3000000;
+                                nand_parts[2].offset = 0x3200000;
+                                nand_parts[2].size   = 0x0e00000;
+                        }
+                }
+                of_node_put(np);
+        }
+
         platform_device_register(&warp_ndfc_device);
         platform_device_register(&warp_nand_device);
 
diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index 39cf6150a72b..9565995cba7f 100644
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -12,6 +12,9 @@
 #include <linux/init.h>
 #include <linux/of_platform.h>
 #include <linux/kthread.h>
+#include <linux/i2c.h>
+#include <linux/interrupt.h>
+#include <linux/delay.h>
 
 #include <asm/machdep.h>
 #include <asm/prom.h>
@@ -27,6 +30,18 @@ static __initdata struct of_device_id warp_of_bus[] = {
         {},
 };
 
+static __initdata struct i2c_board_info warp_i2c_info[] = {
+        { I2C_BOARD_INFO("ad7414", 0x4a) }
+};
+
+static int __init warp_arch_init(void)
+{
+        /* This should go away once support is moved to the dts. */
+        i2c_register_board_info(0, warp_i2c_info, ARRAY_SIZE(warp_i2c_info));
+        return 0;
+}
+machine_arch_initcall(warp, warp_arch_init);
+
 static int __init warp_device_probe(void)
 {
         of_platform_bus_probe(NULL, warp_of_bus, NULL);
@@ -52,61 +67,232 @@ define_machine(warp) {
 };
 
 
-#define LED_GREEN (0x80000000 >> 0)
-#define LED_RED   (0x80000000 >> 1)
+/* I am not sure this is the best place for this... */
+static int __init warp_post_info(void)
+{
+        struct device_node *np;
+        void __iomem *fpga;
+        u32 post1, post2;
+
+        /* Sighhhh... POST information is in the sd area. */
+        np = of_find_compatible_node(NULL, NULL, "pika,fpga-sd");
+        if (np == NULL)
+                return -ENOENT;
+
+        fpga = of_iomap(np, 0);
+        of_node_put(np);
+        if (fpga == NULL)
+                return -ENOENT;
+
+        post1 = in_be32(fpga + 0x40);
+        post2 = in_be32(fpga + 0x44);
+
+        iounmap(fpga);
+
+        if (post1 || post2)
+                printk(KERN_INFO "Warp POST %08x %08x\n", post1, post2);
+        else
+                printk(KERN_INFO "Warp POST OK\n");
+
+        return 0;
+}
+machine_late_initcall(warp, warp_post_info);
+
+
+#ifdef CONFIG_SENSORS_AD7414
+
+static LIST_HEAD(dtm_shutdown_list);
+static void __iomem *dtm_fpga;
+static void __iomem *gpio_base;
+
+
+struct dtm_shutdown {
+        struct list_head list;
+        void (*func)(void *arg);
+        void *arg;
+};
 
 
-/* This is for the power LEDs 1 = on, 0 = off, -1 = leave alone */
-void warp_set_power_leds(int green, int red)
+int pika_dtm_register_shutdown(void (*func)(void *arg), void *arg)
 {
-        static void __iomem *gpio_base = NULL;
-        unsigned leds;
-
-        if (gpio_base == NULL) {
-                struct device_node *np;
-
-                /* Power LEDS are on the second GPIO controller */
-                np = of_find_compatible_node(NULL, NULL, "ibm,gpio-440EP");
-                if (np)
-                        np = of_find_compatible_node(np, NULL, "ibm,gpio-440EP");
-                if (np == NULL) {
-                        printk(KERN_ERR __FILE__ ": Unable to find gpio\n");
-                        return;
+        struct dtm_shutdown *shutdown;
+
+        shutdown = kmalloc(sizeof(struct dtm_shutdown), GFP_KERNEL);
+        if (shutdown == NULL)
+                return -ENOMEM;
+
+        shutdown->func = func;
+        shutdown->arg = arg;
+
+        list_add(&shutdown->list, &dtm_shutdown_list);
+
+        return 0;
+}
+
+int pika_dtm_unregister_shutdown(void (*func)(void *arg), void *arg)
+{
+        struct dtm_shutdown *shutdown;
+
+        list_for_each_entry(shutdown, &dtm_shutdown_list, list)
+                if (shutdown->func == func && shutdown->arg == arg) {
+                        list_del(&shutdown->list);
+                        kfree(shutdown);
+                        return 0;
+                }
+
+        return -EINVAL;
+}
+
+static irqreturn_t temp_isr(int irq, void *context)
+{
+        struct dtm_shutdown *shutdown;
+
+        local_irq_disable();
+
+        /* Run through the shutdown list. */
+        list_for_each_entry(shutdown, &dtm_shutdown_list, list)
+                shutdown->func(shutdown->arg);
+
+        printk(KERN_EMERG "\n\nCritical Temperature Shutdown\n");
+
+        while (1) {
+                if (dtm_fpga) {
+                        unsigned reset = in_be32(dtm_fpga + 0x14);
+                        out_be32(dtm_fpga + 0x14, reset);
                 }
 
-                gpio_base = of_iomap(np, 0);
-                of_node_put(np);
-                if (gpio_base == NULL) {
-                        printk(KERN_ERR __FILE__ ": Unable to map gpio");
-                        return;
+                if (gpio_base) {
+                        unsigned leds = in_be32(gpio_base);
+
+                        /* green off, red toggle */
+                        leds &= ~0x80000000;
+                        leds ^=  0x40000000;
+
+                        out_be32(gpio_base, leds);
                 }
+
+                mdelay(500);
+        }
+}
+
+static int pika_setup_leds(void)
+{
+        struct device_node *np;
+        const u32 *gpios;
+        int len;
+
+        np = of_find_compatible_node(NULL, NULL, "linux,gpio-led");
+        if (!np) {
+                printk(KERN_ERR __FILE__ ": Unable to find gpio-led\n");
+                return -ENOENT;
         }
 
-        leds = in_be32(gpio_base);
+        gpios = of_get_property(np, "gpios", &len);
+        of_node_put(np);
+        if (!gpios || len < 4) {
+                printk(KERN_ERR __FILE__
+                       ": Unable to get gpios property (%d)\n", len);
+                return -ENOENT;
+        }
 
-        switch (green) {
-        case 0: leds &= ~LED_GREEN; break;
-        case 1: leds |=  LED_GREEN; break;
+        np = of_find_node_by_phandle(gpios[0]);
+        if (!np) {
+                printk(KERN_ERR __FILE__ ": Unable to find gpio\n");
+                return -ENOENT;
         }
-        switch (red) {
-        case 0: leds &= ~LED_RED; break;
-        case 1: leds |=  LED_RED; break;
+
+        gpio_base = of_iomap(np, 0);
+        of_node_put(np);
+        if (!gpio_base) {
+                printk(KERN_ERR __FILE__ ": Unable to map gpio");
+                return -ENOMEM;
         }
 
-        out_be32(gpio_base, leds);
+        return 0;
 }
-EXPORT_SYMBOL(warp_set_power_leds);
 
+static void pika_setup_critical_temp(struct i2c_client *client)
+{
+        struct device_node *np;
+        int irq, rc;
+
+        /* Do this before enabling critical temp interrupt since we
+         * may immediately interrupt.
+         */
+        pika_setup_leds();
+
+        /* These registers are in 1 degree increments. */
+        i2c_smbus_write_byte_data(client, 2, 65); /* Thigh */
+        i2c_smbus_write_byte_data(client, 3, 55); /* Tlow */
+
+        np = of_find_compatible_node(NULL, NULL, "adi,ad7414");
+        if (np == NULL) {
+                printk(KERN_ERR __FILE__ ": Unable to find ad7414\n");
+                return;
+        }
+
+        irq = irq_of_parse_and_map(np, 0);
+        of_node_put(np);
+        if (irq  == NO_IRQ) {
+                printk(KERN_ERR __FILE__ ": Unable to get ad7414 irq\n");
+                return;
+        }
+
+        rc = request_irq(irq, temp_isr, 0, "ad7414", NULL);
+        if (rc) {
+                printk(KERN_ERR __FILE__
+                       ": Unable to request ad7414 irq %d = %d\n", irq, rc);
+                return;
+        }
+}
+
+static inline void pika_dtm_check_fan(void __iomem *fpga)
+{
+        static int fan_state;
+        u32 fan = in_be32(fpga + 0x34) & (1 << 14);
+
+        if (fan_state != fan) {
+                fan_state = fan;
+                if (fan)
+                        printk(KERN_WARNING "Fan rotation error detected."
+                                   " Please check hardware.\n");
+        }
+}
 
-#ifdef CONFIG_SENSORS_AD7414
 static int pika_dtm_thread(void __iomem *fpga)
 {
-        extern int ad7414_get_temp(int index);
+        struct i2c_adapter *adap;
+        struct i2c_client *client;
+
+        /* We loop in case either driver was compiled as a module and
+         * has not been insmoded yet.
+         */
+        while (!(adap = i2c_get_adapter(0))) {
+                set_current_state(TASK_INTERRUPTIBLE);
+                schedule_timeout(HZ);
+        }
+
+        while (1) {
+                list_for_each_entry(client, &adap->clients, list)
+                        if (client->addr == 0x4a)
+                                goto found_it;
+
+                set_current_state(TASK_INTERRUPTIBLE);
+                schedule_timeout(HZ);
+        }
+
+found_it:
+        i2c_put_adapter(adap);
+
+        pika_setup_critical_temp(client);
+
+        printk(KERN_INFO "PIKA DTM thread running.\n");
 
         while (!kthread_should_stop()) {
-                int temp = ad7414_get_temp(0);
+                u16 temp = swab16(i2c_smbus_read_word_data(client, 0));
+                out_be32(fpga + 0x20, temp);
 
-                out_be32(fpga, temp);
+                pika_dtm_check_fan(fpga);
 
                 set_current_state(TASK_INTERRUPTIBLE);
                 schedule_timeout(HZ);
@@ -115,37 +301,44 @@ static int pika_dtm_thread(void __iomem *fpga)
         return 0;
 }
 
+
 static int __init pika_dtm_start(void)
 {
         struct task_struct *dtm_thread;
         struct device_node *np;
-        struct resource res;
-        void __iomem *fpga;
 
         np = of_find_compatible_node(NULL, NULL, "pika,fpga");
         if (np == NULL)
                 return -ENOENT;
 
-        /* We do not call of_iomap here since it would map in the entire
-         * fpga space, which is over 8k.
-         */
-        if (of_address_to_resource(np, 0, &res)) {
-                of_node_put(np);
-                return -ENOENT;
-        }
+        dtm_fpga = of_iomap(np, 0);
         of_node_put(np);
-
-        fpga = ioremap(res.start, 0x24);
-        if (fpga == NULL)
+        if (dtm_fpga == NULL)
                 return -ENOENT;
 
-        dtm_thread = kthread_run(pika_dtm_thread, fpga + 0x20, "pika-dtm");
+        dtm_thread = kthread_run(pika_dtm_thread, dtm_fpga, "pika-dtm");
         if (IS_ERR(dtm_thread)) {
-                iounmap(fpga);
+                iounmap(dtm_fpga);
                 return PTR_ERR(dtm_thread);
         }
 
         return 0;
 }
-device_initcall(pika_dtm_start);
+machine_late_initcall(warp, pika_dtm_start);
+
+#else /* !CONFIG_SENSORS_AD7414 */
+
+int pika_dtm_register_shutdown(void (*func)(void *arg), void *arg)
+{
+        return 0;
+}
+
+int pika_dtm_unregister_shutdown(void (*func)(void *arg), void *arg)
+{
+        return 0;
+}
+
 #endif
+
+EXPORT_SYMBOL(pika_dtm_register_shutdown);
+EXPORT_SYMBOL(pika_dtm_unregister_shutdown);
diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig
index 4c0da0c079e9..c62f893ede19 100644
--- a/arch/powerpc/platforms/512x/Kconfig
+++ b/arch/powerpc/platforms/512x/Kconfig
@@ -2,18 +2,29 @@ config PPC_MPC512x
         bool
         select FSL_SOC
         select IPIC
-        default n
+        select PPC_CLOCK
 
 config PPC_MPC5121
         bool
         select PPC_MPC512x
-        default n
 
 config MPC5121_ADS
         bool "Freescale MPC5121E ADS"
         depends on PPC_MULTIPLATFORM && PPC32
         select DEFAULT_UIMAGE
         select PPC_MPC5121
+        select MPC5121_ADS_CPLD
         help
           This option enables support for the MPC5121E ADS board.
-        default n
+
+config MPC5121_GENERIC
+        bool "Generic support for simple MPC5121 based boards"
+        depends on PPC_MULTIPLATFORM && PPC32
+        select DEFAULT_UIMAGE
+        select PPC_MPC5121
+        help
+          This option enables support for simple MPC5121 based boards
+          which do not need custom platform specific setup.
+
+          Compatible boards include:  Protonic LVT base boards (ZANMCU
+          and VICVT2).
diff --git a/arch/powerpc/platforms/512x/Makefile b/arch/powerpc/platforms/512x/Makefile
index 232c89f2039a..90be2f5717e6 100644
--- a/arch/powerpc/platforms/512x/Makefile
+++ b/arch/powerpc/platforms/512x/Makefile
@@ -1,4 +1,6 @@
 #
 # Makefile for the Freescale PowerPC 512x linux kernel.
 #
-obj-$(CONFIG_MPC5121_ADS)       += mpc5121_ads.o
+obj-y                           += clock.o mpc512x_shared.o
+obj-$(CONFIG_MPC5121_ADS)       += mpc5121_ads.o mpc5121_ads_cpld.o
+obj-$(CONFIG_MPC5121_GENERIC)   += mpc5121_generic.o
diff --git a/arch/powerpc/platforms/512x/clock.c b/arch/powerpc/platforms/512x/clock.c
new file mode 100644
index 000000000000..f416014ee727
--- /dev/null
+++ b/arch/powerpc/platforms/512x/clock.c
@@ -0,0 +1,729 @@
+/*
+ * Copyright (C) 2007,2008 Freescale Semiconductor, Inc. All rights reserved.
+ *
+ * Author: John Rigby <jrigby@freescale.com>
+ *
+ * Implements the clk api defined in include/linux/clk.h
+ *
+ *    Original based on linux/arch/arm/mach-integrator/clock.c
+ *
+ *    Copyright (C) 2004 ARM Limited.
+ *    Written by Deep Blue Solutions Limited.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/list.h>
+#include <linux/errno.h>
+#include <linux/err.h>
+#include <linux/string.h>
+#include <linux/clk.h>
+#include <linux/mutex.h>
+#include <linux/io.h>
+
+#include <linux/of_platform.h>
+#include <asm/mpc512x.h>
+#include <asm/clk_interface.h>
+
+#undef CLK_DEBUG
+
+static int clocks_initialized;
+
+#define CLK_HAS_RATE    0x1     /* has rate in MHz */
+#define CLK_HAS_CTRL    0x2     /* has control reg and bit */
+
+struct clk {
+        struct list_head node;
+        char name[32];
+        int flags;
+        struct device *dev;
+        unsigned long rate;
+        struct module *owner;
+        void (*calc) (struct clk *);
+        struct clk *parent;
+        int reg, bit;           /* CLK_HAS_CTRL */
+        int div_shift;          /* only used by generic_div_clk_calc */
+};
+
+static LIST_HEAD(clocks);
+static DEFINE_MUTEX(clocks_mutex);
+
+static struct clk *mpc5121_clk_get(struct device *dev, const char *id)
+{
+        struct clk *p, *clk = ERR_PTR(-ENOENT);
+        int dev_match = 0;
+        int id_match = 0;
+
+        if (dev == NULL && id == NULL)
+                return NULL;
+
+        mutex_lock(&clocks_mutex);
+        list_for_each_entry(p, &clocks, node) {
+                if (dev && dev == p->dev)
+                        dev_match++;
+                if (strcmp(id, p->name) == 0)
+                        id_match++;
+                if ((dev_match || id_match) && try_module_get(p->owner)) {
+                        clk = p;
+                        break;
+                }
+        }
+        mutex_unlock(&clocks_mutex);
+
+        return clk;
+}
+
+#ifdef CLK_DEBUG
+static void dump_clocks(void)
+{
+        struct clk *p;
+
+        mutex_lock(&clocks_mutex);
+        printk(KERN_INFO "CLOCKS:\n");
+        list_for_each_entry(p, &clocks, node) {
+                printk(KERN_INFO "  %s %ld", p->name, p->rate);
+                if (p->parent)
+                        printk(KERN_INFO " %s %ld", p->parent->name,
+                               p->parent->rate);
+                if (p->flags & CLK_HAS_CTRL)
+                        printk(KERN_INFO " reg/bit %d/%d", p->reg, p->bit);
+                printk("\n");
+        }
+        mutex_unlock(&clocks_mutex);
+}
+#define DEBUG_CLK_DUMP() dump_clocks()
+#else
+#define DEBUG_CLK_DUMP()
+#endif
+
+
+static void mpc5121_clk_put(struct clk *clk)
+{
+        module_put(clk->owner);
+}
+
+#define NRPSC 12
+
+struct mpc512x_clockctl {
+        u32 spmr;               /* System PLL Mode Reg */
+        u32 sccr[2];            /* System Clk Ctrl Reg 1 & 2 */
+        u32 scfr1;              /* System Clk Freq Reg 1 */
+        u32 scfr2;              /* System Clk Freq Reg 2 */
+        u32 reserved;
+        u32 bcr;                /* Bread Crumb Reg */
+        u32 pccr[NRPSC];        /* PSC Clk Ctrl Reg 0-11 */
+        u32 spccr;              /* SPDIF Clk Ctrl Reg */
+        u32 cccr;               /* CFM Clk Ctrl Reg */
+        u32 dccr;               /* DIU Clk Cnfg Reg */
+};
+
+struct mpc512x_clockctl __iomem *clockctl;
+
+static int mpc5121_clk_enable(struct clk *clk)
+{
+        unsigned int mask;
+
+        if (clk->flags & CLK_HAS_CTRL) {
+                mask = in_be32(&clockctl->sccr[clk->reg]);
+                mask |= 1 << clk->bit;
+                out_be32(&clockctl->sccr[clk->reg], mask);
+        }
+        return 0;
+}
+
+static void mpc5121_clk_disable(struct clk *clk)
+{
+        unsigned int mask;
+
+        if (clk->flags & CLK_HAS_CTRL) {
+                mask = in_be32(&clockctl->sccr[clk->reg]);
+                mask &= ~(1 << clk->bit);
+                out_be32(&clockctl->sccr[clk->reg], mask);
+        }
+}
+
+static unsigned long mpc5121_clk_get_rate(struct clk *clk)
+{
+        if (clk->flags & CLK_HAS_RATE)
+                return clk->rate;
+        else
+                return 0;
+}
+
+static long mpc5121_clk_round_rate(struct clk *clk, unsigned long rate)
+{
+        return rate;
+}
+
+static int mpc5121_clk_set_rate(struct clk *clk, unsigned long rate)
+{
+        return 0;
+}
+
+static int clk_register(struct clk *clk)
+{
+        mutex_lock(&clocks_mutex);
+        list_add(&clk->node, &clocks);
+        mutex_unlock(&clocks_mutex);
+        return 0;
+}
+
+static unsigned long spmf_mult(void)
+{
+        /*
+         * Convert spmf to multiplier
+         */
+        static int spmf_to_mult[] = {
+                68, 1, 12, 16,
+                20, 24, 28, 32,
+                36, 40, 44, 48,
+                52, 56, 60, 64
+        };
+        int spmf = (clockctl->spmr >> 24) & 0xf;
+        return spmf_to_mult[spmf];
+}
+
+static unsigned long sysdiv_div_x_2(void)
+{
+        /*
+         * Convert sysdiv to divisor x 2
+         * Some divisors have fractional parts so
+         * multiply by 2 then divide by this value
+         */
+        static int sysdiv_to_div_x_2[] = {
+                4, 5, 6, 7,
+                8, 9, 10, 14,
+                12, 16, 18, 22,
+                20, 24, 26, 30,
+                28, 32, 34, 38,
+                36, 40, 42, 46,
+                44, 48, 50, 54,
+                52, 56, 58, 62,
+                60, 64, 66,
+        };
+        int sysdiv = (clockctl->scfr2 >> 26) & 0x3f;
+        return sysdiv_to_div_x_2[sysdiv];
+}
+
+static unsigned long ref_to_sys(unsigned long rate)
+{
+        rate *= spmf_mult();
+        rate *= 2;
+        rate /= sysdiv_div_x_2();
+
+        return rate;
+}
+
+static unsigned long sys_to_ref(unsigned long rate)
+{
+        rate *= sysdiv_div_x_2();
+        rate /= 2;
+        rate /= spmf_mult();
+
+        return rate;
+}
+
+static long ips_to_ref(unsigned long rate)
+{
+        int ips_div = (clockctl->scfr1 >> 23) & 0x7;
+
+        rate *= ips_div;        /* csb_clk = ips_clk * ips_div */
+        rate *= 2;              /* sys_clk = csb_clk * 2 */
+        return sys_to_ref(rate);
+}
+
+static unsigned long devtree_getfreq(char *clockname)
+{
+        struct device_node *np;
+        const unsigned int *prop;
+        unsigned int val = 0;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-immr");
+        if (np) {
+                prop = of_get_property(np, clockname, NULL);
+                if (prop)
+                        val = *prop;
+            of_node_put(np);
+        }
+        return val;
+}
+
+static void ref_clk_calc(struct clk *clk)
+{
+        unsigned long rate;
+
+        rate = devtree_getfreq("bus-frequency");
+        if (rate == 0) {
+                printk(KERN_ERR "No bus-frequency in dev tree\n");
+                clk->rate = 0;
+                return;
+        }
+        clk->rate = ips_to_ref(rate);
+}
+
+static struct clk ref_clk = {
+        .name = "ref_clk",
+        .calc = ref_clk_calc,
+};
+
+
+static void sys_clk_calc(struct clk *clk)
+{
+        clk->rate = ref_to_sys(ref_clk.rate);
+}
+
+static struct clk sys_clk = {
+        .name = "sys_clk",
+        .calc = sys_clk_calc,
+};
+
+static void diu_clk_calc(struct clk *clk)
+{
+        int diudiv_x_2 = clockctl->scfr1 & 0xff;
+        unsigned long rate;
+
+        rate = sys_clk.rate;
+
+        rate *= 2;
+        rate /= diudiv_x_2;
+
+        clk->rate = rate;
+}
+
+static void half_clk_calc(struct clk *clk)
+{
+        clk->rate = clk->parent->rate / 2;
+}
+
+static void generic_div_clk_calc(struct clk *clk)
+{
+        int div = (clockctl->scfr1 >> clk->div_shift) & 0x7;
+
+        clk->rate = clk->parent->rate / div;
+}
+
+static void unity_clk_calc(struct clk *clk)
+{
+        clk->rate = clk->parent->rate;
+}
+
+static struct clk csb_clk = {
+        .name = "csb_clk",
+        .calc = half_clk_calc,
+        .parent = &sys_clk,
+};
+
+static void e300_clk_calc(struct clk *clk)
+{
+        int spmf = (clockctl->spmr >> 16) & 0xf;
+        int ratex2 = clk->parent->rate * spmf;
+
+        clk->rate = ratex2 / 2;
+}
+
+static struct clk e300_clk = {
+        .name = "e300_clk",
+        .calc = e300_clk_calc,
+        .parent = &csb_clk,
+};
+
+static struct clk ips_clk = {
+        .name = "ips_clk",
+        .calc = generic_div_clk_calc,
+        .parent = &csb_clk,
+        .div_shift = 23,
+};
+
+/*
+ * Clocks controlled by SCCR1 (.reg = 0)
+ */
+static struct clk lpc_clk = {
+        .name = "lpc_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 0,
+        .bit = 30,
+        .calc = generic_div_clk_calc,
+        .parent = &ips_clk,
+        .div_shift = 11,
+};
+
+static struct clk nfc_clk = {
+        .name = "nfc_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 0,
+        .bit = 29,
+        .calc = generic_div_clk_calc,
+        .parent = &ips_clk,
+        .div_shift = 8,
+};
+
+static struct clk pata_clk = {
+        .name = "pata_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 0,
+        .bit = 28,
+        .calc = unity_clk_calc,
+        .parent = &ips_clk,
+};
+
+/*
+ * PSC clocks (bits 27 - 16)
+ * are setup elsewhere
+ */
+
+static struct clk sata_clk = {
+        .name = "sata_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 0,
+        .bit = 14,
+        .calc = unity_clk_calc,
+        .parent = &ips_clk,
+};
+
+static struct clk fec_clk = {
+        .name = "fec_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 0,
+        .bit = 13,
+        .calc = unity_clk_calc,
+        .parent = &ips_clk,
+};
+
+static struct clk pci_clk = {
+        .name = "pci_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 0,
+        .bit = 11,
+        .calc = generic_div_clk_calc,
+        .parent = &csb_clk,
+        .div_shift = 20,
+};
+
+/*
+ * Clocks controlled by SCCR2 (.reg = 1)
+ */
+static struct clk diu_clk = {
+        .name = "diu_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 31,
+        .calc = diu_clk_calc,
+};
+
+static struct clk axe_clk = {
+        .name = "axe_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 30,
+        .calc = unity_clk_calc,
+        .parent = &csb_clk,
+};
+
+static struct clk usb1_clk = {
+        .name = "usb1_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 28,
+        .calc = unity_clk_calc,
+        .parent = &csb_clk,
+};
+
+static struct clk usb2_clk = {
+        .name = "usb2_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 27,
+        .calc = unity_clk_calc,
+        .parent = &csb_clk,
+};
+
+static struct clk i2c_clk = {
+        .name = "i2c_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 26,
+        .calc = unity_clk_calc,
+        .parent = &ips_clk,
+};
+
+static struct clk mscan_clk = {
+        .name = "mscan_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 25,
+        .calc = unity_clk_calc,
+        .parent = &ips_clk,
+};
+
+static struct clk sdhc_clk = {
+        .name = "sdhc_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 24,
+        .calc = unity_clk_calc,
+        .parent = &ips_clk,
+};
+
+static struct clk mbx_bus_clk = {
+        .name = "mbx_bus_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 22,
+        .calc = half_clk_calc,
+        .parent = &csb_clk,
+};
+
+static struct clk mbx_clk = {
+        .name = "mbx_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 21,
+        .calc = unity_clk_calc,
+        .parent = &csb_clk,
+};
+
+static struct clk mbx_3d_clk = {
+        .name = "mbx_3d_clk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 20,
+        .calc = generic_div_clk_calc,
+        .parent = &mbx_bus_clk,
+        .div_shift = 14,
+};
+
+static void psc_mclk_in_calc(struct clk *clk)
+{
+        clk->rate = devtree_getfreq("psc_mclk_in");
+        if (!clk->rate)
+                clk->rate = 25000000;
+}
+
+static struct clk psc_mclk_in = {
+        .name = "psc_mclk_in",
+        .calc = psc_mclk_in_calc,
+};
+
+static struct clk spdif_txclk = {
+        .name = "spdif_txclk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 23,
+};
+
+static struct clk spdif_rxclk = {
+        .name = "spdif_rxclk",
+        .flags = CLK_HAS_CTRL,
+        .reg = 1,
+        .bit = 23,
+};
+
+static void ac97_clk_calc(struct clk *clk)
+{
+        /* ac97 bit clock is always 24.567 MHz */
+        clk->rate = 24567000;
+}
+
+static struct clk ac97_clk = {
+        .name = "ac97_clk_in",
+        .calc = ac97_clk_calc,
+};
+
+struct clk *rate_clks[] = {
+        &ref_clk,
+        &sys_clk,
+        &diu_clk,
+        &csb_clk,
+        &e300_clk,
+        &ips_clk,
+        &fec_clk,
+        &sata_clk,
+        &pata_clk,
+        &nfc_clk,
+        &lpc_clk,
+        &mbx_bus_clk,
+        &mbx_clk,
+        &mbx_3d_clk,
+        &axe_clk,
+        &usb1_clk,
+        &usb2_clk,
+        &i2c_clk,
+        &mscan_clk,
+        &sdhc_clk,
+        &pci_clk,
+        &psc_mclk_in,
+        &spdif_txclk,
+        &spdif_rxclk,
+        &ac97_clk,
+        NULL
+};
+
+static void rate_clk_init(struct clk *clk)
+{
+        if (clk->calc) {
+                clk->calc(clk);
+                clk->flags |= CLK_HAS_RATE;
+                clk_register(clk);
+        } else {
+                printk(KERN_WARNING
+                       "Could not initialize clk %s without a calc routine\n",
+                       clk->name);
+        }
+}
+
+static void rate_clks_init(void)
+{
+        struct clk **cpp, *clk;
+
+        cpp = rate_clks;
+        while ((clk = *cpp++))
+                rate_clk_init(clk);
+}
+
+/*
+ * There are two clk enable registers with 32 enable bits each
+ * psc clocks and device clocks are all stored in dev_clks
+ */
+struct clk dev_clks[2][32];
+
+/*
+ * Given a psc number return the dev_clk
+ * associated with it
+ */
+static struct clk *psc_dev_clk(int pscnum)
+{
+        int reg, bit;
+        struct clk *clk;
+
+        reg = 0;
+        bit = 27 - pscnum;
+
+        clk = &dev_clks[reg][bit];
+        clk->reg = 0;
+        clk->bit = bit;
+        return clk;
+}
+
+/*
+ * PSC clock rate calculation
+ */
+static void psc_calc_rate(struct clk *clk, int pscnum, struct device_node *np)
+{
+        unsigned long mclk_src = sys_clk.rate;
+        unsigned long mclk_div;
+
+        /*
+         * Can only change value of mclk divider
+         * when the divider is disabled.
+         *
+         * Zero is not a valid divider so minimum
+         * divider is 1
+         *
+         * disable/set divider/enable
+         */
+        out_be32(&clockctl->pccr[pscnum], 0);
+        out_be32(&clockctl->pccr[pscnum], 0x00020000);
+        out_be32(&clockctl->pccr[pscnum], 0x00030000);
+
+        if (clockctl->pccr[pscnum] & 0x80) {
+                clk->rate = spdif_rxclk.rate;
+                return;
+        }
+
+        switch ((clockctl->pccr[pscnum] >> 14) & 0x3) {
+        case 0:
+                mclk_src = sys_clk.rate;
+                break;
+        case 1:
+                mclk_src = ref_clk.rate;
+                break;
+        case 2:
+                mclk_src = psc_mclk_in.rate;
+                break;
+        case 3:
+                mclk_src = spdif_txclk.rate;
+                break;
+        }
+
+        mclk_div = ((clockctl->pccr[pscnum] >> 17) & 0x7fff) + 1;
+        clk->rate = mclk_src / mclk_div;
+}
+
+/*
+ * Find all psc nodes in device tree and assign a clock
+ * with name "psc%d_mclk" and dev pointing at the device
+ * returned from of_find_device_by_node
+ */
+static void psc_clks_init(void)
+{
+        struct device_node *np;
+        const u32 *cell_index;
+        struct of_device *ofdev;
+
+        for_each_compatible_node(np, NULL, "fsl,mpc5121-psc") {
+                cell_index = of_get_property(np, "cell-index", NULL);
+                if (cell_index) {
+                        int pscnum = *cell_index;
+                        struct clk *clk = psc_dev_clk(pscnum);
+
+                        clk->flags = CLK_HAS_RATE | CLK_HAS_CTRL;
+                        ofdev = of_find_device_by_node(np);
+                        clk->dev = &ofdev->dev;
+                        /*
+                         * AC97 is special rate clock does
+                         * not go through normal path
+                         */
+                        if (strcmp("ac97", np->name) == 0)
+                                clk->rate = ac97_clk.rate;
+                        else
+                                psc_calc_rate(clk, pscnum, np);
+                        sprintf(clk->name, "psc%d_mclk", pscnum);
+                        clk_register(clk);
+                        clk_enable(clk);
+                }
+        }
+}
+
+static struct clk_interface mpc5121_clk_functions = {
+        .clk_get                = mpc5121_clk_get,
+        .clk_enable             = mpc5121_clk_enable,
+        .clk_disable            = mpc5121_clk_disable,
+        .clk_get_rate           = mpc5121_clk_get_rate,
+        .clk_put                = mpc5121_clk_put,
+        .clk_round_rate         = mpc5121_clk_round_rate,
+        .clk_set_rate           = mpc5121_clk_set_rate,
+        .clk_set_parent         = NULL,
+        .clk_get_parent         = NULL,
+};
+
+static int
+mpc5121_clk_init(void)
+{
+        struct device_node *np;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-clock");
+        if (np) {
+                clockctl = of_iomap(np, 0);
+                of_node_put(np);
+        }
+
+        if (!clockctl) {
+                printk(KERN_ERR "Could not map clock control registers\n");
+                return 0;
+        }
+
+        rate_clks_init();
+        psc_clks_init();
+
+        /* leave clockctl mapped forever */
+        /*iounmap(clockctl); */
+        DEBUG_CLK_DUMP();
+        clocks_initialized++;
+        clk_functions = mpc5121_clk_functions;
+        return 0;
+}
+
+
+arch_initcall(mpc5121_clk_init);
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c
index 50bd3a319022..5ebf6939a697 100644
--- a/arch/powerpc/platforms/512x/mpc5121_ads.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
+ * Copyright (C) 2007, 2008 Freescale Semiconductor, Inc. All rights reserved.
  *
  * Author: John Rigby, <jrigby@freescale.com>, Thur Mar 29 2007
  *
@@ -15,7 +15,6 @@
 
 #include <linux/kernel.h>
 #include <linux/io.h>
-#include <linux/irq.h>
 #include <linux/of_platform.h>
 
 #include <asm/machdep.h>
@@ -23,65 +22,22 @@
 #include <asm/prom.h>
 #include <asm/time.h>
 
-/**
- *      mpc512x_find_ips_freq - Find the IPS bus frequency for a device
- *      @node:  device node
- *
- *      Returns IPS bus frequency, or 0 if the bus frequency cannot be found.
- */
-unsigned long
-mpc512x_find_ips_freq(struct device_node *node)
-{
-        struct device_node *np;
-        const unsigned int *p_ips_freq = NULL;
-
-        of_node_get(node);
-        while (node) {
-                p_ips_freq = of_get_property(node, "bus-frequency", NULL);
-                if (p_ips_freq)
-                        break;
-
-                np = of_get_parent(node);
-                of_node_put(node);
-                node = np;
-        }
-        if (node)
-                of_node_put(node);
-
-        return p_ips_freq ? *p_ips_freq : 0;
-}
-EXPORT_SYMBOL(mpc512x_find_ips_freq);
-
-static struct of_device_id __initdata of_bus_ids[] = {
-        { .name = "soc", },
-        { .name = "localbus", },
-        {},
-};
+#include "mpc512x.h"
+#include "mpc5121_ads.h"
 
-static void __init mpc5121_ads_declare_of_platform_devices(void)
+static void __init mpc5121_ads_setup_arch(void)
 {
-        /* Find every child of the SOC node and add it to of_platform */
-        if (of_platform_bus_probe(NULL, of_bus_ids, NULL))
-                printk(KERN_ERR __FILE__ ": "
-                        "Error while probing of_platform bus\n");
+        printk(KERN_INFO "MPC5121 ADS board from Freescale Semiconductor\n");
+        /*
+         * cpld regs are needed early
+         */
+        mpc5121_ads_cpld_map();
 }
 
 static void __init mpc5121_ads_init_IRQ(void)
 {
-        struct device_node *np;
-
-        np = of_find_compatible_node(NULL, NULL, "fsl,ipic");
-        if (!np)
-                return;
-
-        ipic_init(np, 0);
-        of_node_put(np);
-
-        /*
-         * Initialize the default interrupt mapping priorities,
-         * in case the boot rom changed something on us.
-         */
-        ipic_set_default_priority();
+        mpc512x_init_IRQ();
+        mpc5121_ads_cpld_pic_init();
 }
 
 /*
@@ -97,7 +53,8 @@ static int __init mpc5121_ads_probe(void)
 define_machine(mpc5121_ads) {
         .name                   = "MPC5121 ADS",
         .probe                  = mpc5121_ads_probe,
-        .init                   = mpc5121_ads_declare_of_platform_devices,
+        .setup_arch             = mpc5121_ads_setup_arch,
+        .init                   = mpc512x_declare_of_platform_devices,
         .init_IRQ               = mpc5121_ads_init_IRQ,
         .get_irq                = ipic_get_irq,
         .calibrate_decr         = generic_calibrate_decr,
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.h b/arch/powerpc/platforms/512x/mpc5121_ads.h
new file mode 100644
index 000000000000..662076cfee2f
--- /dev/null
+++ b/arch/powerpc/platforms/512x/mpc5121_ads.h
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2008 Freescale Semiconductor, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ * Prototypes for ADS5121 specific code
+ */
+
+#ifndef __MPC512ADS_H__
+#define __MPC512ADS_H__
+extern void __init mpc5121_ads_cpld_map(void);
+extern void __init mpc5121_ads_cpld_pic_init(void);
+#endif                          /* __MPC512ADS_H__ */
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
new file mode 100644
index 000000000000..a6ce80566625
--- /dev/null
+++ b/arch/powerpc/platforms/512x/mpc5121_ads_cpld.c
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2008 Freescale Semiconductor, Inc. All rights reserved.
+ *
+ * Author: John Rigby, <jrigby@freescale.com>
+ *
+ * Description:
+ * MPC5121ADS CPLD irq handling
+ *
+ * This 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.
+ */
+
+#undef DEBUG
+
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/io.h>
+#include <asm/prom.h>
+
+static struct device_node *cpld_pic_node;
+static struct irq_host *cpld_pic_host;
+
+/*
+ * Bits to ignore in the misc_status register
+ * 0x10 touch screen pendown is hard routed to irq1
+ * 0x02 pci status is read from pci status register
+ */
+#define MISC_IGNORE 0x12
+
+/*
+ * Nothing to ignore in pci status register
+ */
+#define PCI_IGNORE 0x00
+
+struct cpld_pic {
+        u8 pci_mask;
+        u8 pci_status;
+        u8 route;
+        u8 misc_mask;
+        u8 misc_status;
+        u8 misc_control;
+};
+
+static struct cpld_pic __iomem *cpld_regs;
+
+static void __iomem *
+irq_to_pic_mask(unsigned int irq)
+{
+        return irq <= 7 ? &cpld_regs->pci_mask : &cpld_regs->misc_mask;
+}
+
+static unsigned int
+irq_to_pic_bit(unsigned int irq)
+{
+        return 1 << (irq & 0x7);
+}
+
+static void
+cpld_mask_irq(unsigned int irq)
+{
+        unsigned int cpld_irq = (unsigned int)irq_map[irq].hwirq;
+        void __iomem *pic_mask = irq_to_pic_mask(cpld_irq);
+
+        out_8(pic_mask,
+              in_8(pic_mask) | irq_to_pic_bit(cpld_irq));
+}
+
+static void
+cpld_unmask_irq(unsigned int irq)
+{
+        unsigned int cpld_irq = (unsigned int)irq_map[irq].hwirq;
+        void __iomem *pic_mask = irq_to_pic_mask(cpld_irq);
+
+        out_8(pic_mask,
+              in_8(pic_mask) & ~irq_to_pic_bit(cpld_irq));
+}
+
+static struct irq_chip cpld_pic = {
+        .typename = " CPLD PIC ",
+        .mask = cpld_mask_irq,
+        .ack = cpld_mask_irq,
+        .unmask = cpld_unmask_irq,
+};
+
+static int
+cpld_pic_get_irq(int offset, u8 ignore, u8 __iomem *statusp,
+                            u8 __iomem *maskp)
+{
+        int cpld_irq;
+        u8 status = in_8(statusp);
+        u8 mask = in_8(maskp);
+
+        /* ignore don't cares and masked irqs */
+        status |= (ignore | mask);
+
+        if (status == 0xff)
+                return NO_IRQ_IGNORE;
+
+        cpld_irq = ffz(status) + offset;
+
+        return irq_linear_revmap(cpld_pic_host, cpld_irq);
+}
+
+static void
+cpld_pic_cascade(unsigned int irq, struct irq_desc *desc)
+{
+        irq = cpld_pic_get_irq(0, PCI_IGNORE, &cpld_regs->pci_status,
+                &cpld_regs->pci_mask);
+        if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) {
+                generic_handle_irq(irq);
+                return;
+        }
+
+        irq = cpld_pic_get_irq(8, MISC_IGNORE, &cpld_regs->misc_status,
+                &cpld_regs->misc_mask);
+        if (irq != NO_IRQ && irq != NO_IRQ_IGNORE) {
+                generic_handle_irq(irq);
+                return;
+        }
+}
+
+static int
+cpld_pic_host_match(struct irq_host *h, struct device_node *node)
+{
+        return cpld_pic_node == node;
+}
+
+static int
+cpld_pic_host_map(struct irq_host *h, unsigned int virq,
+                             irq_hw_number_t hw)
+{
+        get_irq_desc(virq)->status |= IRQ_LEVEL;
+        set_irq_chip_and_handler(virq, &cpld_pic, handle_level_irq);
+        return 0;
+}
+
+static struct
+irq_host_ops cpld_pic_host_ops = {
+        .match = cpld_pic_host_match,
+        .map = cpld_pic_host_map,
+};
+
+void __init
+mpc5121_ads_cpld_map(void)
+{
+        struct device_node *np = NULL;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121ads-cpld-pic");
+        if (!np) {
+                printk(KERN_ERR "CPLD PIC init: can not find cpld-pic node\n");
+                return;
+        }
+
+        cpld_regs = of_iomap(np, 0);
+        of_node_put(np);
+}
+
+void __init
+mpc5121_ads_cpld_pic_init(void)
+{
+        unsigned int cascade_irq;
+        struct device_node *np = NULL;
+
+        pr_debug("cpld_ic_init\n");
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121ads-cpld-pic");
+        if (!np) {
+                printk(KERN_ERR "CPLD PIC init: can not find cpld-pic node\n");
+                return;
+        }
+
+        if (!cpld_regs)
+                goto end;
+
+        cascade_irq = irq_of_parse_and_map(np, 0);
+        if (cascade_irq == NO_IRQ)
+                goto end;
+
+        /*
+         * statically route touch screen pendown through 1
+         * and ignore it here
+         * route all others through our cascade irq
+         */
+        out_8(&cpld_regs->route, 0xfd);
+        out_8(&cpld_regs->pci_mask, 0xff);
+        /* unmask pci ints in misc mask */
+        out_8(&cpld_regs->misc_mask, ~(MISC_IGNORE));
+
+        cpld_pic_node = of_node_get(np);
+
+        cpld_pic_host =
+            irq_alloc_host(np, IRQ_HOST_MAP_LINEAR, 16, &cpld_pic_host_ops, 16);
+        if (!cpld_pic_host) {
+                printk(KERN_ERR "CPLD PIC: failed to allocate irq host!\n");
+                goto end;
+        }
+
+        set_irq_chained_handler(cascade_irq, cpld_pic_cascade);
+end:
+        of_node_put(np);
+}
diff --git a/arch/powerpc/platforms/512x/mpc5121_generic.c b/arch/powerpc/platforms/512x/mpc5121_generic.c
new file mode 100644
index 000000000000..2479de9e2d12
--- /dev/null
+++ b/arch/powerpc/platforms/512x/mpc5121_generic.c
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2007,2008 Freescale Semiconductor, Inc. All rights reserved.
+ *
+ * Author: John Rigby, <jrigby@freescale.com>
+ *
+ * Description:
+ * MPC5121 SoC setup
+ *
+ * This 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.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/of_platform.h>
+
+#include <asm/machdep.h>
+#include <asm/ipic.h>
+#include <asm/prom.h>
+#include <asm/time.h>
+
+#include "mpc512x.h"
+
+/*
+ * list of supported boards
+ */
+static char *board[] __initdata = {
+        "prt,prtlvt",
+        NULL
+};
+
+/*
+ * Called very early, MMU is off, device-tree isn't unflattened
+ */
+static int __init mpc5121_generic_probe(void)
+{
+        unsigned long node = of_get_flat_dt_root();
+        int i = 0;
+
+        while (board[i]) {
+                if (of_flat_dt_is_compatible(node, board[i]))
+                        break;
+                i++;
+        }
+
+        return board[i] != NULL;
+}
+
+define_machine(mpc5121_generic) {
+        .name                   = "MPC5121 generic",
+        .probe                  = mpc5121_generic_probe,
+        .init                   = mpc512x_declare_of_platform_devices,
+        .init_IRQ               = mpc512x_init_IRQ,
+        .get_irq                = ipic_get_irq,
+        .calibrate_decr         = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/512x/mpc512x.h b/arch/powerpc/platforms/512x/mpc512x.h
new file mode 100644
index 000000000000..9c03693cb009
--- /dev/null
+++ b/arch/powerpc/platforms/512x/mpc512x.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2007 Freescale Semiconductor, Inc. All rights reserved.
+ *
+ * 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.
+ *
+ * Prototypes for MPC512x shared code
+ */
+
+#ifndef __MPC512X_H__
+#define __MPC512X_H__
+extern unsigned long mpc512x_find_ips_freq(struct device_node *node);
+extern void __init mpc512x_init_IRQ(void);
+void __init mpc512x_declare_of_platform_devices(void);
+#endif                          /* __MPC512X_H__ */
diff --git a/arch/powerpc/platforms/512x/mpc512x_shared.c b/arch/powerpc/platforms/512x/mpc512x_shared.c
new file mode 100644
index 000000000000..d8cd579f3191
--- /dev/null
+++ b/arch/powerpc/platforms/512x/mpc512x_shared.c
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2007,2008 Freescale Semiconductor, Inc. All rights reserved.
+ *
+ * Author: John Rigby <jrigby@freescale.com>
+ *
+ * Description:
+ * MPC512x Shared code
+ *
+ * This 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/of_platform.h>
+
+#include <asm/machdep.h>
+#include <asm/ipic.h>
+#include <asm/prom.h>
+#include <asm/time.h>
+
+#include "mpc512x.h"
+
+unsigned long
+mpc512x_find_ips_freq(struct device_node *node)
+{
+        struct device_node *np;
+        const unsigned int *p_ips_freq = NULL;
+
+        of_node_get(node);
+        while (node) {
+                p_ips_freq = of_get_property(node, "bus-frequency", NULL);
+                if (p_ips_freq)
+                        break;
+
+                np = of_get_parent(node);
+                of_node_put(node);
+                node = np;
+        }
+        if (node)
+                of_node_put(node);
+
+        return p_ips_freq ? *p_ips_freq : 0;
+}
+EXPORT_SYMBOL(mpc512x_find_ips_freq);
+
+void __init mpc512x_init_IRQ(void)
+{
+        struct device_node *np;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,mpc5121-ipic");
+        if (!np)
+                return;
+
+        ipic_init(np, 0);
+        of_node_put(np);
+
+        /*
+         * Initialize the default interrupt mapping priorities,
+         * in case the boot rom changed something on us.
+         */
+        ipic_set_default_priority();
+}
+
+/*
+ * Nodes to do bus probe on, soc and localbus
+ */
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .compatible = "fsl,mpc5121-immr", },
+        { .compatible = "fsl,mpc5121-localbus", },
+        {},
+};
+
+void __init mpc512x_declare_of_platform_devices(void)
+{
+        if (of_platform_bus_probe(NULL, of_bus_ids, NULL))
+                printk(KERN_ERR __FILE__ ": "
+                        "Error while probing of_platform bus\n");
+}
+
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index e3428ddd9040..5a382bb15f62 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -63,6 +63,7 @@
 
 #define MPC52xx_PCI_TCR_P               0x01000000
 #define MPC52xx_PCI_TCR_LD              0x00010000
+#define MPC52xx_PCI_TCR_WCT8            0x00000008
 
 #define MPC52xx_PCI_TBATR_DISABLE       0x0
 #define MPC52xx_PCI_TBATR_ENABLE        0x1
@@ -313,7 +314,7 @@ mpc52xx_pci_setup(struct pci_controller *hose,
         out_be32(&pci_regs->tbatr1,
                 MPC52xx_PCI_TBATR_ENABLE | MPC52xx_PCI_TARGET_MEM );
 
-        out_be32(&pci_regs->tcr, MPC52xx_PCI_TCR_LD);
+        out_be32(&pci_regs->tcr, MPC52xx_PCI_TCR_LD | MPC52xx_PCI_TCR_WCT8);
 
         tmp = in_be32(&pci_regs->gscr);
 #if 0
diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 917ac8891555..1c8034bfa796 100644
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -1,7 +1,8 @@
-choice
-        prompt "82xx Board Type"
-        depends on PPC_82xx
-        default MPC8272_ADS
+menuconfig PPC_82xx
+        bool "82xx-based boards (PQ II)"
+        depends on 6xx && PPC_MULTIPLATFORM
+
+if PPC_82xx
 
 config MPC8272_ADS
         bool "Freescale MPC8272 ADS"
@@ -36,7 +37,7 @@ config EP8248E
           This board is also resold by Freescale as the QUICCStart
           MPC8248 Evaluation System and/or the CWH-PPC-8248N-VE.
 
-endchoice
+endif
 
 config PQ2ADS
         bool
diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c
index 7d3018751988..8054c685d323 100644
--- a/arch/powerpc/platforms/82xx/mpc8272_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc8272_ads.c
@@ -96,6 +96,10 @@ static struct cpm_pin mpc8272_ads_pins[] = {
         {1, 31, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
         {2, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
         {2, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+
+        /* I2C */
+        {3, 14, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_OPENDRAIN},
+        {3, 15, CPM_PIN_INPUT | CPM_PIN_SECONDARY | CPM_PIN_OPENDRAIN},
 };
 
 static void __init init_ioports(void)
diff --git a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
index a8013816125c..9876d7e072f4 100644
--- a/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
+++ b/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
@@ -109,7 +109,7 @@ static int pci_pic_host_map(struct irq_host *h, unsigned int virq,
 {
         get_irq_desc(virq)->status |= IRQ_LEVEL;
         set_irq_chip_data(virq, h->host_data);
-        set_irq_chip(virq, &pq2ads_pci_ic);
+        set_irq_chip_and_handler(virq, &pq2ads_pci_ic, handle_level_irq);
         return 0;
 }
 
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 13587e2e8680..27d9bf86de01 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -1,10 +1,12 @@
-menuconfig MPC83xx
-        bool "83xx Board Type"
-        depends on PPC_83xx
+menuconfig PPC_83xx
+        bool "83xx-based boards"
+        depends on 6xx && PPC_MULTIPLATFORM
         select PPC_UDBG_16550
         select PPC_INDIRECT_PCI
+        select FSL_SOC
+        select IPIC
 
-if MPC83xx
+if PPC_83xx
 
 config MPC831x_RDB
         bool "Freescale MPC831x RDB"
@@ -58,6 +60,17 @@ config MPC836x_MDS
         help
           This option enables support for the MPC836x MDS Processor Board.
 
+config MPC836x_RDK
+        bool "Freescale/Logic MPC836x RDK"
+        select DEFAULT_UIMAGE
+        select QUICC_ENGINE
+        select QE_GPIO
+        select FSL_GTM
+        select FSL_LBC
+        help
+          This option enables support for the MPC836x RDK Processor Board,
+          also known as ZOOM PowerQUICC Kit.
+
 config MPC837x_MDS
         bool "Freescale MPC837x MDS"
         select DEFAULT_UIMAGE
@@ -79,6 +92,15 @@ config SBC834x
         help
           This option enables support for the Wind River SBC834x board.
 
+config ASP834x
+        bool "Analogue & Micro ASP 834x"
+        select PPC_MPC834x
+        select REDBOOT
+        help
+          This enables support for the Analogue & Micro ASP 83xx
+          board.
+
+
 endif
 
 # used for usb
diff --git a/arch/powerpc/platforms/83xx/Makefile b/arch/powerpc/platforms/83xx/Makefile
index 7e6dd3e259d8..f331fd7dd836 100644
--- a/arch/powerpc/platforms/83xx/Makefile
+++ b/arch/powerpc/platforms/83xx/Makefile
@@ -8,7 +8,9 @@ obj-$(CONFIG_MPC832x_RDB)	+= mpc832x_rdb.o
 obj-$(CONFIG_MPC834x_MDS)       += mpc834x_mds.o
 obj-$(CONFIG_MPC834x_ITX)       += mpc834x_itx.o
 obj-$(CONFIG_MPC836x_MDS)       += mpc836x_mds.o
+obj-$(CONFIG_MPC836x_RDK)       += mpc836x_rdk.o
 obj-$(CONFIG_MPC832x_MDS)       += mpc832x_mds.o
 obj-$(CONFIG_MPC837x_MDS)       += mpc837x_mds.o
 obj-$(CONFIG_SBC834x)           += sbc834x.o
 obj-$(CONFIG_MPC837x_RDB)       += mpc837x_rdb.o
+obj-$(CONFIG_ASP834x)           += asp834x.o
diff --git a/arch/powerpc/platforms/83xx/asp834x.c b/arch/powerpc/platforms/83xx/asp834x.c
new file mode 100644
index 000000000000..bb30d67ad0a2
--- /dev/null
+++ b/arch/powerpc/platforms/83xx/asp834x.c
@@ -0,0 +1,90 @@
+/*
+ * arch/powerpc/platforms/83xx/asp834x.c
+ *
+ * Analogue & Micro ASP8347 board specific routines
+ * clone of mpc834x_itx
+ *
+ * Copyright 2008 Codehermit
+ *
+ * Maintainer: Bryan O'Donoghue <bodonoghue@codhermit.ie>
+ *
+ * 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.
+ */
+
+#include <linux/pci.h>
+#include <linux/of_platform.h>
+
+#include <asm/time.h>
+#include <asm/ipic.h>
+#include <asm/udbg.h>
+
+#include "mpc83xx.h"
+
+/* ************************************************************************
+ *
+ * Setup the architecture
+ *
+ */
+static void __init asp834x_setup_arch(void)
+{
+        if (ppc_md.progress)
+                ppc_md.progress("asp834x_setup_arch()", 0);
+
+        mpc834x_usb_cfg();
+}
+
+static void __init asp834x_init_IRQ(void)
+{
+        struct device_node *np;
+
+        np = of_find_node_by_type(NULL, "ipic");
+        if (!np)
+                return;
+
+        ipic_init(np, 0);
+
+        of_node_put(np);
+
+        /* Initialize the default interrupt mapping priorities,
+         * in case the boot rom changed something on us.
+         */
+        ipic_set_default_priority();
+}
+
+static struct __initdata of_device_id asp8347_ids[] = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .compatible = "simple-bus", },
+        {},
+};
+
+static int __init asp8347_declare_of_platform_devices(void)
+{
+        of_platform_bus_probe(NULL, asp8347_ids, NULL);
+        return 0;
+}
+machine_device_initcall(asp834x, asp8347_declare_of_platform_devices);
+
+/*
+ * Called very early, MMU is off, device-tree isn't unflattened
+ */
+static int __init asp834x_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        return of_flat_dt_is_compatible(root, "analogue-and-micro,asp8347e");
+}
+
+define_machine(asp834x) {
+        .name                   = "ASP8347E",
+        .probe                  = asp834x_probe,
+        .setup_arch             = asp834x_setup_arch,
+        .init_IRQ               = asp834x_init_IRQ,
+        .get_irq                = ipic_get_irq,
+        .restart                = mpc83xx_restart,
+        .time_init              = mpc83xx_time_init,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/83xx/mpc836x_rdk.c b/arch/powerpc/platforms/83xx/mpc836x_rdk.c
new file mode 100644
index 000000000000..c10dec4bf178
--- /dev/null
+++ b/arch/powerpc/platforms/83xx/mpc836x_rdk.c
@@ -0,0 +1,102 @@
+/*
+ * MPC8360E-RDK board file.
+ *
+ * Copyright (c) 2006  Freescale Semicondutor, Inc.
+ * Copyright (c) 2007-2008  MontaVista Software, Inc.
+ *
+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/of_platform.h>
+#include <linux/io.h>
+#include <asm/prom.h>
+#include <asm/time.h>
+#include <asm/ipic.h>
+#include <asm/udbg.h>
+#include <asm/qe.h>
+#include <asm/qe_ic.h>
+#include <sysdev/fsl_soc.h>
+
+#include "mpc83xx.h"
+
+static struct of_device_id __initdata mpc836x_rdk_ids[] = {
+        { .compatible = "simple-bus", },
+        {},
+};
+
+static int __init mpc836x_rdk_declare_of_platform_devices(void)
+{
+        return of_platform_bus_probe(NULL, mpc836x_rdk_ids, NULL);
+}
+machine_device_initcall(mpc836x_rdk, mpc836x_rdk_declare_of_platform_devices);
+
+static void __init mpc836x_rdk_setup_arch(void)
+{
+#ifdef CONFIG_PCI
+        struct device_node *np;
+#endif
+
+        if (ppc_md.progress)
+                ppc_md.progress("mpc836x_rdk_setup_arch()", 0);
+
+#ifdef CONFIG_PCI
+        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
+                mpc83xx_add_bridge(np);
+#endif
+
+        qe_reset();
+}
+
+static void __init mpc836x_rdk_init_IRQ(void)
+{
+        struct device_node *np;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,ipic");
+        if (!np)
+                return;
+
+        ipic_init(np, 0);
+
+        /*
+         * Initialize the default interrupt mapping priorities,
+         * in case the boot rom changed something on us.
+         */
+        ipic_set_default_priority();
+        of_node_put(np);
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,qe-ic");
+        if (!np)
+                return;
+
+        qe_ic_init(np, 0, qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic);
+        of_node_put(np);
+}
+
+/*
+ * Called very early, MMU is off, device-tree isn't unflattened.
+ */
+static int __init mpc836x_rdk_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "fsl,mpc8360rdk");
+}
+
+define_machine(mpc836x_rdk) {
+        .name           = "MPC836x RDK",
+        .probe          = mpc836x_rdk_probe,
+        .setup_arch     = mpc836x_rdk_setup_arch,
+        .init_IRQ       = mpc836x_rdk_init_IRQ,
+        .get_irq        = ipic_get_irq,
+        .restart        = mpc83xx_restart,
+        .time_init      = mpc83xx_time_init,
+        .calibrate_decr = generic_calibrate_decr,
+        .progress       = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index ecbe580c3f32..cebea5cadbc1 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -38,6 +38,12 @@ config MPC85xx_MDS
         help
           This option enables support for the MPC85xx MDS board
 
+config MPC8536_DS
+        bool "Freescale MPC8536 DS"
+        select DEFAULT_UIMAGE
+        help
+          This option enables support for the MPC8536 DS board
+
 config MPC85xx_DS
         bool "Freescale MPC85xx DS"
         select PPC_I8259
@@ -75,6 +81,14 @@ config TQM8541
         select TQM85xx
         select CPM2
 
+config TQM8548
+        bool "TQ Components TQM8548"
+        help
+          This option enables support for the TQ Components TQM8548 board.
+        select DEFAULT_UIMAGE
+        select PPC_CPM_NEW_BINDING
+        select TQM85xx
+
 config TQM8555
         bool "TQ Components TQM8555"
         help
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index 6cea185f62b2..cb3054e1001d 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -4,6 +4,7 @@
 obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o
+obj-$(CONFIG_MPC8536_DS)  += mpc8536_ds.o
 obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_ds.o
 obj-$(CONFIG_MPC85xx_MDS) += mpc85xx_mds.o
 obj-$(CONFIG_STX_GP3)     += stx_gp3.o
diff --git a/arch/powerpc/platforms/85xx/mpc8536_ds.c b/arch/powerpc/platforms/85xx/mpc8536_ds.c
new file mode 100644
index 000000000000..6b846aa1ced9
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/mpc8536_ds.c
@@ -0,0 +1,125 @@
+/*
+ * MPC8536 DS Board Setup
+ *
+ * Copyright 2008 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/delay.h>
+#include <linux/seq_file.h>
+#include <linux/interrupt.h>
+#include <linux/of_platform.h>
+
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <mm/mmu_decl.h>
+#include <asm/prom.h>
+#include <asm/udbg.h>
+#include <asm/mpic.h>
+
+#include <sysdev/fsl_soc.h>
+#include <sysdev/fsl_pci.h>
+
+void __init mpc8536_ds_pic_init(void)
+{
+        struct mpic *mpic;
+        struct resource r;
+        struct device_node *np;
+
+        np = of_find_node_by_type(NULL, "open-pic");
+        if (np == NULL) {
+                printk(KERN_ERR "Could not find open-pic node\n");
+                return;
+        }
+
+        if (of_address_to_resource(np, 0, &r)) {
+                printk(KERN_ERR "Failed to map mpic register space\n");
+                of_node_put(np);
+                return;
+        }
+
+        mpic = mpic_alloc(np, r.start,
+                          MPIC_PRIMARY | MPIC_WANTS_RESET |
+                          MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,
+                        0, 256, " OpenPIC  ");
+        BUG_ON(mpic == NULL);
+        of_node_put(np);
+
+        mpic_init(mpic);
+}
+
+/*
+ * Setup the architecture
+ */
+static void __init mpc8536_ds_setup_arch(void)
+{
+#ifdef CONFIG_PCI
+        struct device_node *np;
+#endif
+
+        if (ppc_md.progress)
+                ppc_md.progress("mpc8536_ds_setup_arch()", 0);
+
+#ifdef CONFIG_PCI
+        for_each_node_by_type(np, "pci") {
+                if (of_device_is_compatible(np, "fsl,mpc8540-pci") ||
+                    of_device_is_compatible(np, "fsl,mpc8548-pcie")) {
+                        struct resource rsrc;
+                        of_address_to_resource(np, 0, &rsrc);
+                        if ((rsrc.start & 0xfffff) == 0x8000)
+                                fsl_add_bridge(np, 1);
+                        else
+                                fsl_add_bridge(np, 0);
+                }
+        }
+
+#endif
+
+        printk("MPC8536 DS board from Freescale Semiconductor\n");
+}
+
+static struct of_device_id __initdata mpc8536_ds_ids[] = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        {},
+};
+
+static int __init mpc8536_ds_publish_devices(void)
+{
+        return of_platform_bus_probe(NULL, mpc8536_ds_ids, NULL);
+}
+machine_device_initcall(mpc8536_ds, mpc8536_ds_publish_devices);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init mpc8536_ds_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "fsl,mpc8536ds");
+}
+
+define_machine(mpc8536_ds) {
+        .name                   = "MPC8536 DS",
+        .probe                  = mpc8536_ds_probe,
+        .setup_arch             = mpc8536_ds_setup_arch,
+        .init_IRQ               = mpc8536_ds_pic_init,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index 3582c841844b..ba498d6f2d02 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -119,6 +119,8 @@ static const struct cpm_pin mpc8560_ads_pins[] = {
         {3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 
         /* SCC2 */
+        {2, 12, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {2, 13, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
         {3, 26, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
         {3, 27, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
         {3, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
@@ -145,7 +147,6 @@ static const struct cpm_pin mpc8560_ads_pins[] = {
         {1, 4, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
         {1, 5, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
         {1, 6, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-        {1, 7, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
         {1, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
         {1, 9, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
         {1, 10, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
@@ -156,8 +157,9 @@ static const struct cpm_pin mpc8560_ads_pins[] = {
         {1, 15, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
         {1, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
         {1, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-        {2, 16, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* CLK16 */
-        {2, 17, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* CLK15 */
+        {2, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK16 */
+        {2, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK15 */
+        {2, 27, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 };
 
 static void __init init_ioports(void)
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 8b1de7884be6..50d7ea8f922b 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -26,6 +26,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/fsl_devices.h>
+#include <linux/of_platform.h>
 
 #include <asm/system.h>
 #include <asm/pgtable.h>
@@ -335,6 +336,19 @@ static int __init mpc85xx_cds_probe(void)
         return of_flat_dt_is_compatible(root, "MPC85xxCDS");
 }
 
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .type = "soc", },
+        { .compatible = "soc", },
+        { .compatible = "simple-bus", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        return of_platform_bus_probe(NULL, of_bus_ids, NULL);
+}
+machine_device_initcall(mpc85xx_cds, declare_of_platform_devices);
+
 define_machine(mpc85xx_cds) {
         .name           = "MPC85xx CDS",
         .probe          = mpc85xx_cds_probe,
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index dfd8b4ad9b28..25f41cd2d33a 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -58,14 +58,13 @@ void __init mpc85xx_ds_pic_init(void)
 {
         struct mpic *mpic;
         struct resource r;
-        struct device_node *np = NULL;
+        struct device_node *np;
 #ifdef CONFIG_PPC_I8259
         struct device_node *cascade_node = NULL;
         int cascade_irq;
 #endif
 
-        np = of_find_node_by_type(np, "open-pic");
-
+        np = of_find_node_by_type(NULL, "open-pic");
         if (np == NULL) {
                 printk(KERN_ERR "Could not find open-pic node\n");
                 return;
@@ -78,9 +77,11 @@ void __init mpc85xx_ds_pic_init(void)
         }
 
         mpic = mpic_alloc(np, r.start,
-                          MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
+                          MPIC_PRIMARY | MPIC_WANTS_RESET |
+                          MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,
                         0, 256, " OpenPIC  ");
         BUG_ON(mpic == NULL);
+        of_node_put(np);
 
         mpic_init(mpic);
 
@@ -184,7 +185,7 @@ static int __init mpc8544_ds_probe(void)
         }
 }
 
-static struct of_device_id mpc85xxds_ids[] = {
+static struct of_device_id __initdata mpc85xxds_ids[] = {
         { .type = "soc", },
         { .compatible = "soc", },
         {},
@@ -195,6 +196,7 @@ static int __init mpc85xxds_publish_devices(void)
         return of_platform_bus_probe(NULL, mpc85xxds_ids, NULL);
 }
 machine_device_initcall(mpc8544_ds, mpc85xxds_publish_devices);
+machine_device_initcall(mpc8572_ds, mpc85xxds_publish_devices);
 
 /*
  * Called very early, device-tree isn't unflattened
diff --git a/arch/powerpc/platforms/85xx/tqm85xx.c b/arch/powerpc/platforms/85xx/tqm85xx.c
index 77681acf1bae..d850880d6964 100644
--- a/arch/powerpc/platforms/85xx/tqm85xx.c
+++ b/arch/powerpc/platforms/85xx/tqm85xx.c
@@ -120,8 +120,18 @@ static void __init tqm85xx_setup_arch(void)
 #endif
 
 #ifdef CONFIG_PCI
-        for_each_compatible_node(np, "pci", "fsl,mpc8540-pci")
-                fsl_add_bridge(np, 1);
+        for_each_node_by_type(np, "pci") {
+                if (of_device_is_compatible(np, "fsl,mpc8540-pci") ||
+                    of_device_is_compatible(np, "fsl,mpc8548-pcie")) {
+                        struct resource rsrc;
+                        if (!of_address_to_resource(np, 0, &rsrc)) {
+                                if ((rsrc.start & 0xfffff) == 0x8000)
+                                        fsl_add_bridge(np, 1);
+                                else
+                                        fsl_add_bridge(np, 0);
+                        }
+                }
+        }
 #endif
 }
 
@@ -165,10 +175,11 @@ static int __init tqm85xx_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
 
-        if ((of_flat_dt_is_compatible(root, "tqm,8540")) ||
-            (of_flat_dt_is_compatible(root, "tqm,8541")) ||
-            (of_flat_dt_is_compatible(root, "tqm,8555")) ||
-            (of_flat_dt_is_compatible(root, "tqm,8560")))
+        if ((of_flat_dt_is_compatible(root, "tqc,tqm8540")) ||
+            (of_flat_dt_is_compatible(root, "tqc,tqm8541")) ||
+            (of_flat_dt_is_compatible(root, "tqc,tqm8548")) ||
+            (of_flat_dt_is_compatible(root, "tqc,tqm8555")) ||
+            (of_flat_dt_is_compatible(root, "tqc,tqm8560")))
                 return 1;
 
         return 0;
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 053f49a1dcae..80a81e02bb55 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -1,7 +1,13 @@
-choice
-        prompt "86xx Board Type"
-        depends on PPC_86xx
-        default MPC8641_HPCN
+config PPC_86xx
+menuconfig PPC_86xx
+        bool "86xx-based boards"
+        depends on 6xx && PPC_MULTIPLATFORM
+        select FSL_SOC
+        select ALTIVEC
+        help
+          The Freescale E600 SoCs have 74xx cores.
+
+if PPC_86xx
 
 config MPC8641_HPCN
         bool "Freescale MPC8641 HPCN"
@@ -24,7 +30,7 @@ config MPC8610_HPCD
         help
           This option enables support for the MPC8610 HPCD board.
 
-endchoice
+endif
 
 config MPC8641
         bool
diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile
index 1b9b4a9b2525..8fee37dec795 100644
--- a/arch/powerpc/platforms/86xx/Makefile
+++ b/arch/powerpc/platforms/86xx/Makefile
@@ -2,6 +2,7 @@
 # Makefile for the PowerPC 86xx linux kernel.
 #
 
+obj-y                           := pic.o
 obj-$(CONFIG_SMP)               += mpc86xx_smp.o
 obj-$(CONFIG_MPC8641_HPCN)      += mpc86xx_hpcn.o
 obj-$(CONFIG_SBC8641D)          += sbc8641d.o
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index dea13208bf64..30725302884a 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -39,6 +39,8 @@
 #include <sysdev/fsl_pci.h>
 #include <sysdev/fsl_soc.h>
 
+#include "mpc86xx.h"
+
 static unsigned char *pixis_bdcfg0, *pixis_arch;
 
 static struct of_device_id __initdata mpc8610_ids[] = {
@@ -56,27 +58,6 @@ static int __init mpc8610_declare_of_platform_devices(void)
 }
 machine_device_initcall(mpc86xx_hpcd, mpc8610_declare_of_platform_devices);
 
-static void __init mpc86xx_hpcd_init_irq(void)
-{
-        struct mpic *mpic1;
-        struct device_node *np;
-        struct resource res;
-
-        /* Determine PIC address. */
-        np = of_find_node_by_type(NULL, "open-pic");
-        if (np == NULL)
-                return;
-        of_address_to_resource(np, 0, &res);
-
-        /* Alloc mpic structure and per isu has 16 INT entries. */
-        mpic1 = mpic_alloc(np, res.start,
-                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-                        0, 256, " MPIC     ");
-        BUG_ON(mpic1 == NULL);
-
-        mpic_init(mpic1);
-}
-
 #ifdef CONFIG_PCI
 static void __devinit quirk_uli1575(struct pci_dev *dev)
 {
@@ -404,7 +385,7 @@ define_machine(mpc86xx_hpcd) {
         .name                   = "MPC86xx HPCD",
         .probe                  = mpc86xx_hpcd_probe,
         .setup_arch             = mpc86xx_hpcd_setup_arch,
-        .init_IRQ               = mpc86xx_hpcd_init_irq,
+        .init_IRQ               = mpc86xx_init_irq,
         .get_irq                = mpic_get_irq,
         .restart                = fsl_rstcr_restart,
         .time_init              = mpc86xx_time_init,
diff --git a/arch/powerpc/platforms/86xx/mpc86xx.h b/arch/powerpc/platforms/86xx/mpc86xx.h
index 525ffa1904f9..08efb57559d1 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx.h
+++ b/arch/powerpc/platforms/86xx/mpc86xx.h
@@ -15,6 +15,7 @@
  * mpc86xx_* files. Mostly for use by mpc86xx_setup().
  */
 
-extern void __init mpc86xx_smp_init(void);
+extern void mpc86xx_smp_init(void);
+extern void mpc86xx_init_irq(void);
 
 #endif  /* __MPC86XX_H__ */
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index f13704aabbea..7916599c9126 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -28,7 +28,6 @@
 #include <asm/prom.h>
 #include <mm/mmu_decl.h>
 #include <asm/udbg.h>
-#include <asm/i8259.h>
 
 #include <asm/mpic.h>
 
@@ -46,67 +45,6 @@
 #endif
 
 #ifdef CONFIG_PCI
-static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
-{
-        unsigned int cascade_irq = i8259_irq();
-        if (cascade_irq != NO_IRQ)
-                generic_handle_irq(cascade_irq);
-        desc->chip->eoi(irq);
-}
-#endif  /* CONFIG_PCI */
-
-static void __init
-mpc86xx_hpcn_init_irq(void)
-{
-        struct mpic *mpic1;
-        struct device_node *np;
-        struct resource res;
-#ifdef CONFIG_PCI
-        struct device_node *cascade_node = NULL;
-        int cascade_irq;
-#endif
-
-        /* Determine PIC address. */
-        np = of_find_node_by_type(NULL, "open-pic");
-        if (np == NULL)
-                return;
-        of_address_to_resource(np, 0, &res);
-
-        /* Alloc mpic structure and per isu has 16 INT entries. */
-        mpic1 = mpic_alloc(np, res.start,
-                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-                        0, 256, " MPIC     ");
-        BUG_ON(mpic1 == NULL);
-
-        mpic_init(mpic1);
-
-#ifdef CONFIG_PCI
-        /* Initialize i8259 controller */
-        for_each_node_by_type(np, "interrupt-controller")
-                if (of_device_is_compatible(np, "chrp,iic")) {
-                        cascade_node = np;
-                        break;
-                }
-        if (cascade_node == NULL) {
-                printk(KERN_DEBUG "mpc86xxhpcn: no ISA interrupt controller\n");
-                return;
-        }
-
-        cascade_irq = irq_of_parse_and_map(cascade_node, 0);
-        if (cascade_irq == NO_IRQ) {
-                printk(KERN_ERR "mpc86xxhpcn: failed to map cascade interrupt");
-                return;
-        }
-        DBG("mpc86xxhpcn: cascade mapped to irq %d\n", cascade_irq);
-
-        i8259_init(cascade_node, 0);
-        of_node_put(cascade_node);
-
-        set_irq_chained_handler(cascade_irq, mpc86xx_8259_cascade);
-#endif
-}
-
-#ifdef CONFIG_PCI
 extern int uses_fsl_uli_m1575;
 extern int uli_exclude_device(struct pci_controller *hose,
                                 u_char bus, u_char devfn);
@@ -237,7 +175,7 @@ define_machine(mpc86xx_hpcn) {
         .name                   = "MPC86xx HPCN",
         .probe                  = mpc86xx_hpcn_probe,
         .setup_arch             = mpc86xx_hpcn_setup_arch,
-        .init_IRQ               = mpc86xx_hpcn_init_irq,
+        .init_IRQ               = mpc86xx_init_irq,
         .show_cpuinfo           = mpc86xx_hpcn_show_cpuinfo,
         .get_irq                = mpic_get_irq,
         .restart                = fsl_rstcr_restart,
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_smp.c b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
index ba55b0ff0f74..835f2dc24dc9 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_smp.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_smp.c
@@ -15,6 +15,7 @@
 #include <linux/init.h>
 #include <linux/delay.h>
 
+#include <asm/code-patching.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/pci-bridge.h>
@@ -56,8 +57,7 @@ smp_86xx_kick_cpu(int nr)
         unsigned int save_vector;
         unsigned long target, flags;
         int n = 0;
-        volatile unsigned int *vector
-                 = (volatile unsigned int *)(KERNELBASE + 0x100);
+        unsigned int *vector = (unsigned int *)(KERNELBASE + 0x100);
 
         if (nr < 0 || nr >= NR_CPUS)
                 return;
@@ -71,7 +71,7 @@ smp_86xx_kick_cpu(int nr)
 
         /* Setup fake reset vector to call __secondary_start_mpc86xx. */
         target = (unsigned long) __secondary_start_mpc86xx;
-        create_branch((unsigned long)vector, target, BRANCH_SET_LINK);
+        patch_branch(vector, target, BRANCH_SET_LINK);
 
         /* Kick that CPU */
         smp_86xx_release_core(nr);
diff --git a/arch/powerpc/platforms/86xx/pic.c b/arch/powerpc/platforms/86xx/pic.c
new file mode 100644
index 000000000000..8881c5de500d
--- /dev/null
+++ b/arch/powerpc/platforms/86xx/pic.c
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2008 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/interrupt.h>
+#include <linux/of_platform.h>
+
+#include <asm/system.h>
+#include <asm/mpic.h>
+#include <asm/i8259.h>
+
+#ifdef CONFIG_PPC_I8259
+static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
+{
+        unsigned int cascade_irq = i8259_irq();
+        if (cascade_irq != NO_IRQ)
+                generic_handle_irq(cascade_irq);
+        desc->chip->eoi(irq);
+}
+#endif  /* CONFIG_PPC_I8259 */
+
+void __init mpc86xx_init_irq(void)
+{
+        struct mpic *mpic;
+        struct device_node *np;
+        struct resource res;
+#ifdef CONFIG_PPC_I8259
+        struct device_node *cascade_node = NULL;
+        int cascade_irq;
+#endif
+
+        /* Determine PIC address. */
+        np = of_find_node_by_type(NULL, "open-pic");
+        if (np == NULL)
+                return;
+        of_address_to_resource(np, 0, &res);
+
+        mpic = mpic_alloc(np, res.start,
+                        MPIC_PRIMARY | MPIC_WANTS_RESET |
+                        MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,
+                        0, 256, " MPIC     ");
+        of_node_put(np);
+        BUG_ON(mpic == NULL);
+
+        mpic_init(mpic);
+
+#ifdef CONFIG_PPC_I8259
+        /* Initialize i8259 controller */
+        for_each_node_by_type(np, "interrupt-controller")
+                if (of_device_is_compatible(np, "chrp,iic")) {
+                        cascade_node = np;
+                        break;
+                }
+
+        if (cascade_node == NULL) {
+                printk(KERN_DEBUG "Could not find i8259 PIC\n");
+                return;
+        }
+
+        cascade_irq = irq_of_parse_and_map(cascade_node, 0);
+        if (cascade_irq == NO_IRQ) {
+                printk(KERN_ERR "Failed to map cascade interrupt\n");
+                return;
+        }
+
+        i8259_init(cascade_node, 0);
+        of_node_put(cascade_node);
+
+        set_irq_chained_handler(cascade_irq, mpc86xx_8259_cascade);
+#endif
+}
diff --git a/arch/powerpc/platforms/86xx/sbc8641d.c b/arch/powerpc/platforms/86xx/sbc8641d.c
index 510a06ef0b55..00e6fad3b3ca 100644
--- a/arch/powerpc/platforms/86xx/sbc8641d.c
+++ b/arch/powerpc/platforms/86xx/sbc8641d.c
@@ -38,29 +38,6 @@
 #include "mpc86xx.h"
 
 static void __init
-sbc8641_init_irq(void)
-{
-        struct mpic *mpic1;
-        struct device_node *np;
-        struct resource res;
-
-        /* Determine PIC address. */
-        np = of_find_node_by_type(NULL, "open-pic");
-        if (np == NULL)
-                return;
-        of_address_to_resource(np, 0, &res);
-
-        /* Alloc mpic structure and per isu has 16 INT entries. */
-        mpic1 = mpic_alloc(np, res.start,
-                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
-                        0, 256, " MPIC     ");
-        of_node_put(np);
-        BUG_ON(mpic1 == NULL);
-
-        mpic_init(mpic1);
-}
-
-static void __init
 sbc8641_setup_arch(void)
 {
 #ifdef CONFIG_PCI
@@ -151,7 +128,7 @@ define_machine(sbc8641) {
         .name                   = "SBC8641D",
         .probe                  = sbc8641_probe,
         .setup_arch             = sbc8641_setup_arch,
-        .init_IRQ               = sbc8641_init_irq,
+        .init_IRQ               = mpc86xx_init_irq,
         .show_cpuinfo           = sbc8641_show_cpuinfo,
         .get_irq                = mpic_get_irq,
         .restart                = fsl_rstcr_restart,
diff --git a/arch/powerpc/platforms/8xx/mpc86xads_setup.c b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
index c028a5b71bbb..caaec29796b7 100644
--- a/arch/powerpc/platforms/8xx/mpc86xads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc86xads_setup.c
@@ -65,6 +65,10 @@ static struct cpm_pin mpc866ads_pins[] = {
         {CPM_PORTD, 13, CPM_PIN_OUTPUT},
         {CPM_PORTD, 14, CPM_PIN_OUTPUT},
         {CPM_PORTD, 15, CPM_PIN_OUTPUT},
+
+        /* I2C */
+        {CPM_PORTB, 26, CPM_PIN_INPUT | CPM_PIN_OPENDRAIN},
+        {CPM_PORTB, 27, CPM_PIN_INPUT | CPM_PIN_OPENDRAIN},
 };
 
 static void __init init_ioports(void)
diff --git a/arch/powerpc/platforms/8xx/mpc885ads_setup.c b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
index 6e7ded0233f6..45ed6cdc1310 100644
--- a/arch/powerpc/platforms/8xx/mpc885ads_setup.c
+++ b/arch/powerpc/platforms/8xx/mpc885ads_setup.c
@@ -158,6 +158,9 @@ static struct cpm_pin mpc885ads_pins[] = {
         {CPM_PORTE, 28, CPM_PIN_OUTPUT},
         {CPM_PORTE, 29, CPM_PIN_OUTPUT},
 #endif
+        /* I2C */
+        {CPM_PORTB, 26, CPM_PIN_INPUT | CPM_PIN_OPENDRAIN},
+        {CPM_PORTB, 27, CPM_PIN_INPUT | CPM_PIN_OPENDRAIN},
 };
 
 static void __init init_ioports(void)
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 87454c526973..690c1f46e698 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,36 +1,9 @@
 menu "Platform support"
 
-choice
-        prompt "Machine type"
-        depends on PPC64 || 6xx
-        default PPC_MULTIPLATFORM
-
 config PPC_MULTIPLATFORM
-        bool "Generic desktop/server/laptop"
-        help
-          Select this option if configuring for an IBM pSeries or
-          RS/6000 machine, an Apple machine, or a PReP, CHRP,
-          Maple or Cell-based machine.
-
-config PPC_82xx
-        bool "Freescale 82xx"
-        depends on 6xx
-
-config PPC_83xx
-        bool "Freescale 83xx"
-        depends on 6xx
-        select FSL_SOC
-        select MPC83xx
-        select IPIC
-
-config PPC_86xx
-        bool "Freescale 86xx"
-        depends on 6xx
-        select FSL_SOC
-        select ALTIVEC
-        help
-          The Freescale E600 SoCs have 74xx cores.
-endchoice
+        bool
+        depends on PPC64 || 6xx
+        default y
 
 config CLASSIC32
         def_bool y
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index f7efaa925a13..5bc4b611ff88 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -95,6 +95,11 @@ config E500
         select FSL_EMB_PERFMON
         bool
 
+config PPC_E500MC
+        bool "e500mc Support"
+        select PPC_FPU
+        depends on E500
+
 config PPC_FPU
         bool
         default y if PPC64
@@ -155,9 +160,25 @@ config ALTIVEC
 
           If in doubt, say Y here.
 
+config VSX
+        bool "VSX Support"
+        depends on POWER4 && ALTIVEC && PPC_FPU
+        ---help---
+
+          This option enables kernel support for the Vector Scaler extensions
+          to the PowerPC processor. The kernel currently supports saving and
+          restoring VSX registers, and turning on the 'VSX enable' bit so user
+          processes can execute VSX instructions.
+
+          This option is only useful if you have a processor that supports
+          VSX (P7 and above), but does not have any affect on a non-VSX
+          CPUs (it does, however add code to the kernel).
+
+          If in doubt, say Y here.
+
 config SPE
         bool "SPE Support"
-        depends on E200 || E500
+        depends on E200 || (E500 && !PPC_E500MC)
         default y
         ---help---
           This option enables kernel support for the Signal Processing
@@ -182,7 +203,7 @@ config PPC_STD_MMU_32
 
 config PPC_MM_SLICES
         bool
-        default y if HUGETLB_PAGE
+        default y if HUGETLB_PAGE || PPC_64K_PAGES
         default n
 
 config VIRT_CPU_ACCOUNTING
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index c39f5c225f2e..896548ba1ca1 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -14,6 +14,7 @@
 #include <linux/pci.h>
 #include <linux/msi.h>
 #include <linux/of_platform.h>
+#include <linux/debugfs.h>
 
 #include <asm/dcr.h>
 #include <asm/machdep.h>
@@ -69,8 +70,19 @@ struct axon_msic {
         dma_addr_t fifo_phys;
         dcr_host_t dcr_host;
         u32 read_offset;
+#ifdef DEBUG
+        u32 __iomem *trigger;
+#endif
 };
 
+#ifdef DEBUG
+void axon_msi_debug_setup(struct device_node *dn, struct axon_msic *msic);
+#else
+static inline void axon_msi_debug_setup(struct device_node *dn,
+                                        struct axon_msic *msic) { }
+#endif
+
+
 static void msic_dcr_write(struct axon_msic *msic, unsigned int dcr_n, u32 val)
 {
         pr_debug("axon_msi: dcr_write(0x%x, 0x%x)\n", val, dcr_n);
@@ -346,7 +358,14 @@ static int axon_msi_probe(struct of_device *device,
                 goto out_free_msic;
         }
 
-        msic->irq_host = irq_alloc_host(of_node_get(dn), IRQ_HOST_MAP_NOMAP,
+        virq = irq_of_parse_and_map(dn, 0);
+        if (virq == NO_IRQ) {
+                printk(KERN_ERR "axon_msi: irq parse and map failed for %s\n",
+                       dn->full_name);
+                goto out_free_fifo;
+        }
+
+        msic->irq_host = irq_alloc_host(dn, IRQ_HOST_MAP_NOMAP,
                                         NR_IRQS, &msic_host_ops, 0);
         if (!msic->irq_host) {
                 printk(KERN_ERR "axon_msi: couldn't allocate irq_host for %s\n",
@@ -356,13 +375,6 @@ static int axon_msi_probe(struct of_device *device,
 
         msic->irq_host->host_data = msic;
 
-        virq = irq_of_parse_and_map(dn, 0);
-        if (virq == NO_IRQ) {
-                printk(KERN_ERR "axon_msi: irq parse and map failed for %s\n",
-                       dn->full_name);
-                goto out_free_host;
-        }
-
         set_irq_data(virq, msic);
         set_irq_chained_handler(virq, axon_msi_cascade);
         pr_debug("axon_msi: irq 0x%x setup for axon_msi\n", virq);
@@ -381,12 +393,12 @@ static int axon_msi_probe(struct of_device *device,
         ppc_md.teardown_msi_irqs = axon_msi_teardown_msi_irqs;
         ppc_md.msi_check_device = axon_msi_check_device;
 
+        axon_msi_debug_setup(dn, msic);
+
         printk(KERN_DEBUG "axon_msi: setup MSIC on %s\n", dn->full_name);
 
         return 0;
 
-out_free_host:
-        kfree(msic->irq_host);
 out_free_fifo:
         dma_free_coherent(&device->dev, MSIC_FIFO_SIZE_BYTES, msic->fifo_virt,
                           msic->fifo_phys);
@@ -418,3 +430,47 @@ static int __init axon_msi_init(void)
         return of_register_platform_driver(&axon_msi_driver);
 }
 subsys_initcall(axon_msi_init);
+
+
+#ifdef DEBUG
+static int msic_set(void *data, u64 val)
+{
+        struct axon_msic *msic = data;
+        out_le32(msic->trigger, val);
+        return 0;
+}
+
+static int msic_get(void *data, u64 *val)
+{
+        *val = 0;
+        return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(fops_msic, msic_get, msic_set, "%llu\n");
+
+void axon_msi_debug_setup(struct device_node *dn, struct axon_msic *msic)
+{
+        char name[8];
+        u64 addr;
+
+        addr = of_translate_address(dn, of_get_property(dn, "reg", NULL));
+        if (addr == OF_BAD_ADDR) {
+                pr_debug("axon_msi: couldn't translate reg property\n");
+                return;
+        }
+
+        msic->trigger = ioremap(addr, 0x4);
+        if (!msic->trigger) {
+                pr_debug("axon_msi: ioremap failed\n");
+                return;
+        }
+
+        snprintf(name, sizeof(name), "msic_%d", of_node_to_nid(dn));
+
+        if (!debugfs_create_file(name, 0600, powerpc_debugfs_root,
+                                 msic, &fops_msic)) {
+                pr_debug("axon_msi: debugfs_create_file failed!\n");
+                return;
+        }
+}
+#endif /* DEBUG */
diff --git a/arch/powerpc/platforms/cell/beat_htab.c b/arch/powerpc/platforms/cell/beat_htab.c
index 81467ff055c8..2e67bd840e01 100644
--- a/arch/powerpc/platforms/cell/beat_htab.c
+++ b/arch/powerpc/platforms/cell/beat_htab.c
@@ -112,7 +112,7 @@ static long beat_lpar_hpte_insert(unsigned long hpte_group,
         if (!(vflags & HPTE_V_BOLTED))
                 DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
 
-        if (rflags & (_PAGE_GUARDED|_PAGE_NO_CACHE))
+        if (rflags & _PAGE_NO_CACHE)
                 hpte_r &= ~_PAGE_COHERENT;
 
         spin_lock(&beat_htab_lock);
@@ -334,7 +334,7 @@ static long beat_lpar_hpte_insert_v3(unsigned long hpte_group,
         if (!(vflags & HPTE_V_BOLTED))
                 DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
 
-        if (rflags & (_PAGE_GUARDED|_PAGE_NO_CACHE))
+        if (rflags & _PAGE_NO_CACHE)
                 hpte_r &= ~_PAGE_COHERENT;
 
         /* insert into not-volted entry */
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 45646b2b4af4..eeacb3a52ca1 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -540,7 +540,7 @@ static unsigned long cell_dma_direct_offset;
 static unsigned long dma_iommu_fixed_base;
 struct dma_mapping_ops dma_iommu_fixed_ops;
 
-static void cell_dma_dev_setup_iommu(struct device *dev)
+static struct iommu_table *cell_get_iommu_table(struct device *dev)
 {
         struct iommu_window *window;
         struct cbe_iommu *iommu;
@@ -555,11 +555,11 @@ static void cell_dma_dev_setup_iommu(struct device *dev)
                 printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n",
                        archdata->of_node ? archdata->of_node->full_name : "?",
                        archdata->numa_node);
-                return;
+                return NULL;
         }
         window = list_entry(iommu->windows.next, struct iommu_window, list);
 
-        archdata->dma_data = &window->table;
+        return &window->table;
 }
 
 static void cell_dma_dev_setup_fixed(struct device *dev);
@@ -572,7 +572,7 @@ static void cell_dma_dev_setup(struct device *dev)
         if (get_dma_ops(dev) == &dma_iommu_fixed_ops)
                 cell_dma_dev_setup_fixed(dev);
         else if (get_pci_dma_ops() == &dma_iommu_ops)
-                cell_dma_dev_setup_iommu(dev);
+                archdata->dma_data = cell_get_iommu_table(dev);
         else if (get_pci_dma_ops() == &dma_direct_ops)
                 archdata->dma_data = (void *)cell_dma_direct_offset;
         else
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index 655704ad03cf..505f9b9bdf0c 100644
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -17,6 +17,7 @@
 #include <asm/reg.h>
 #include <asm/io.h>
 #include <asm/prom.h>
+#include <asm/kexec.h>
 #include <asm/machdep.h>
 #include <asm/rtas.h>
 #include <asm/cell-regs.h>
@@ -226,6 +227,11 @@ static int cbe_ptcal_notify_reboot(struct notifier_block *nb,
         return cbe_ptcal_disable();
 }
 
+static void cbe_ptcal_crash_shutdown(void)
+{
+        cbe_ptcal_disable();
+}
+
 static struct notifier_block cbe_ptcal_reboot_notifier = {
         .notifier_call = cbe_ptcal_notify_reboot
 };
@@ -241,12 +247,20 @@ int __init cbe_ptcal_init(void)
                 return -ENODEV;
 
         ret = register_reboot_notifier(&cbe_ptcal_reboot_notifier);
-        if (ret) {
-                printk(KERN_ERR "Can't disable PTCAL, so not enabling\n");
-                return ret;
-        }
+        if (ret)
+                goto out1;
+
+        ret = crash_shutdown_register(&cbe_ptcal_crash_shutdown);
+        if (ret)
+                goto out2;
 
         return cbe_ptcal_enable();
+
+out2:
+        unregister_reboot_notifier(&cbe_ptcal_reboot_notifier);
+out1:
+        printk(KERN_ERR "Can't disable PTCAL, so not enabling\n");
+        return ret;
 }
 
 arch_initcall(cbe_ptcal_init);
diff --git a/arch/powerpc/platforms/cell/spider-pic.c b/arch/powerpc/platforms/cell/spider-pic.c
index 3f4b4aef756d..4e5655624ae8 100644
--- a/arch/powerpc/platforms/cell/spider-pic.c
+++ b/arch/powerpc/platforms/cell/spider-pic.c
@@ -300,7 +300,7 @@ static void __init spider_init_one(struct device_node *of_node, int chip,
                 panic("spider_pic: can't map registers !");
 
         /* Allocate a host */
-        pic->host = irq_alloc_host(of_node_get(of_node), IRQ_HOST_MAP_LINEAR,
+        pic->host = irq_alloc_host(of_node, IRQ_HOST_MAP_LINEAR,
                                    SPIDER_SRC_COUNT, &spider_host_ops,
                                    SPIDER_IRQ_INVALID);
         if (pic->host == NULL)
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index 177735f79317..6653ddbed048 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -130,17 +130,17 @@ void spu_unmap_mappings(struct spu_context *ctx)
         if (ctx->local_store)
                 unmap_mapping_range(ctx->local_store, 0, LS_SIZE, 1);
         if (ctx->mfc)
-                unmap_mapping_range(ctx->mfc, 0, 0x1000, 1);
+                unmap_mapping_range(ctx->mfc, 0, SPUFS_MFC_MAP_SIZE, 1);
         if (ctx->cntl)
-                unmap_mapping_range(ctx->cntl, 0, 0x1000, 1);
+                unmap_mapping_range(ctx->cntl, 0, SPUFS_CNTL_MAP_SIZE, 1);
         if (ctx->signal1)
-                unmap_mapping_range(ctx->signal1, 0, PAGE_SIZE, 1);
+                unmap_mapping_range(ctx->signal1, 0, SPUFS_SIGNAL_MAP_SIZE, 1);
         if (ctx->signal2)
-                unmap_mapping_range(ctx->signal2, 0, PAGE_SIZE, 1);
+                unmap_mapping_range(ctx->signal2, 0, SPUFS_SIGNAL_MAP_SIZE, 1);
         if (ctx->mss)
-                unmap_mapping_range(ctx->mss, 0, 0x1000, 1);
+                unmap_mapping_range(ctx->mss, 0, SPUFS_MSS_MAP_SIZE, 1);
         if (ctx->psmap)
-                unmap_mapping_range(ctx->psmap, 0, 0x20000, 1);
+                unmap_mapping_range(ctx->psmap, 0, SPUFS_PS_MAP_SIZE, 1);
         mutex_unlock(&ctx->mapping_lock);
 }
 
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index c81341ff75b5..99c73066b82f 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -238,11 +238,13 @@ spufs_mem_write(struct file *file, const char __user *buffer,
         return size;
 }
 
-static unsigned long spufs_mem_mmap_nopfn(struct vm_area_struct *vma,
-                                          unsigned long address)
+static int
+spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct spu_context *ctx = vma->vm_file->private_data;
-        unsigned long pfn, offset, addr0 = address;
+        unsigned long address = (unsigned long)vmf->virtual_address;
+        unsigned long pfn, offset;
+
 #ifdef CONFIG_SPU_FS_64K_LS
         struct spu_state *csa = &ctx->csa;
         int psize;
@@ -260,15 +262,15 @@ static unsigned long spufs_mem_mmap_nopfn(struct vm_area_struct *vma,
         }
 #endif /* CONFIG_SPU_FS_64K_LS */
 
-        offset = (address - vma->vm_start) + (vma->vm_pgoff << PAGE_SHIFT);
+        offset = vmf->pgoff << PAGE_SHIFT;
         if (offset >= LS_SIZE)
-                return NOPFN_SIGBUS;
+                return VM_FAULT_SIGBUS;
 
-        pr_debug("spufs_mem_mmap_nopfn address=0x%lx -> 0x%lx, offset=0x%lx\n",
-                 addr0, address, offset);
+        pr_debug("spufs_mem_mmap_fault address=0x%lx, offset=0x%lx\n",
+                        address, offset);
 
         if (spu_acquire(ctx))
-                return NOPFN_REFAULT;
+                return VM_FAULT_NOPAGE;
 
         if (ctx->state == SPU_STATE_SAVED) {
                 vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
@@ -283,12 +285,12 @@ static unsigned long spufs_mem_mmap_nopfn(struct vm_area_struct *vma,
 
         spu_release(ctx);
 
-        return NOPFN_REFAULT;
+        return VM_FAULT_NOPAGE;
 }
 
 
 static struct vm_operations_struct spufs_mem_mmap_vmops = {
-        .nopfn = spufs_mem_mmap_nopfn,
+        .fault = spufs_mem_mmap_fault,
 };
 
 static int spufs_mem_mmap(struct file *file, struct vm_area_struct *vma)
@@ -351,20 +353,19 @@ static const struct file_operations spufs_mem_fops = {
 #endif
 };
 
-static unsigned long spufs_ps_nopfn(struct vm_area_struct *vma,
-                                    unsigned long address,
+static int spufs_ps_fault(struct vm_area_struct *vma,
+                                    struct vm_fault *vmf,
                                     unsigned long ps_offs,
                                     unsigned long ps_size)
 {
         struct spu_context *ctx = vma->vm_file->private_data;
-        unsigned long area, offset = address - vma->vm_start;
+        unsigned long area, offset = vmf->pgoff << PAGE_SHIFT;
         int ret = 0;
 
-        spu_context_nospu_trace(spufs_ps_nopfn__enter, ctx);
+        spu_context_nospu_trace(spufs_ps_fault__enter, ctx);
 
-        offset += vma->vm_pgoff << PAGE_SHIFT;
         if (offset >= ps_size)
-                return NOPFN_SIGBUS;
+                return VM_FAULT_SIGBUS;
 
         /*
          * Because we release the mmap_sem, the context may be destroyed while
@@ -378,7 +379,7 @@ static unsigned long spufs_ps_nopfn(struct vm_area_struct *vma,
          * pages to hand out to the user, but we don't want to wait
          * with the mmap_sem held.
          * It is possible to drop the mmap_sem here, but then we need
-         * to return NOPFN_REFAULT because the mappings may have
+         * to return VM_FAULT_NOPAGE because the mappings may have
          * hanged.
          */
         if (spu_acquire(ctx))
@@ -386,14 +387,15 @@ static unsigned long spufs_ps_nopfn(struct vm_area_struct *vma,
 
         if (ctx->state == SPU_STATE_SAVED) {
                 up_read(&current->mm->mmap_sem);
-                spu_context_nospu_trace(spufs_ps_nopfn__sleep, ctx);
+                spu_context_nospu_trace(spufs_ps_fault__sleep, ctx);
                 ret = spufs_wait(ctx->run_wq, ctx->state == SPU_STATE_RUNNABLE);
-                spu_context_trace(spufs_ps_nopfn__wake, ctx, ctx->spu);
+                spu_context_trace(spufs_ps_fault__wake, ctx, ctx->spu);
                 down_read(&current->mm->mmap_sem);
         } else {
                 area = ctx->spu->problem_phys + ps_offs;
-                vm_insert_pfn(vma, address, (area + offset) >> PAGE_SHIFT);
-                spu_context_trace(spufs_ps_nopfn__insert, ctx, ctx->spu);
+                vm_insert_pfn(vma, (unsigned long)vmf->virtual_address,
+                                        (area + offset) >> PAGE_SHIFT);
+                spu_context_trace(spufs_ps_fault__insert, ctx, ctx->spu);
         }
 
         if (!ret)
@@ -401,18 +403,18 @@ static unsigned long spufs_ps_nopfn(struct vm_area_struct *vma,
 
 refault:
         put_spu_context(ctx);
-        return NOPFN_REFAULT;
+        return VM_FAULT_NOPAGE;
 }
 
 #if SPUFS_MMAP_4K
-static unsigned long spufs_cntl_mmap_nopfn(struct vm_area_struct *vma,
-                                           unsigned long address)
+static int spufs_cntl_mmap_fault(struct vm_area_struct *vma,
+                                           struct vm_fault *vmf)
 {
-        return spufs_ps_nopfn(vma, address, 0x4000, 0x1000);
+        return spufs_ps_fault(vma, vmf, 0x4000, SPUFS_CNTL_MAP_SIZE);
 }
 
 static struct vm_operations_struct spufs_cntl_mmap_vmops = {
-        .nopfn = spufs_cntl_mmap_nopfn,
+        .fault = spufs_cntl_mmap_fault,
 };
 
 /*
@@ -1097,23 +1099,23 @@ static ssize_t spufs_signal1_write(struct file *file, const char __user *buf,
         return 4;
 }
 
-static unsigned long spufs_signal1_mmap_nopfn(struct vm_area_struct *vma,
-                                              unsigned long address)
+static int
+spufs_signal1_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-#if PAGE_SIZE == 0x1000
-        return spufs_ps_nopfn(vma, address, 0x14000, 0x1000);
-#elif PAGE_SIZE == 0x10000
+#if SPUFS_SIGNAL_MAP_SIZE == 0x1000
+        return spufs_ps_fault(vma, vmf, 0x14000, SPUFS_SIGNAL_MAP_SIZE);
+#elif SPUFS_SIGNAL_MAP_SIZE == 0x10000
         /* For 64k pages, both signal1 and signal2 can be used to mmap the whole
          * signal 1 and 2 area
          */
-        return spufs_ps_nopfn(vma, address, 0x10000, 0x10000);
+        return spufs_ps_fault(vma, vmf, 0x10000, SPUFS_SIGNAL_MAP_SIZE);
 #else
 #error unsupported page size
 #endif
 }
 
 static struct vm_operations_struct spufs_signal1_mmap_vmops = {
-        .nopfn = spufs_signal1_mmap_nopfn,
+        .fault = spufs_signal1_mmap_fault,
 };
 
 static int spufs_signal1_mmap(struct file *file, struct vm_area_struct *vma)
@@ -1234,23 +1236,23 @@ static ssize_t spufs_signal2_write(struct file *file, const char __user *buf,
 }
 
 #if SPUFS_MMAP_4K
-static unsigned long spufs_signal2_mmap_nopfn(struct vm_area_struct *vma,
-                                              unsigned long address)
+static int
+spufs_signal2_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-#if PAGE_SIZE == 0x1000
-        return spufs_ps_nopfn(vma, address, 0x1c000, 0x1000);
-#elif PAGE_SIZE == 0x10000
+#if SPUFS_SIGNAL_MAP_SIZE == 0x1000
+        return spufs_ps_fault(vma, vmf, 0x1c000, SPUFS_SIGNAL_MAP_SIZE);
+#elif SPUFS_SIGNAL_MAP_SIZE == 0x10000
         /* For 64k pages, both signal1 and signal2 can be used to mmap the whole
          * signal 1 and 2 area
          */
-        return spufs_ps_nopfn(vma, address, 0x10000, 0x10000);
+        return spufs_ps_fault(vma, vmf, 0x10000, SPUFS_SIGNAL_MAP_SIZE);
 #else
 #error unsupported page size
 #endif
 }
 
 static struct vm_operations_struct spufs_signal2_mmap_vmops = {
-        .nopfn = spufs_signal2_mmap_nopfn,
+        .fault = spufs_signal2_mmap_fault,
 };
 
 static int spufs_signal2_mmap(struct file *file, struct vm_area_struct *vma)
@@ -1362,14 +1364,14 @@ DEFINE_SPUFS_ATTRIBUTE(spufs_signal2_type, spufs_signal2_type_get,
                        spufs_signal2_type_set, "%llu\n", SPU_ATTR_ACQUIRE);
 
 #if SPUFS_MMAP_4K
-static unsigned long spufs_mss_mmap_nopfn(struct vm_area_struct *vma,
-                                          unsigned long address)
+static int
+spufs_mss_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        return spufs_ps_nopfn(vma, address, 0x0000, 0x1000);
+        return spufs_ps_fault(vma, vmf, 0x0000, SPUFS_MSS_MAP_SIZE);
 }
 
 static struct vm_operations_struct spufs_mss_mmap_vmops = {
-        .nopfn = spufs_mss_mmap_nopfn,
+        .fault = spufs_mss_mmap_fault,
 };
 
 /*
@@ -1424,14 +1426,14 @@ static const struct file_operations spufs_mss_fops = {
         .mmap    = spufs_mss_mmap,
 };
 
-static unsigned long spufs_psmap_mmap_nopfn(struct vm_area_struct *vma,
-                                            unsigned long address)
+static int
+spufs_psmap_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        return spufs_ps_nopfn(vma, address, 0x0000, 0x20000);
+        return spufs_ps_fault(vma, vmf, 0x0000, SPUFS_PS_MAP_SIZE);
 }
 
 static struct vm_operations_struct spufs_psmap_mmap_vmops = {
-        .nopfn = spufs_psmap_mmap_nopfn,
+        .fault = spufs_psmap_mmap_fault,
 };
 
 /*
@@ -1484,14 +1486,14 @@ static const struct file_operations spufs_psmap_fops = {
 
 
 #if SPUFS_MMAP_4K
-static unsigned long spufs_mfc_mmap_nopfn(struct vm_area_struct *vma,
-                                          unsigned long address)
+static int
+spufs_mfc_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        return spufs_ps_nopfn(vma, address, 0x3000, 0x1000);
+        return spufs_ps_fault(vma, vmf, 0x3000, SPUFS_MFC_MAP_SIZE);
 }
 
 static struct vm_operations_struct spufs_mfc_mmap_vmops = {
-        .nopfn = spufs_mfc_mmap_nopfn,
+        .fault = spufs_mfc_mmap_fault,
 };
 
 /*
@@ -2553,22 +2555,74 @@ void spu_switch_log_notify(struct spu *spu, struct spu_context *ctx,
         wake_up(&ctx->switch_log->wait);
 }
 
-struct tree_descr spufs_dir_contents[] = {
+static int spufs_show_ctx(struct seq_file *s, void *private)
+{
+        struct spu_context *ctx = s->private;
+        u64 mfc_control_RW;
+
+        mutex_lock(&ctx->state_mutex);
+        if (ctx->spu) {
+                struct spu *spu = ctx->spu;
+                struct spu_priv2 __iomem *priv2 = spu->priv2;
+
+                spin_lock_irq(&spu->register_lock);
+                mfc_control_RW = in_be64(&priv2->mfc_control_RW);
+                spin_unlock_irq(&spu->register_lock);
+        } else {
+                struct spu_state *csa = &ctx->csa;
+
+                mfc_control_RW = csa->priv2.mfc_control_RW;
+        }
+
+        seq_printf(s, "%c flgs(%lx) sflgs(%lx) pri(%d) ts(%d) spu(%02d)"
+                " %c %lx %lx %lx %lx %x %x\n",
+                ctx->state == SPU_STATE_SAVED ? 'S' : 'R',
+                ctx->flags,
+                ctx->sched_flags,
+                ctx->prio,
+                ctx->time_slice,
+                ctx->spu ? ctx->spu->number : -1,
+                !list_empty(&ctx->rq) ? 'q' : ' ',
+                ctx->csa.class_0_pending,
+                ctx->csa.class_0_dar,
+                ctx->csa.class_1_dsisr,
+                mfc_control_RW,
+                ctx->ops->runcntl_read(ctx),
+                ctx->ops->status_read(ctx));
+
+        mutex_unlock(&ctx->state_mutex);
+
+        return 0;
+}
+
+static int spufs_ctx_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, spufs_show_ctx, SPUFS_I(inode)->i_ctx);
+}
+
+static const struct file_operations spufs_ctx_fops = {
+        .open           = spufs_ctx_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
+
+struct spufs_tree_descr spufs_dir_contents[] = {
         { "capabilities", &spufs_caps_fops, 0444, },
-        { "mem",  &spufs_mem_fops,  0666, },
-        { "regs", &spufs_regs_fops,  0666, },
+        { "mem",  &spufs_mem_fops,  0666, LS_SIZE, },
+        { "regs", &spufs_regs_fops,  0666, sizeof(struct spu_reg128[128]), },
         { "mbox", &spufs_mbox_fops, 0444, },
         { "ibox", &spufs_ibox_fops, 0444, },
         { "wbox", &spufs_wbox_fops, 0222, },
-        { "mbox_stat", &spufs_mbox_stat_fops, 0444, },
-        { "ibox_stat", &spufs_ibox_stat_fops, 0444, },
-        { "wbox_stat", &spufs_wbox_stat_fops, 0444, },
+        { "mbox_stat", &spufs_mbox_stat_fops, 0444, sizeof(u32), },
+        { "ibox_stat", &spufs_ibox_stat_fops, 0444, sizeof(u32), },
+        { "wbox_stat", &spufs_wbox_stat_fops, 0444, sizeof(u32), },
         { "signal1", &spufs_signal1_fops, 0666, },
         { "signal2", &spufs_signal2_fops, 0666, },
         { "signal1_type", &spufs_signal1_type, 0666, },
         { "signal2_type", &spufs_signal2_type, 0666, },
         { "cntl", &spufs_cntl_fops,  0666, },
-        { "fpcr", &spufs_fpcr_fops, 0666, },
+        { "fpcr", &spufs_fpcr_fops, 0666, sizeof(struct spu_reg128), },
         { "lslr", &spufs_lslr_ops, 0444, },
         { "mfc", &spufs_mfc_fops, 0666, },
         { "mss", &spufs_mss_fops, 0666, },
@@ -2578,29 +2632,31 @@ struct tree_descr spufs_dir_contents[] = {
         { "decr_status", &spufs_decr_status_ops, 0666, },
         { "event_mask", &spufs_event_mask_ops, 0666, },
         { "event_status", &spufs_event_status_ops, 0444, },
-        { "psmap", &spufs_psmap_fops, 0666, },
+        { "psmap", &spufs_psmap_fops, 0666, SPUFS_PS_MAP_SIZE, },
         { "phys-id", &spufs_id_ops, 0666, },
         { "object-id", &spufs_object_id_ops, 0666, },
-        { "mbox_info", &spufs_mbox_info_fops, 0444, },
-        { "ibox_info", &spufs_ibox_info_fops, 0444, },
-        { "wbox_info", &spufs_wbox_info_fops, 0444, },
-        { "dma_info", &spufs_dma_info_fops, 0444, },
-        { "proxydma_info", &spufs_proxydma_info_fops, 0444, },
+        { "mbox_info", &spufs_mbox_info_fops, 0444, sizeof(u32), },
+        { "ibox_info", &spufs_ibox_info_fops, 0444, sizeof(u32), },
+        { "wbox_info", &spufs_wbox_info_fops, 0444, sizeof(u32), },
+        { "dma_info", &spufs_dma_info_fops, 0444,
+                sizeof(struct spu_dma_info), },
+        { "proxydma_info", &spufs_proxydma_info_fops, 0444,
+                sizeof(struct spu_proxydma_info)},
         { "tid", &spufs_tid_fops, 0444, },
         { "stat", &spufs_stat_fops, 0444, },
         { "switch_log", &spufs_switch_log_fops, 0444 },
         {},
 };
 
-struct tree_descr spufs_dir_nosched_contents[] = {
+struct spufs_tree_descr spufs_dir_nosched_contents[] = {
         { "capabilities", &spufs_caps_fops, 0444, },
-        { "mem",  &spufs_mem_fops,  0666, },
+        { "mem",  &spufs_mem_fops,  0666, LS_SIZE, },
         { "mbox", &spufs_mbox_fops, 0444, },
         { "ibox", &spufs_ibox_fops, 0444, },
         { "wbox", &spufs_wbox_fops, 0222, },
-        { "mbox_stat", &spufs_mbox_stat_fops, 0444, },
-        { "ibox_stat", &spufs_ibox_stat_fops, 0444, },
-        { "wbox_stat", &spufs_wbox_stat_fops, 0444, },
+        { "mbox_stat", &spufs_mbox_stat_fops, 0444, sizeof(u32), },
+        { "ibox_stat", &spufs_ibox_stat_fops, 0444, sizeof(u32), },
+        { "wbox_stat", &spufs_wbox_stat_fops, 0444, sizeof(u32), },
         { "signal1", &spufs_signal1_nosched_fops, 0222, },
         { "signal2", &spufs_signal2_nosched_fops, 0222, },
         { "signal1_type", &spufs_signal1_type, 0666, },
@@ -2609,7 +2665,7 @@ struct tree_descr spufs_dir_nosched_contents[] = {
         { "mfc", &spufs_mfc_fops, 0666, },
         { "cntl", &spufs_cntl_fops,  0666, },
         { "npc", &spufs_npc_ops, 0666, },
-        { "psmap", &spufs_psmap_fops, 0666, },
+        { "psmap", &spufs_psmap_fops, 0666, SPUFS_PS_MAP_SIZE, },
         { "phys-id", &spufs_id_ops, 0666, },
         { "object-id", &spufs_object_id_ops, 0666, },
         { "tid", &spufs_tid_fops, 0444, },
@@ -2617,6 +2673,11 @@ struct tree_descr spufs_dir_nosched_contents[] = {
         {},
 };
 
+struct spufs_tree_descr spufs_dir_debug_contents[] = {
+        { ".ctx", &spufs_ctx_fops, 0444, },
+        {},
+};
+
 struct spufs_coredump_reader spufs_coredump_read[] = {
         { "regs", __spufs_regs_read, NULL, sizeof(struct spu_reg128[128])},
         { "fpcr", __spufs_fpcr_read, NULL, sizeof(struct spu_reg128) },
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index f407b2471855..7123472801d9 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -42,10 +42,19 @@
 
 #include "spufs.h"
 
+struct spufs_sb_info {
+        int debug;
+};
+
 static struct kmem_cache *spufs_inode_cache;
 char *isolated_loader;
 static int isolated_loader_size;
 
+static struct spufs_sb_info *spufs_get_sb_info(struct super_block *sb)
+{
+        return sb->s_fs_info;
+}
+
 static struct inode *
 spufs_alloc_inode(struct super_block *sb)
 {
@@ -109,7 +118,7 @@ spufs_setattr(struct dentry *dentry, struct iattr *attr)
 static int
 spufs_new_file(struct super_block *sb, struct dentry *dentry,
                 const struct file_operations *fops, int mode,
-                struct spu_context *ctx)
+                size_t size, struct spu_context *ctx)
 {
         static struct inode_operations spufs_file_iops = {
                 .setattr = spufs_setattr,
@@ -125,6 +134,7 @@ spufs_new_file(struct super_block *sb, struct dentry *dentry,
         ret = 0;
         inode->i_op = &spufs_file_iops;
         inode->i_fop = fops;
+        inode->i_size = size;
         inode->i_private = SPUFS_I(inode)->i_ctx = get_spu_context(ctx);
         d_add(dentry, inode);
 out:
@@ -177,7 +187,7 @@ static int spufs_rmdir(struct inode *parent, struct dentry *dir)
         return simple_rmdir(parent, dir);
 }
 
-static int spufs_fill_dir(struct dentry *dir, struct tree_descr *files,
+static int spufs_fill_dir(struct dentry *dir, struct spufs_tree_descr *files,
                           int mode, struct spu_context *ctx)
 {
         struct dentry *dentry, *tmp;
@@ -189,7 +199,7 @@ static int spufs_fill_dir(struct dentry *dir, struct tree_descr *files,
                 if (!dentry)
                         goto out;
                 ret = spufs_new_file(dir->d_sb, dentry, files->ops,
-                                        files->mode & mode, ctx);
+                                        files->mode & mode, files->size, ctx);
                 if (ret)
                         goto out;
                 files++;
@@ -279,6 +289,13 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags,
         if (ret)
                 goto out_free_ctx;
 
+        if (spufs_get_sb_info(dir->i_sb)->debug)
+                ret = spufs_fill_dir(dentry, spufs_dir_debug_contents,
+                                mode, ctx);
+
+        if (ret)
+                goto out_free_ctx;
+
         d_instantiate(dentry, inode);
         dget(dentry);
         dir->i_nlink++;
@@ -639,18 +656,19 @@ out:
 
 /* File system initialization */
 enum {
-        Opt_uid, Opt_gid, Opt_mode, Opt_err,
+        Opt_uid, Opt_gid, Opt_mode, Opt_debug, Opt_err,
 };
 
 static match_table_t spufs_tokens = {
-        { Opt_uid,  "uid=%d" },
-        { Opt_gid,  "gid=%d" },
-        { Opt_mode, "mode=%o" },
-        { Opt_err,   NULL  },
+        { Opt_uid,   "uid=%d" },
+        { Opt_gid,   "gid=%d" },
+        { Opt_mode,  "mode=%o" },
+        { Opt_debug, "debug" },
+        { Opt_err,    NULL  },
 };
 
 static int
-spufs_parse_options(char *options, struct inode *root)
+spufs_parse_options(struct super_block *sb, char *options, struct inode *root)
 {
         char *p;
         substring_t args[MAX_OPT_ARGS];
@@ -678,6 +696,9 @@ spufs_parse_options(char *options, struct inode *root)
                                 return 0;
                         root->i_mode = option | S_IFDIR;
                         break;
+                case Opt_debug:
+                        spufs_get_sb_info(sb)->debug = 1;
+                        break;
                 default:
                         return 0;
                 }
@@ -736,7 +757,7 @@ spufs_create_root(struct super_block *sb, void *data)
         SPUFS_I(inode)->i_ctx = NULL;
 
         ret = -EINVAL;
-        if (!spufs_parse_options(data, inode))
+        if (!spufs_parse_options(sb, data, inode))
                 goto out_iput;
 
         ret = -ENOMEM;
@@ -754,6 +775,7 @@ out:
 static int
 spufs_fill_super(struct super_block *sb, void *data, int silent)
 {
+        struct spufs_sb_info *info;
         static struct super_operations s_ops = {
                 .alloc_inode = spufs_alloc_inode,
                 .destroy_inode = spufs_destroy_inode,
@@ -765,11 +787,16 @@ spufs_fill_super(struct super_block *sb, void *data, int silent)
 
         save_mount_options(sb, data);
 
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        if (!info)
+                return -ENOMEM;
+
         sb->s_maxbytes = MAX_LFS_FILESIZE;
         sb->s_blocksize = PAGE_CACHE_SIZE;
         sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
         sb->s_magic = SPUFS_MAGIC;
         sb->s_op = &s_ops;
+        sb->s_fs_info = info;
 
         return spufs_create_root(sb, data);
 }
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index e929e70a84e3..34654743363d 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -899,7 +899,8 @@ static noinline void spusched_tick(struct spu_context *ctx)
                         spu_add_to_rq(ctx);
         } else {
                 spu_context_nospu_trace(spusched_tick__newslice, ctx);
-                ctx->time_slice++;
+                if (!ctx->time_slice)
+                        ctx->time_slice++;
         }
 out:
         spu_release(ctx);
@@ -993,6 +994,7 @@ void spuctx_switch_state(struct spu_context *ctx,
         struct timespec ts;
         struct spu *spu;
         enum spu_utilization_state old_state;
+        int node;
 
         ktime_get_ts(&ts);
         curtime = timespec_to_ns(&ts);
@@ -1014,6 +1016,11 @@ void spuctx_switch_state(struct spu_context *ctx,
                 spu->stats.times[old_state] += delta;
                 spu->stats.util_state = new_state;
                 spu->stats.tstamp = curtime;
+                node = spu->node;
+                if (old_state == SPU_UTIL_USER)
+                        atomic_dec(&cbe_spu_info[node].busy_spus);
+                if (new_state == SPU_UTIL_USER);
+                        atomic_inc(&cbe_spu_info[node].busy_spus);
         }
 }
 
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index 454c277c1457..8ae8ef9dfc22 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -32,6 +32,13 @@
 #include <asm/spu_csa.h>
 #include <asm/spu_info.h>
 
+#define SPUFS_PS_MAP_SIZE       0x20000
+#define SPUFS_MFC_MAP_SIZE      0x1000
+#define SPUFS_CNTL_MAP_SIZE     0x1000
+#define SPUFS_CNTL_MAP_SIZE     0x1000
+#define SPUFS_SIGNAL_MAP_SIZE   PAGE_SIZE
+#define SPUFS_MSS_MAP_SIZE      0x1000
+
 /* The magic number for our file system */
 enum {
         SPUFS_MAGIC = 0x23c9b64e,
@@ -228,8 +235,16 @@ struct spufs_inode_info {
 #define SPUFS_I(inode) \
         container_of(inode, struct spufs_inode_info, vfs_inode)
 
-extern struct tree_descr spufs_dir_contents[];
-extern struct tree_descr spufs_dir_nosched_contents[];
+struct spufs_tree_descr {
+        const char *name;
+        const struct file_operations *ops;
+        int mode;
+        size_t size;
+};
+
+extern struct spufs_tree_descr spufs_dir_contents[];
+extern struct spufs_tree_descr spufs_dir_nosched_contents[];
+extern struct spufs_tree_descr spufs_dir_debug_contents[];
 
 /* system call implementation */
 extern struct spufs_calls spufs_calls;
diff --git a/arch/powerpc/platforms/cell/spufs/sputrace.c b/arch/powerpc/platforms/cell/spufs/sputrace.c
index 53202422ba72..8c0e95766a62 100644
--- a/arch/powerpc/platforms/cell/spufs/sputrace.c
+++ b/arch/powerpc/platforms/cell/spufs/sputrace.c
@@ -182,10 +182,10 @@ struct spu_probe spu_probes[] = {
         { "spu_yield__enter", "ctx %p", spu_context_nospu_event },
         { "spu_deactivate__enter", "ctx %p", spu_context_nospu_event },
         { "__spu_deactivate__unload", "ctx %p spu %p", spu_context_event },
-        { "spufs_ps_nopfn__enter", "ctx %p", spu_context_nospu_event },
-        { "spufs_ps_nopfn__sleep", "ctx %p", spu_context_nospu_event },
-        { "spufs_ps_nopfn__wake", "ctx %p spu %p", spu_context_event },
-        { "spufs_ps_nopfn__insert", "ctx %p spu %p", spu_context_event },
+        { "spufs_ps_fault__enter", "ctx %p", spu_context_nospu_event },
+        { "spufs_ps_fault__sleep", "ctx %p", spu_context_nospu_event },
+        { "spufs_ps_fault__wake", "ctx %p spu %p", spu_context_event },
+        { "spufs_ps_fault__insert", "ctx %p spu %p", spu_context_event },
         { "spu_acquire_saved__enter", "ctx %p", spu_context_nospu_event },
         { "destroy_spu_context__enter", "ctx %p", spu_context_nospu_event },
         { "spufs_stop_callback__enter", "ctx %p spu %p", spu_context_event },
diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index 116babbaaf81..1ba7ce5aafae 100644
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -63,13 +63,6 @@ static struct mpic *chrp_mpic;
 DEFINE_PER_CPU(struct timer_list, heartbeat_timer);
 unsigned long event_scan_interval;
 
-/*
- * XXX this should be in xmon.h, but putting it there means xmon.h
- * has to include <linux/interrupt.h> (to get irqreturn_t), which
- * causes all sorts of problems.  -- paulus
- */
-extern irqreturn_t xmon_irq(int, void *);
-
 extern unsigned long loops_per_jiffy;
 
 /* To be replaced by RTAS when available */
diff --git a/arch/powerpc/platforms/embedded6xx/Kconfig b/arch/powerpc/platforms/embedded6xx/Kconfig
index 429088967813..4f9f8184d164 100644
--- a/arch/powerpc/platforms/embedded6xx/Kconfig
+++ b/arch/powerpc/platforms/embedded6xx/Kconfig
@@ -59,6 +59,16 @@ config PPC_PRPMC2800
         help
           This option enables support for the Motorola PrPMC2800 board
 
+config PPC_C2K
+        bool "SBS/GEFanuc C2K board"
+        depends on EMBEDDED6xx
+        select MV64X60
+        select NOT_COHERENT_CACHE
+        select MTD_CFI_I4
+        help
+          This option enables support for the GE Fanuc C2K board (formerly
+          an SBS board).
+
 config TSI108_BRIDGE
         bool
         select PCI
diff --git a/arch/powerpc/platforms/embedded6xx/Makefile b/arch/powerpc/platforms/embedded6xx/Makefile
index 06524d3ffd2e..0773c08bd444 100644
--- a/arch/powerpc/platforms/embedded6xx/Makefile
+++ b/arch/powerpc/platforms/embedded6xx/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_LINKSTATION)	+= linkstation.o ls_uart.o
 obj-$(CONFIG_STORCENTER)        += storcenter.o
 obj-$(CONFIG_PPC_HOLLY)         += holly.o
 obj-$(CONFIG_PPC_PRPMC2800)     += prpmc2800.o
+obj-$(CONFIG_PPC_C2K)           += c2k.o
diff --git a/arch/powerpc/platforms/embedded6xx/c2k.c b/arch/powerpc/platforms/embedded6xx/c2k.c
new file mode 100644
index 000000000000..d0b25b8c39d1
--- /dev/null
+++ b/arch/powerpc/platforms/embedded6xx/c2k.c
@@ -0,0 +1,158 @@
+/*
+ * Board setup routines for the GEFanuc C2K board
+ *
+ * Author: Remi Machet <rmachet@slac.stanford.edu>
+ *
+ * Originated from prpmc2800.c
+ *
+ * 2008 (c) Stanford University
+ * 2007 (c) MontaVista, Software, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/seq_file.h>
+#include <linux/time.h>
+#include <linux/of.h>
+#include <linux/kexec.h>
+
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/system.h>
+#include <asm/time.h>
+
+#include <mm/mmu_decl.h>
+
+#include <sysdev/mv64x60.h>
+
+#define MV64x60_MPP_CNTL_0      0x0000
+#define MV64x60_MPP_CNTL_2      0x0008
+
+#define MV64x60_GPP_IO_CNTL     0x0000
+#define MV64x60_GPP_LEVEL_CNTL  0x0010
+#define MV64x60_GPP_VALUE_SET   0x0018
+
+static void __iomem *mv64x60_mpp_reg_base;
+static void __iomem *mv64x60_gpp_reg_base;
+
+static void __init c2k_setup_arch(void)
+{
+        struct device_node *np;
+        phys_addr_t paddr;
+        const unsigned int *reg;
+
+        /*
+         * ioremap mpp and gpp registers in case they are later
+         * needed by c2k_reset_board().
+         */
+        np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-mpp");
+        reg = of_get_property(np, "reg", NULL);
+        paddr = of_translate_address(np, reg);
+        of_node_put(np);
+        mv64x60_mpp_reg_base = ioremap(paddr, reg[1]);
+
+        np = of_find_compatible_node(NULL, NULL, "marvell,mv64360-gpp");
+        reg = of_get_property(np, "reg", NULL);
+        paddr = of_translate_address(np, reg);
+        of_node_put(np);
+        mv64x60_gpp_reg_base = ioremap(paddr, reg[1]);
+
+#ifdef CONFIG_PCI
+        mv64x60_pci_init();
+#endif
+}
+
+static void c2k_reset_board(void)
+{
+        u32 temp;
+
+        local_irq_disable();
+
+        temp = in_le32(mv64x60_mpp_reg_base + MV64x60_MPP_CNTL_0);
+        temp &= 0xFFFF0FFF;
+        out_le32(mv64x60_mpp_reg_base + MV64x60_MPP_CNTL_0, temp);
+
+        temp = in_le32(mv64x60_gpp_reg_base + MV64x60_GPP_LEVEL_CNTL);
+        temp |= 0x00000004;
+        out_le32(mv64x60_gpp_reg_base + MV64x60_GPP_LEVEL_CNTL, temp);
+
+        temp = in_le32(mv64x60_gpp_reg_base + MV64x60_GPP_IO_CNTL);
+        temp |= 0x00000004;
+        out_le32(mv64x60_gpp_reg_base + MV64x60_GPP_IO_CNTL, temp);
+
+        temp = in_le32(mv64x60_mpp_reg_base + MV64x60_MPP_CNTL_2);
+        temp &= 0xFFFF0FFF;
+        out_le32(mv64x60_mpp_reg_base + MV64x60_MPP_CNTL_2, temp);
+
+        temp = in_le32(mv64x60_gpp_reg_base + MV64x60_GPP_LEVEL_CNTL);
+        temp |= 0x00080000;
+        out_le32(mv64x60_gpp_reg_base + MV64x60_GPP_LEVEL_CNTL, temp);
+
+        temp = in_le32(mv64x60_gpp_reg_base + MV64x60_GPP_IO_CNTL);
+        temp |= 0x00080000;
+        out_le32(mv64x60_gpp_reg_base + MV64x60_GPP_IO_CNTL, temp);
+
+        out_le32(mv64x60_gpp_reg_base + MV64x60_GPP_VALUE_SET, 0x00080004);
+}
+
+static void c2k_restart(char *cmd)
+{
+        c2k_reset_board();
+        msleep(100);
+        panic("restart failed\n");
+}
+
+#ifdef CONFIG_NOT_COHERENT_CACHE
+#define COHERENCY_SETTING "off"
+#else
+#define COHERENCY_SETTING "on"
+#endif
+
+void c2k_show_cpuinfo(struct seq_file *m)
+{
+        uint memsize = total_memory;
+
+        seq_printf(m, "Vendor\t\t: GEFanuc\n");
+        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
+        seq_printf(m, "coherency\t: %s\n", COHERENCY_SETTING);
+}
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init c2k_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "GEFanuc,C2K"))
+                return 0;
+
+        printk(KERN_INFO "Detected a GEFanuc C2K board\n");
+
+        _set_L2CR(0);
+        _set_L2CR(L2CR_L2E | L2CR_L2PE | L2CR_L2I);
+        return 1;
+}
+
+define_machine(c2k) {
+        .name                   = "C2K",
+        .probe                  = c2k_probe,
+        .setup_arch             = c2k_setup_arch,
+        .init_early             = mv64x60_init_early,
+        .show_cpuinfo           = c2k_show_cpuinfo,
+        .init_IRQ               = mv64x60_init_irq,
+        .get_irq                = mv64x60_get_irq,
+        .restart                = c2k_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+#ifdef CONFIG_KEXEC
+        .machine_kexec          = default_machine_kexec,
+        .machine_kexec_prepare  = default_machine_kexec_prepare,
+        .machine_crash_shutdown = default_machine_crash_shutdown,
+#endif
+};
diff --git a/arch/powerpc/platforms/iseries/iommu.c b/arch/powerpc/platforms/iseries/iommu.c
index 11fa3c772ed5..ab5d8687c3cf 100644
--- a/arch/powerpc/platforms/iseries/iommu.c
+++ b/arch/powerpc/platforms/iseries/iommu.c
@@ -214,13 +214,13 @@ dma_addr_t iseries_hv_map(void *vaddr, size_t size,
                         enum dma_data_direction direction)
 {
         return iommu_map_single(NULL, &vio_iommu_table, vaddr, size,
-                                DMA_32BIT_MASK, direction);
+                                DMA_32BIT_MASK, direction, NULL);
 }
 
 void iseries_hv_unmap(dma_addr_t dma_handle, size_t size,
                         enum dma_data_direction direction)
 {
-        iommu_unmap_single(&vio_iommu_table, dma_handle, size, direction);
+        iommu_unmap_single(&vio_iommu_table, dma_handle, size, direction, NULL);
 }
 
 void __init iommu_vio_init(void)
diff --git a/arch/powerpc/platforms/maple/time.c b/arch/powerpc/platforms/maple/time.c
index 9f7579b38c72..53bca132fb48 100644
--- a/arch/powerpc/platforms/maple/time.c
+++ b/arch/powerpc/platforms/maple/time.c
@@ -41,8 +41,6 @@
 #define DBG(x...)
 #endif
 
-extern void GregorianDay(struct rtc_time * tm);
-
 static int maple_rtc_addr;
 
 static int maple_clock_read(int addr)
diff --git a/arch/powerpc/platforms/powermac/pic.c b/arch/powerpc/platforms/powermac/pic.c
index 829b8b02527b..6d149ae8ffa7 100644
--- a/arch/powerpc/platforms/powermac/pic.c
+++ b/arch/powerpc/platforms/powermac/pic.c
@@ -34,16 +34,10 @@
 #include <asm/time.h>
 #include <asm/pmac_feature.h>
 #include <asm/mpic.h>
+#include <asm/xmon.h>
 
 #include "pmac.h"
 
-/*
- * XXX this should be in xmon.h, but putting it there means xmon.h
- * has to include <linux/interrupt.h> (to get irqreturn_t), which
- * causes all sorts of problems.  -- paulus
- */
-extern irqreturn_t xmon_irq(int, void *);
-
 #ifdef CONFIG_PPC32
 struct pmac_irq_hw {
         unsigned int    event;
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index cb2d894541c6..4ae3d00e0bdd 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -36,6 +36,7 @@
 
 #include <asm/ptrace.h>
 #include <asm/atomic.h>
+#include <asm/code-patching.h>
 #include <asm/irq.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -786,8 +787,7 @@ static void __devinit smp_core99_kick_cpu(int nr)
 {
         unsigned int save_vector;
         unsigned long target, flags;
-        volatile unsigned int *vector
-                 = ((volatile unsigned int *)(KERNELBASE+0x100));
+        unsigned int *vector = (unsigned int *)(KERNELBASE+0x100);
 
         if (nr < 0 || nr > 3)
                 return;
@@ -804,7 +804,7 @@ static void __devinit smp_core99_kick_cpu(int nr)
          *   b __secondary_start_pmac_0 + nr*8 - KERNELBASE
          */
         target = (unsigned long) __secondary_start_pmac_0 + nr * 8;
-        create_branch((unsigned long)vector, target, BRANCH_SET_LINK);
+        patch_branch(vector, target, BRANCH_SET_LINK);
 
         /* Put some life in our friend */
         pmac_call_feature(PMAC_FTR_RESET_CPU, NULL, nr, 0);
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index 43c493fca2d0..d66c3628a112 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -349,9 +349,14 @@ static int ps3_system_bus_match(struct device *_dev,
 
         result = dev->match_id == drv->match_id;
 
-        pr_info("%s:%d: dev=%u(%s), drv=%u(%s): %s\n", __func__, __LINE__,
-                dev->match_id, dev->core.bus_id, drv->match_id, drv->core.name,
-                (result ? "match" : "miss"));
+        if (result)
+                pr_info("%s:%d: dev=%u(%s), drv=%u(%s): match\n", __func__,
+                        __LINE__, dev->match_id, dev->core.bus_id,
+                        drv->match_id, drv->core.name);
+        else
+                pr_debug("%s:%d: dev=%u(%s), drv=%u(%s): miss\n", __func__,
+                        __LINE__, dev->match_id, dev->core.bus_id,
+                        drv->match_id, drv->core.name);
         return result;
 }
 
@@ -362,7 +367,7 @@ static int ps3_system_bus_probe(struct device *_dev)
         struct ps3_system_bus_driver *drv;
 
         BUG_ON(!dev);
-        pr_info(" -> %s:%d: %s\n", __func__, __LINE__, _dev->bus_id);
+        pr_debug(" -> %s:%d: %s\n", __func__, __LINE__, _dev->bus_id);
 
         drv = ps3_system_bus_dev_to_system_bus_drv(dev);
         BUG_ON(!drv);
@@ -370,10 +375,10 @@ static int ps3_system_bus_probe(struct device *_dev)
         if (drv->probe)
                 result = drv->probe(dev);
         else
-                pr_info("%s:%d: %s no probe method\n", __func__, __LINE__,
+                pr_debug("%s:%d: %s no probe method\n", __func__, __LINE__,
                         dev->core.bus_id);
 
-        pr_info(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id);
+        pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id);
         return result;
 }
 
@@ -384,7 +389,7 @@ static int ps3_system_bus_remove(struct device *_dev)
         struct ps3_system_bus_driver *drv;
 
         BUG_ON(!dev);
-        pr_info(" -> %s:%d: %s\n", __func__, __LINE__, _dev->bus_id);
+        pr_debug(" -> %s:%d: %s\n", __func__, __LINE__, _dev->bus_id);
 
         drv = ps3_system_bus_dev_to_system_bus_drv(dev);
         BUG_ON(!drv);
@@ -395,7 +400,7 @@ static int ps3_system_bus_remove(struct device *_dev)
                 dev_dbg(&dev->core, "%s:%d %s: no remove method\n",
                         __func__, __LINE__, drv->core.name);
 
-        pr_info(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id);
+        pr_debug(" <- %s:%d: %s\n", __func__, __LINE__, dev->core.bus_id);
         return result;
 }
 
@@ -550,7 +555,7 @@ static void ps3_free_coherent(struct device *_dev, size_t size, void *vaddr,
  */
 
 static dma_addr_t ps3_sb_map_single(struct device *_dev, void *ptr, size_t size,
-        enum dma_data_direction direction)
+        enum dma_data_direction direction, struct dma_attrs *attrs)
 {
         struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
         int result;
@@ -570,7 +575,8 @@ static dma_addr_t ps3_sb_map_single(struct device *_dev, void *ptr, size_t size,
 
 static dma_addr_t ps3_ioc0_map_single(struct device *_dev, void *ptr,
                                       size_t size,
-                                      enum dma_data_direction direction)
+                                      enum dma_data_direction direction,
+                                      struct dma_attrs *attrs)
 {
         struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
         int result;
@@ -603,7 +609,7 @@ static dma_addr_t ps3_ioc0_map_single(struct device *_dev, void *ptr,
 }
 
 static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr,
-        size_t size, enum dma_data_direction direction)
+        size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
 {
         struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);
         int result;
@@ -617,7 +623,7 @@ static void ps3_unmap_single(struct device *_dev, dma_addr_t dma_addr,
 }
 
 static int ps3_sb_map_sg(struct device *_dev, struct scatterlist *sgl,
-        int nents, enum dma_data_direction direction)
+        int nents, enum dma_data_direction direction, struct dma_attrs *attrs)
 {
 #if defined(CONFIG_PS3_DYNAMIC_DMA)
         BUG_ON("do");
@@ -646,14 +652,15 @@ static int ps3_sb_map_sg(struct device *_dev, struct scatterlist *sgl,
 
 static int ps3_ioc0_map_sg(struct device *_dev, struct scatterlist *sg,
                            int nents,
-                           enum dma_data_direction direction)
+                           enum dma_data_direction direction,
+                           struct dma_attrs *attrs)
 {
         BUG();
         return 0;
 }
 
 static void ps3_sb_unmap_sg(struct device *_dev, struct scatterlist *sg,
-        int nents, enum dma_data_direction direction)
+        int nents, enum dma_data_direction direction, struct dma_attrs *attrs)
 {
 #if defined(CONFIG_PS3_DYNAMIC_DMA)
         BUG_ON("do");
@@ -661,7 +668,8 @@ static void ps3_sb_unmap_sg(struct device *_dev, struct scatterlist *sg,
 }
 
 static void ps3_ioc0_unmap_sg(struct device *_dev, struct scatterlist *sg,
-                            int nents, enum dma_data_direction direction)
+                            int nents, enum dma_data_direction direction,
+                            struct dma_attrs *attrs)
 {
         BUG();
 }
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 6f544ba4b37f..c027f0a70a04 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -812,6 +812,7 @@ int rtas_set_slot_reset(struct pci_dn *pdn)
 static inline void __restore_bars (struct pci_dn *pdn)
 {
         int i;
+        u32 cmd;
 
         if (NULL==pdn->phb) return;
         for (i=4; i<10; i++) {
@@ -832,6 +833,19 @@ static inline void __restore_bars (struct pci_dn *pdn)
 
         /* max latency, min grant, interrupt pin and line */
         rtas_write_config(pdn, 15*4, 4, pdn->config_space[15]);
+
+        /* Restore PERR & SERR bits, some devices require it,
+           don't touch the other command bits */
+        rtas_read_config(pdn, PCI_COMMAND, 4, &cmd);
+        if (pdn->config_space[1] & PCI_COMMAND_PARITY)
+                cmd |= PCI_COMMAND_PARITY;
+        else
+                cmd &= ~PCI_COMMAND_PARITY;
+        if (pdn->config_space[1] & PCI_COMMAND_SERR)
+                cmd |= PCI_COMMAND_SERR;
+        else
+                cmd &= ~PCI_COMMAND_SERR;
+        rtas_write_config(pdn, PCI_COMMAND, 4, cmd);
 }
 
 /**
diff --git a/arch/powerpc/platforms/pseries/firmware.c b/arch/powerpc/platforms/pseries/firmware.c
index 9d3a40f45974..5a707da3f5c2 100644
--- a/arch/powerpc/platforms/pseries/firmware.c
+++ b/arch/powerpc/platforms/pseries/firmware.c
@@ -26,6 +26,7 @@
 #include <asm/prom.h>
 #include <asm/udbg.h>
 
+#include "pseries.h"
 
 typedef struct {
     unsigned long val;
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index 3c5727dd5aa5..a1a368dd2d99 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -15,34 +15,13 @@
 #include <asm/machdep.h>
 #include <asm/pSeries_reconfig.h>
 
-static int pseries_remove_memory(struct device_node *np)
+static int pseries_remove_lmb(unsigned long base, unsigned int lmb_size)
 {
-        const char *type;
-        const unsigned int *my_index;
-        const unsigned int *regs;
-        u64 start_pfn, start;
+        unsigned long start, start_pfn;
         struct zone *zone;
-        int ret = -EINVAL;
-
-        /*
-         * Check to see if we are actually removing memory
-         */
-        type = of_get_property(np, "device_type", NULL);
-        if (type == NULL || strcmp(type, "memory") != 0)
-                return 0;
+        int ret;
 
-        /*
-         * Find the memory index and size of the removing section
-         */
-        my_index = of_get_property(np, "ibm,my-drc-index", NULL);
-        if (!my_index)
-                return ret;
-
-        regs = of_get_property(np, "reg", NULL);
-        if (!regs)
-                return ret;
-
-        start_pfn = section_nr_to_pfn(*my_index & 0xffff);
+        start_pfn = base >> PFN_SECTION_SHIFT;
         zone = page_zone(pfn_to_page(start_pfn));
 
         /*
@@ -54,56 +33,111 @@ static int pseries_remove_memory(struct device_node *np)
          * to sysfs "state" file and we can't remove sysfs entries
          * while writing to it. So we have to defer it to here.
          */
-        ret = __remove_pages(zone, start_pfn, regs[3] >> PAGE_SHIFT);
+        ret = __remove_pages(zone, start_pfn, lmb_size >> PAGE_SHIFT);
         if (ret)
                 return ret;
 
         /*
          * Update memory regions for memory remove
          */
-        lmb_remove(start_pfn << PAGE_SHIFT, regs[3]);
+        lmb_remove(base, lmb_size);
 
         /*
          * Remove htab bolted mappings for this section of memory
          */
-        start = (unsigned long)__va(start_pfn << PAGE_SHIFT);
-        ret = remove_section_mapping(start, start + regs[3]);
+        start = (unsigned long)__va(base);
+        ret = remove_section_mapping(start, start + lmb_size);
         return ret;
 }
 
-static int pseries_add_memory(struct device_node *np)
+static int pseries_remove_memory(struct device_node *np)
 {
         const char *type;
-        const unsigned int *my_index;
         const unsigned int *regs;
-        u64 start_pfn;
+        unsigned long base;
+        unsigned int lmb_size;
         int ret = -EINVAL;
 
         /*
-         * Check to see if we are actually adding memory
+         * Check to see if we are actually removing memory
          */
         type = of_get_property(np, "device_type", NULL);
         if (type == NULL || strcmp(type, "memory") != 0)
                 return 0;
 
         /*
-         * Find the memory index and size of the added section
+         * Find the bae address and size of the lmb
          */
-        my_index = of_get_property(np, "ibm,my-drc-index", NULL);
-        if (!my_index)
+        regs = of_get_property(np, "reg", NULL);
+        if (!regs)
                 return ret;
 
+        base = *(unsigned long *)regs;
+        lmb_size = regs[3];
+
+        ret = pseries_remove_lmb(base, lmb_size);
+        return ret;
+}
+
+static int pseries_add_memory(struct device_node *np)
+{
+        const char *type;
+        const unsigned int *regs;
+        unsigned long base;
+        unsigned int lmb_size;
+        int ret = -EINVAL;
+
+        /*
+         * Check to see if we are actually adding memory
+         */
+        type = of_get_property(np, "device_type", NULL);
+        if (type == NULL || strcmp(type, "memory") != 0)
+                return 0;
+
+        /*
+         * Find the base and size of the lmb
+         */
         regs = of_get_property(np, "reg", NULL);
         if (!regs)
                 return ret;
 
-        start_pfn = section_nr_to_pfn(*my_index & 0xffff);
+        base = *(unsigned long *)regs;
+        lmb_size = regs[3];
 
         /*
          * Update memory region to represent the memory add
          */
-        lmb_add(start_pfn << PAGE_SHIFT, regs[3]);
-        return 0;
+        ret = lmb_add(base, lmb_size);
+        return (ret < 0) ? -EINVAL : 0;
+}
+
+static int pseries_drconf_memory(unsigned long *base, unsigned int action)
+{
+        struct device_node *np;
+        const unsigned long *lmb_size;
+        int rc;
+
+        np = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
+        if (!np)
+                return -EINVAL;
+
+        lmb_size = of_get_property(np, "ibm,lmb-size", NULL);
+        if (!lmb_size) {
+                of_node_put(np);
+                return -EINVAL;
+        }
+
+        if (action == PSERIES_DRCONF_MEM_ADD) {
+                rc = lmb_add(*base, *lmb_size);
+                rc = (rc < 0) ? -EINVAL : 0;
+        } else if (action == PSERIES_DRCONF_MEM_REMOVE) {
+                rc = pseries_remove_lmb(*base, *lmb_size);
+        } else {
+                rc = -EINVAL;
+        }
+
+        of_node_put(np);
+        return rc;
 }
 
 static int pseries_memory_notifier(struct notifier_block *nb,
@@ -120,6 +154,11 @@ static int pseries_memory_notifier(struct notifier_block *nb,
                 if (pseries_remove_memory(node))
                         err = NOTIFY_BAD;
                 break;
+        case PSERIES_DRCONF_MEM_ADD:
+        case PSERIES_DRCONF_MEM_REMOVE:
+                if (pseries_drconf_memory(node, action))
+                        err = NOTIFY_BAD;
+                break;
         default:
                 err = NOTIFY_DONE;
                 break;
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 176f1f39d2d5..9a12908510fb 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -135,9 +135,10 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
         u64 rpn;
         long l, limit;
 
-        if (npages == 1)
-                return tce_build_pSeriesLP(tbl, tcenum, npages, uaddr,
-                                           direction);
+        if (npages == 1) {
+                tce_build_pSeriesLP(tbl, tcenum, npages, uaddr, direction);
+                return;
+        }
 
         tcep = __get_cpu_var(tce_page);
 
@@ -147,9 +148,11 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum,
         if (!tcep) {
                 tcep = (u64 *)__get_free_page(GFP_ATOMIC);
                 /* If allocation fails, fall back to the loop implementation */
-                if (!tcep)
-                        return tce_build_pSeriesLP(tbl, tcenum, npages,
-                                                   uaddr, direction);
+                if (!tcep) {
+                        tce_build_pSeriesLP(tbl, tcenum, npages, uaddr,
+                                            direction);
+                        return;
+                }
                 __get_cpu_var(tce_page) = tcep;
         }
 
diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c
index e9dd5fe081c9..53cbd53d8740 100644
--- a/arch/powerpc/platforms/pseries/kexec.c
+++ b/arch/powerpc/platforms/pseries/kexec.c
@@ -70,4 +70,4 @@ static int __init pseries_kexec_setup(void)
 
         return 0;
 }
-__initcall(pseries_kexec_setup);
+machine_device_initcall(pseries, pseries_kexec_setup);
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 2cbaedb17f3e..52a80e5840e8 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -52,7 +52,7 @@ EXPORT_SYMBOL(plpar_hcall_norets);
 extern void pSeries_find_serial_port(void);
 
 
-int vtermno;    /* virtual terminal# for udbg  */
+static int vtermno;     /* virtual terminal# for udbg  */
 
 #define __ALIGNED__ __attribute__((__aligned__(sizeof(long))))
 static void udbg_hvsi_putc(char c)
@@ -305,7 +305,7 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
         flags = 0;
 
         /* Make pHyp happy */
-        if (rflags & (_PAGE_GUARDED|_PAGE_NO_CACHE))
+        if ((rflags & _PAGE_NO_CACHE) & !(rflags & _PAGE_WRITETHRU))
                 hpte_r &= ~_PAGE_COHERENT;
 
         lpar_rc = plpar_pte_enter(flags, hpte_group, hpte_v, hpte_r, &slot);
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c
index 2b548afd1003..d20b96e22c2e 100644
--- a/arch/powerpc/platforms/pseries/ras.c
+++ b/arch/powerpc/platforms/pseries/ras.c
@@ -55,7 +55,7 @@
 static unsigned char ras_log_buf[RTAS_ERROR_LOG_MAX];
 static DEFINE_SPINLOCK(ras_log_buf_lock);
 
-char mce_data_buf[RTAS_ERROR_LOG_MAX];
+static char mce_data_buf[RTAS_ERROR_LOG_MAX];
 
 static int ras_get_sensor_state_token;
 static int ras_check_exception_token;
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 75769aae41d5..7637bd38c795 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -365,7 +365,7 @@ static char *parse_node(char *buf, size_t bufsize, struct device_node **npp)
         *buf = '\0';
         buf++;
 
-        handle = simple_strtoul(handle_str, NULL, 10);
+        handle = simple_strtoul(handle_str, NULL, 0);
 
         *npp = of_find_node_by_phandle(handle);
         return buf;
@@ -422,8 +422,8 @@ static int do_update_property(char *buf, size_t bufsize)
 {
         struct device_node *np;
         unsigned char *value;
-        char *name, *end;
-        int length;
+        char *name, *end, *next_prop;
+        int rc, length;
         struct property *newprop, *oldprop;
         buf = parse_node(buf, bufsize, &np);
         end = buf + bufsize;
@@ -431,7 +431,8 @@ static int do_update_property(char *buf, size_t bufsize)
         if (!np)
                 return -ENODEV;
 
-        if (parse_next_property(buf, end, &name, &length, &value) == NULL)
+        next_prop = parse_next_property(buf, end, &name, &length, &value);
+        if (!next_prop)
                 return -EINVAL;
 
         newprop = new_property(name, length, value, NULL);
@@ -442,7 +443,34 @@ static int do_update_property(char *buf, size_t bufsize)
         if (!oldprop)
                 return -ENODEV;
 
-        return prom_update_property(np, newprop, oldprop);
+        rc = prom_update_property(np, newprop, oldprop);
+        if (rc)
+                return rc;
+
+        /* For memory under the ibm,dynamic-reconfiguration-memory node
+         * of the device tree, adding and removing memory is just an update
+         * to the ibm,dynamic-memory property instead of adding/removing a
+         * memory node in the device tree.  For these cases we still need to
+         * involve the notifier chain.
+         */
+        if (!strcmp(name, "ibm,dynamic-memory")) {
+                int action;
+
+                next_prop = parse_next_property(next_prop, end, &name,
+                                                &length, &value);
+                if (!next_prop)
+                        return -EINVAL;
+
+                if (!strcmp(name, "add"))
+                        action = PSERIES_DRCONF_MEM_ADD;
+                else
+                        action = PSERIES_DRCONF_MEM_REMOVE;
+
+                blocking_notifier_call_chain(&pSeries_reconfig_chain,
+                                             action, value);
+        }
+
+        return 0;
 }
 
 /**
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index 7d3e2b0bd4d2..c9ffd8c225f1 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -32,7 +32,7 @@
 
 static DEFINE_SPINLOCK(rtasd_log_lock);
 
-DECLARE_WAIT_QUEUE_HEAD(rtas_log_wait);
+static DECLARE_WAIT_QUEUE_HEAD(rtas_log_wait);
 
 static char *rtas_log_buf;
 static unsigned long rtas_log_start;
@@ -329,7 +329,7 @@ static unsigned int rtas_log_poll(struct file *file, poll_table * wait)
         return 0;
 }
 
-const struct file_operations proc_rtas_log_operations = {
+static const struct file_operations proc_rtas_log_operations = {
         .read =         rtas_log_read,
         .poll =         rtas_log_poll,
         .open =         rtas_log_open,
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index f5d29f5b13c1..90beb444e1dd 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -109,7 +109,7 @@ static void __init fwnmi_init(void)
                 fwnmi_active = 1;
 }
 
-void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc)
+static void pseries_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
         unsigned int cascade_irq = i8259_irq();
         if (cascade_irq != NO_IRQ)
@@ -482,7 +482,7 @@ static int pSeries_pci_probe_mode(struct pci_bus *bus)
  * possible with power button press. If ibm,power-off-ups token is used
  * it will allow auto poweron after power is restored.
  */
-void pSeries_power_off(void)
+static void pSeries_power_off(void)
 {
         int rc;
         int rtas_poweroff_ups_token = rtas_token("ibm,power-off-ups");
diff --git a/arch/powerpc/sysdev/6xx-suspend.S b/arch/powerpc/sysdev/6xx-suspend.S
new file mode 100644
index 000000000000..21cda085d926
--- /dev/null
+++ b/arch/powerpc/sysdev/6xx-suspend.S
@@ -0,0 +1,52 @@
+/*
+ * Enter and leave sleep state on chips with 6xx-style HID0
+ * power management bits, which don't leave sleep state via reset.
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 2006-2007 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+
+#include <asm/ppc_asm.h>
+#include <asm/reg.h>
+#include <asm/thread_info.h>
+#include <asm/asm-offsets.h>
+
+_GLOBAL(mpc6xx_enter_standby)
+        mflr    r4
+
+        mfspr   r5, SPRN_HID0
+        rlwinm  r5, r5, 0, ~(HID0_DOZE | HID0_NAP)
+        oris    r5, r5, HID0_SLEEP@h
+        mtspr   SPRN_HID0, r5
+        isync
+
+        lis     r5, ret_from_standby@h
+        ori     r5, r5, ret_from_standby@l
+        mtlr    r5
+
+        rlwinm  r5, r1, 0, 0, 31-THREAD_SHIFT
+        lwz     r6, TI_LOCAL_FLAGS(r5)
+        ori     r6, r6, _TLF_SLEEPING
+        stw     r6, TI_LOCAL_FLAGS(r5)
+
+        mfmsr   r5
+        ori     r5, r5, MSR_EE
+        oris    r5, r5, MSR_POW@h
+        sync
+        mtmsr   r5
+        isync
+
+1:      b       1b
+
+ret_from_standby:
+        mfspr   r5, SPRN_HID0
+        rlwinm  r5, r5, 0, ~HID0_SLEEP
+        mtspr   SPRN_HID0, r5
+
+        mtlr    r4
+        blr
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 6d386d0071a0..16a0ed28eb00 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -4,6 +4,7 @@ endif
 
 mpic-msi-obj-$(CONFIG_PCI_MSI)  += mpic_msi.o mpic_u3msi.o mpic_pasemi_msi.o
 obj-$(CONFIG_MPIC)              += mpic.o $(mpic-msi-obj-y)
+fsl-msi-obj-$(CONFIG_PCI_MSI)   += fsl_msi.o
 
 obj-$(CONFIG_PPC_MPC106)        += grackle.o
 obj-$(CONFIG_PPC_DCR_NATIVE)    += dcr-low.o
@@ -11,8 +12,9 @@ obj-$(CONFIG_PPC_PMI)		+= pmi.o
 obj-$(CONFIG_U3_DART)           += dart_iommu.o
 obj-$(CONFIG_MMIO_NVRAM)        += mmio_nvram.o
 obj-$(CONFIG_FSL_SOC)           += fsl_soc.o
-obj-$(CONFIG_FSL_PCI)           += fsl_pci.o
+obj-$(CONFIG_FSL_PCI)           += fsl_pci.o $(fsl-msi-obj-y)
 obj-$(CONFIG_FSL_LBC)           += fsl_lbc.o
+obj-$(CONFIG_FSL_GTM)           += fsl_gtm.o
 obj-$(CONFIG_RAPIDIO)           += fsl_rio.o
 obj-$(CONFIG_TSI108_BRIDGE)     += tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)      += qe_lib/
@@ -40,7 +42,12 @@ endif
 ifeq ($(ARCH),powerpc)
 obj-$(CONFIG_CPM)               += cpm_common.o
 obj-$(CONFIG_CPM2)              += cpm2.o cpm2_pic.o
+obj-$(CONFIG_QUICC_ENGINE)      += cpm_common.o
 obj-$(CONFIG_PPC_DCR)           += dcr.o
 obj-$(CONFIG_8xx)               += mpc8xx_pic.o cpm1.o
 obj-$(CONFIG_UCODE_PATCH)       += micropatch.o
 endif
+
+ifeq ($(CONFIG_SUSPEND),y)
+obj-$(CONFIG_6xx)               += 6xx-suspend.o
+endif
diff --git a/arch/powerpc/sysdev/bestcomm/bestcomm.c b/arch/powerpc/sysdev/bestcomm/bestcomm.c
index 64ec7d629363..446c9ea85b30 100644
--- a/arch/powerpc/sysdev/bestcomm/bestcomm.c
+++ b/arch/powerpc/sysdev/bestcomm/bestcomm.c
@@ -443,7 +443,7 @@ mpc52xx_bcom_probe(struct of_device *op, const struct of_device_id *match)
 
         /* Done ! */
         printk(KERN_INFO "DMA: MPC52xx BestComm engine @%08lx ok !\n",
-                bcom_eng->regs_base);
+                (long)bcom_eng->regs_base);
 
         return 0;
 
diff --git a/arch/powerpc/sysdev/bestcomm/gen_bd.c b/arch/powerpc/sysdev/bestcomm/gen_bd.c
index 8d33eafbb3f4..a3a134c35b0a 100644
--- a/arch/powerpc/sysdev/bestcomm/gen_bd.c
+++ b/arch/powerpc/sysdev/bestcomm/gen_bd.c
@@ -20,6 +20,7 @@
 #include <asm/io.h>
 
 #include <asm/mpc52xx.h>
+#include <asm/mpc52xx_psc.h>
 
 #include "bestcomm.h"
 #include "bestcomm_priv.h"
@@ -253,6 +254,100 @@ bcom_gen_bd_tx_release(struct bcom_task *tsk)
 }
 EXPORT_SYMBOL_GPL(bcom_gen_bd_tx_release);
 
+/* ---------------------------------------------------------------------
+ * PSC support code
+ */
+
+/**
+ * bcom_psc_parameters - Bestcomm initialization value table for PSC devices
+ *
+ * This structure is only used internally.  It is a lookup table for PSC
+ * specific parameters to bestcomm tasks.
+ */
+static struct bcom_psc_params {
+        int rx_initiator;
+        int rx_ipr;
+        int tx_initiator;
+        int tx_ipr;
+} bcom_psc_params[] = {
+        [0] = {
+                .rx_initiator = BCOM_INITIATOR_PSC1_RX,
+                .rx_ipr = BCOM_IPR_PSC1_RX,
+                .tx_initiator = BCOM_INITIATOR_PSC1_TX,
+                .tx_ipr = BCOM_IPR_PSC1_TX,
+        },
+        [1] = {
+                .rx_initiator = BCOM_INITIATOR_PSC2_RX,
+                .rx_ipr = BCOM_IPR_PSC2_RX,
+                .tx_initiator = BCOM_INITIATOR_PSC2_TX,
+                .tx_ipr = BCOM_IPR_PSC2_TX,
+        },
+        [2] = {
+                .rx_initiator = BCOM_INITIATOR_PSC3_RX,
+                .rx_ipr = BCOM_IPR_PSC3_RX,
+                .tx_initiator = BCOM_INITIATOR_PSC3_TX,
+                .tx_ipr = BCOM_IPR_PSC3_TX,
+        },
+        [3] = {
+                .rx_initiator = BCOM_INITIATOR_PSC4_RX,
+                .rx_ipr = BCOM_IPR_PSC4_RX,
+                .tx_initiator = BCOM_INITIATOR_PSC4_TX,
+                .tx_ipr = BCOM_IPR_PSC4_TX,
+        },
+        [4] = {
+                .rx_initiator = BCOM_INITIATOR_PSC5_RX,
+                .rx_ipr = BCOM_IPR_PSC5_RX,
+                .tx_initiator = BCOM_INITIATOR_PSC5_TX,
+                .tx_ipr = BCOM_IPR_PSC5_TX,
+        },
+        [5] = {
+                .rx_initiator = BCOM_INITIATOR_PSC6_RX,
+                .rx_ipr = BCOM_IPR_PSC6_RX,
+                .tx_initiator = BCOM_INITIATOR_PSC6_TX,
+                .tx_ipr = BCOM_IPR_PSC6_TX,
+        },
+};
+
+/**
+ * bcom_psc_gen_bd_rx_init - Allocate a receive bcom_task for a PSC port
+ * @psc_num:    Number of the PSC to allocate a task for
+ * @queue_len:  number of buffer descriptors to allocate for the task
+ * @fifo:       physical address of FIFO register
+ * @maxbufsize: Maximum receive data size in bytes.
+ *
+ * Allocate a bestcomm task structure for receiving data from a PSC.
+ */
+struct bcom_task * bcom_psc_gen_bd_rx_init(unsigned psc_num, int queue_len,
+                                           phys_addr_t fifo, int maxbufsize)
+{
+        if (psc_num >= MPC52xx_PSC_MAXNUM)
+                return NULL;
+
+        return bcom_gen_bd_rx_init(queue_len, fifo,
+                                   bcom_psc_params[psc_num].rx_initiator,
+                                   bcom_psc_params[psc_num].rx_ipr,
+                                   maxbufsize);
+}
+EXPORT_SYMBOL_GPL(bcom_psc_gen_bd_rx_init);
+
+/**
+ * bcom_psc_gen_bd_tx_init - Allocate a transmit bcom_task for a PSC port
+ * @psc_num:    Number of the PSC to allocate a task for
+ * @queue_len:  number of buffer descriptors to allocate for the task
+ * @fifo:       physical address of FIFO register
+ *
+ * Allocate a bestcomm task structure for transmitting data to a PSC.
+ */
+struct bcom_task *
+bcom_psc_gen_bd_tx_init(unsigned psc_num, int queue_len, phys_addr_t fifo)
+{
+        struct psc;
+        return bcom_gen_bd_tx_init(queue_len, fifo,
+                                   bcom_psc_params[psc_num].tx_initiator,
+                                   bcom_psc_params[psc_num].tx_ipr);
+}
+EXPORT_SYMBOL_GPL(bcom_psc_gen_bd_tx_init);
+
 
 MODULE_DESCRIPTION("BestComm General Buffer Descriptor tasks driver");
 MODULE_AUTHOR("Jeff Gibbons <jeff.gibbons@appspec.com>");
diff --git a/arch/powerpc/sysdev/bestcomm/gen_bd.h b/arch/powerpc/sysdev/bestcomm/gen_bd.h
index 5b6fa803c6aa..de47260e69da 100644
--- a/arch/powerpc/sysdev/bestcomm/gen_bd.h
+++ b/arch/powerpc/sysdev/bestcomm/gen_bd.h
@@ -44,5 +44,10 @@ extern void
 bcom_gen_bd_tx_release(struct bcom_task *tsk);
 
 
+/* PSC support utility wrappers */
+struct bcom_task * bcom_psc_gen_bd_rx_init(unsigned psc_num, int queue_len,
+                                           phys_addr_t fifo, int maxbufsize);
+struct bcom_task * bcom_psc_gen_bd_tx_init(unsigned psc_num, int queue_len,
+                                           phys_addr_t fifo);
 #endif  /* __BESTCOMM_GEN_BD_H__ */
 
diff --git a/arch/powerpc/sysdev/bestcomm/sram.c b/arch/powerpc/sysdev/bestcomm/sram.c
index 99784383a843..5d74ef7a651f 100644
--- a/arch/powerpc/sysdev/bestcomm/sram.c
+++ b/arch/powerpc/sysdev/bestcomm/sram.c
@@ -86,7 +86,7 @@ int bcom_sram_init(struct device_node *sram_node, char *owner)
         if (!bcom_sram->base_virt) {
                 printk(KERN_ERR "%s: bcom_sram_init: "
                         "Map error SRAM zone 0x%08lx (0x%0x)!\n",
-                        owner, bcom_sram->base_phys, bcom_sram->size );
+                        owner, (long)bcom_sram->base_phys, bcom_sram->size );
                 rv = -ENOMEM;
                 goto error_release;
         }
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 58292a086c16..661df42830b9 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -159,7 +159,7 @@ unsigned int cpm_pic_init(void)
 
         out_be32(&cpic_reg->cpic_cimr, 0);
 
-        cpm_pic_host = irq_alloc_host(of_node_get(np), IRQ_HOST_MAP_LINEAR,
+        cpm_pic_host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR,
                                       64, &cpm_pic_host_ops, 64);
         if (cpm_pic_host == NULL) {
                 printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n");
diff --git a/arch/powerpc/sysdev/cpm2_pic.c b/arch/powerpc/sysdev/cpm2_pic.c
index 5fe65b2f8f3a..b16ca3ed65d2 100644
--- a/arch/powerpc/sysdev/cpm2_pic.c
+++ b/arch/powerpc/sysdev/cpm2_pic.c
@@ -266,7 +266,7 @@ void cpm2_pic_init(struct device_node *node)
         out_be32(&cpm2_intctl->ic_scprrl, 0x05309770);
 
         /* create a legacy host */
-        cpm2_pic_host = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+        cpm2_pic_host = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
                                        64, &cpm2_pic_host_ops, 64);
         if (cpm2_pic_host == NULL) {
                 printk(KERN_ERR "CPM2 PIC: failed to allocate irq host!\n");
diff --git a/arch/powerpc/sysdev/cpm_common.c b/arch/powerpc/sysdev/cpm_common.c
index cb7df2dce44f..e4b7296acb2c 100644
--- a/arch/powerpc/sysdev/cpm_common.c
+++ b/arch/powerpc/sysdev/cpm_common.c
@@ -37,7 +37,7 @@ static void udbg_putc_cpm(char c)
         u8 __iomem *txbuf = (u8 __iomem __force *)in_be32(&cpm_udbg_txdesc[1]);
 
         if (c == '\n')
-                udbg_putc('\r');
+                udbg_putc_cpm('\r');
 
         while (in_be32(&cpm_udbg_txdesc[0]) & 0x80000000)
                 ;
@@ -53,7 +53,6 @@ void __init udbg_init_cpm(void)
                 setbat(1, 0xf0000000, 0xf0000000, 1024*1024, _PAGE_IO);
 #endif
                 udbg_putc = udbg_putc_cpm;
-                udbg_putc('X');
         }
 }
 #endif
@@ -85,9 +84,13 @@ int __init cpm_muram_init(void)
 
         np = of_find_compatible_node(NULL, NULL, "fsl,cpm-muram-data");
         if (!np) {
-                printk(KERN_ERR "Cannot find CPM muram data node");
-                ret = -ENODEV;
-                goto out;
+                /* try legacy bindings */
+                np = of_find_node_by_name(NULL, "data-only");
+                if (!np) {
+                        printk(KERN_ERR "Cannot find CPM muram data node");
+                        ret = -ENODEV;
+                        goto out;
+                }
         }
 
         muram_pbase = of_translate_address(np, zero);
@@ -189,6 +192,12 @@ void __iomem *cpm_muram_addr(unsigned long offset)
 }
 EXPORT_SYMBOL(cpm_muram_addr);
 
+unsigned long cpm_muram_offset(void __iomem *addr)
+{
+        return addr - (void __iomem *)muram_vbase;
+}
+EXPORT_SYMBOL(cpm_muram_offset);
+
 /**
  * cpm_muram_dma - turn a muram virtual address into a DMA address
  * @offset: virtual address from cpm_muram_addr() to convert
diff --git a/arch/powerpc/sysdev/dcr.c b/arch/powerpc/sysdev/dcr.c
index 437e48d3ae33..a8ba9983dd5a 100644
--- a/arch/powerpc/sysdev/dcr.c
+++ b/arch/powerpc/sysdev/dcr.c
@@ -23,6 +23,107 @@
 #include <asm/prom.h>
 #include <asm/dcr.h>
 
+#ifdef CONFIG_PPC_DCR_MMIO
+static struct device_node *find_dcr_parent(struct device_node *node)
+{
+        struct device_node *par, *tmp;
+        const u32 *p;
+
+        for (par = of_node_get(node); par;) {
+                if (of_get_property(par, "dcr-controller", NULL))
+                        break;
+                p = of_get_property(par, "dcr-parent", NULL);
+                tmp = par;
+                if (p == NULL)
+                        par = of_get_parent(par);
+                else
+                        par = of_find_node_by_phandle(*p);
+                of_node_put(tmp);
+        }
+        return par;
+}
+#endif
+
+#if defined(CONFIG_PPC_DCR_NATIVE) && defined(CONFIG_PPC_DCR_MMIO)
+
+bool dcr_map_ok_generic(dcr_host_t host)
+{
+        if (host.type == DCR_HOST_NATIVE)
+                return dcr_map_ok_native(host.host.native);
+        else if (host.type == DCR_HOST_MMIO)
+                return dcr_map_ok_mmio(host.host.mmio);
+        else
+                return 0;
+}
+EXPORT_SYMBOL_GPL(dcr_map_ok_generic);
+
+dcr_host_t dcr_map_generic(struct device_node *dev,
+                           unsigned int dcr_n,
+                           unsigned int dcr_c)
+{
+        dcr_host_t host;
+        struct device_node *dp;
+        const char *prop;
+
+        host.type = DCR_HOST_INVALID;
+
+        dp = find_dcr_parent(dev);
+        if (dp == NULL)
+                return host;
+
+        prop = of_get_property(dp, "dcr-access-method", NULL);
+
+        pr_debug("dcr_map_generic(dcr-access-method = %s)\n", prop);
+
+        if (!strcmp(prop, "native")) {
+                host.type = DCR_HOST_NATIVE;
+                host.host.native = dcr_map_native(dev, dcr_n, dcr_c);
+        } else if (!strcmp(prop, "mmio")) {
+                host.type = DCR_HOST_MMIO;
+                host.host.mmio = dcr_map_mmio(dev, dcr_n, dcr_c);
+        }
+
+        of_node_put(dp);
+        return host;
+}
+EXPORT_SYMBOL_GPL(dcr_map_generic);
+
+void dcr_unmap_generic(dcr_host_t host, unsigned int dcr_c)
+{
+        if (host.type == DCR_HOST_NATIVE)
+                dcr_unmap_native(host.host.native, dcr_c);
+        else if (host.type == DCR_HOST_MMIO)
+                dcr_unmap_mmio(host.host.mmio, dcr_c);
+        else /* host.type == DCR_HOST_INVALID */
+                WARN_ON(true);
+}
+EXPORT_SYMBOL_GPL(dcr_unmap_generic);
+
+u32 dcr_read_generic(dcr_host_t host, unsigned int dcr_n)
+{
+        if (host.type == DCR_HOST_NATIVE)
+                return dcr_read_native(host.host.native, dcr_n);
+        else if (host.type == DCR_HOST_MMIO)
+                return dcr_read_mmio(host.host.mmio, dcr_n);
+        else /* host.type == DCR_HOST_INVALID */
+                WARN_ON(true);
+        return 0;
+}
+EXPORT_SYMBOL_GPL(dcr_read_generic);
+
+void dcr_write_generic(dcr_host_t host, unsigned int dcr_n, u32 value)
+{
+        if (host.type == DCR_HOST_NATIVE)
+                dcr_write_native(host.host.native, dcr_n, value);
+        else if (host.type == DCR_HOST_MMIO)
+                dcr_write_mmio(host.host.mmio, dcr_n, value);
+        else /* host.type == DCR_HOST_INVALID */
+                WARN_ON(true);
+}
+EXPORT_SYMBOL_GPL(dcr_write_generic);
+
+#endif /* defined(CONFIG_PPC_DCR_NATIVE) && defined(CONFIG_PPC_DCR_MMIO) */
+
 unsigned int dcr_resource_start(struct device_node *np, unsigned int index)
 {
         unsigned int ds;
@@ -47,26 +148,7 @@ unsigned int dcr_resource_len(struct device_node *np, unsigned int index)
 }
 EXPORT_SYMBOL_GPL(dcr_resource_len);
 
-#ifndef CONFIG_PPC_DCR_NATIVE
-
-static struct device_node * find_dcr_parent(struct device_node * node)
-{
-        struct device_node *par, *tmp;
-        const u32 *p;
-
-        for (par = of_node_get(node); par;) {
-                if (of_get_property(par, "dcr-controller", NULL))
-                        break;
-                p = of_get_property(par, "dcr-parent", NULL);
-                tmp = par;
-                if (p == NULL)
-                        par = of_get_parent(par);
-                else
-                        par = of_find_node_by_phandle(*p);
-                of_node_put(tmp);
-        }
-        return par;
-}
+#ifdef CONFIG_PPC_DCR_MMIO
 
 u64 of_translate_dcr_address(struct device_node *dev,
                              unsigned int dcr_n,
@@ -75,7 +157,7 @@ u64 of_translate_dcr_address(struct device_node *dev,
         struct device_node *dp;
         const u32 *p;
         unsigned int stride;
-        u64 ret;
+        u64 ret = OF_BAD_ADDR;
 
         dp = find_dcr_parent(dev);
         if (dp == NULL)
@@ -90,7 +172,7 @@ u64 of_translate_dcr_address(struct device_node *dev,
         if (p == NULL)
                 p = of_get_property(dp, "dcr-mmio-space", NULL);
         if (p == NULL)
-                return OF_BAD_ADDR;
+                goto done;
 
         /* Maybe could do some better range checking here */
         ret = of_translate_address(dp, p);
@@ -98,21 +180,25 @@ u64 of_translate_dcr_address(struct device_node *dev,
                 ret += (u64)(stride) * (u64)dcr_n;
         if (out_stride)
                 *out_stride = stride;
+
+ done:
+        of_node_put(dp);
         return ret;
 }
 
-dcr_host_t dcr_map(struct device_node *dev, unsigned int dcr_n,
-                   unsigned int dcr_c)
+dcr_host_mmio_t dcr_map_mmio(struct device_node *dev,
+                             unsigned int dcr_n,
+                             unsigned int dcr_c)
 {
-        dcr_host_t ret = { .token = NULL, .stride = 0, .base = dcr_n };
+        dcr_host_mmio_t ret = { .token = NULL, .stride = 0, .base = dcr_n };
         u64 addr;
 
         pr_debug("dcr_map(%s, 0x%x, 0x%x)\n",
                  dev->full_name, dcr_n, dcr_c);
 
         addr = of_translate_dcr_address(dev, dcr_n, &ret.stride);
-        pr_debug("translates to addr: 0x%lx, stride: 0x%x\n",
-                 addr, ret.stride);
+        pr_debug("translates to addr: 0x%llx, stride: 0x%x\n",
+                 (unsigned long long) addr, ret.stride);
         if (addr == OF_BAD_ADDR)
                 return ret;
         pr_debug("mapping 0x%x bytes\n", dcr_c * ret.stride);
@@ -124,11 +210,11 @@ dcr_host_t dcr_map(struct device_node *dev, unsigned int dcr_n,
         ret.token -= dcr_n * ret.stride;
         return ret;
 }
-EXPORT_SYMBOL_GPL(dcr_map);
+EXPORT_SYMBOL_GPL(dcr_map_mmio);
 
-void dcr_unmap(dcr_host_t host, unsigned int dcr_c)
+void dcr_unmap_mmio(dcr_host_mmio_t host, unsigned int dcr_c)
 {
-        dcr_host_t h = host;
+        dcr_host_mmio_t h = host;
 
         if (h.token == NULL)
                 return;
@@ -136,7 +222,11 @@ void dcr_unmap(dcr_host_t host, unsigned int dcr_c)
         iounmap(h.token);
         h.token = NULL;
 }
-EXPORT_SYMBOL_GPL(dcr_unmap);
-#else   /* defined(CONFIG_PPC_DCR_NATIVE) */
+EXPORT_SYMBOL_GPL(dcr_unmap_mmio);
+
+#endif /* defined(CONFIG_PPC_DCR_MMIO) */
+
+#ifdef CONFIG_PPC_DCR_NATIVE
 DEFINE_SPINLOCK(dcr_ind_lock);
-#endif  /* !defined(CONFIG_PPC_DCR_NATIVE) */
+#endif  /* defined(CONFIG_PPC_DCR_NATIVE) */
+
diff --git a/arch/powerpc/sysdev/fsl_gtm.c b/arch/powerpc/sysdev/fsl_gtm.c
new file mode 100644
index 000000000000..714ec02fed2e
--- /dev/null
+++ b/arch/powerpc/sysdev/fsl_gtm.c
@@ -0,0 +1,434 @@
+/*
+ * Freescale General-purpose Timers Module
+ *
+ * Copyright (c) Freescale Semicondutor, Inc. 2006.
+ *               Shlomi Gridish <gridish@freescale.com>
+ *               Jerry Huang <Chang-Ming.Huang@freescale.com>
+ * Copyright (c) MontaVista Software, Inc. 2008.
+ *               Anton Vorontsov <avorontsov@ru.mvista.com>
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/list.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/spinlock.h>
+#include <linux/bitops.h>
+#include <asm/fsl_gtm.h>
+
+#define GTCFR_STP(x)            ((x) & 1 ? 1 << 5 : 1 << 1)
+#define GTCFR_RST(x)            ((x) & 1 ? 1 << 4 : 1 << 0)
+
+#define GTMDR_ICLK_MASK         (3 << 1)
+#define GTMDR_ICLK_ICAS         (0 << 1)
+#define GTMDR_ICLK_ICLK         (1 << 1)
+#define GTMDR_ICLK_SLGO         (2 << 1)
+#define GTMDR_FRR               (1 << 3)
+#define GTMDR_ORI               (1 << 4)
+#define GTMDR_SPS(x)            ((x) << 8)
+
+struct gtm_timers_regs {
+        u8      gtcfr1;         /* Timer 1, Timer 2 global config register */
+        u8      res0[0x3];
+        u8      gtcfr2;         /* Timer 3, timer 4 global config register */
+        u8      res1[0xB];
+        __be16  gtmdr1;         /* Timer 1 mode register */
+        __be16  gtmdr2;         /* Timer 2 mode register */
+        __be16  gtrfr1;         /* Timer 1 reference register */
+        __be16  gtrfr2;         /* Timer 2 reference register */
+        __be16  gtcpr1;         /* Timer 1 capture register */
+        __be16  gtcpr2;         /* Timer 2 capture register */
+        __be16  gtcnr1;         /* Timer 1 counter */
+        __be16  gtcnr2;         /* Timer 2 counter */
+        __be16  gtmdr3;         /* Timer 3 mode register */
+        __be16  gtmdr4;         /* Timer 4 mode register */
+        __be16  gtrfr3;         /* Timer 3 reference register */
+        __be16  gtrfr4;         /* Timer 4 reference register */
+        __be16  gtcpr3;         /* Timer 3 capture register */
+        __be16  gtcpr4;         /* Timer 4 capture register */
+        __be16  gtcnr3;         /* Timer 3 counter */
+        __be16  gtcnr4;         /* Timer 4 counter */
+        __be16  gtevr1;         /* Timer 1 event register */
+        __be16  gtevr2;         /* Timer 2 event register */
+        __be16  gtevr3;         /* Timer 3 event register */
+        __be16  gtevr4;         /* Timer 4 event register */
+        __be16  gtpsr1;         /* Timer 1 prescale register */
+        __be16  gtpsr2;         /* Timer 2 prescale register */
+        __be16  gtpsr3;         /* Timer 3 prescale register */
+        __be16  gtpsr4;         /* Timer 4 prescale register */
+        u8 res2[0x40];
+} __attribute__ ((packed));
+
+struct gtm {
+        unsigned int clock;
+        struct gtm_timers_regs __iomem *regs;
+        struct gtm_timer timers[4];
+        spinlock_t lock;
+        struct list_head list_node;
+};
+
+static LIST_HEAD(gtms);
+
+/**
+ * gtm_get_timer - request GTM timer to use it with the rest of GTM API
+ * Context:     non-IRQ
+ *
+ * This function reserves GTM timer for later use. It returns gtm_timer
+ * structure to use with the rest of GTM API, you should use timer->irq
+ * to manage timer interrupt.
+ */
+struct gtm_timer *gtm_get_timer16(void)
+{
+        struct gtm *gtm = NULL;
+        int i;
+
+        list_for_each_entry(gtm, &gtms, list_node) {
+                spin_lock_irq(&gtm->lock);
+
+                for (i = 0; i < ARRAY_SIZE(gtm->timers); i++) {
+                        if (!gtm->timers[i].requested) {
+                                gtm->timers[i].requested = true;
+                                spin_unlock_irq(&gtm->lock);
+                                return &gtm->timers[i];
+                        }
+                }
+
+                spin_unlock_irq(&gtm->lock);
+        }
+
+        if (gtm)
+                return ERR_PTR(-EBUSY);
+        return ERR_PTR(-ENODEV);
+}
+EXPORT_SYMBOL(gtm_get_timer16);
+
+/**
+ * gtm_get_specific_timer - request specific GTM timer
+ * @gtm:        specific GTM, pass here GTM's device_node->data
+ * @timer:      specific timer number, Timer1 is 0.
+ * Context:     non-IRQ
+ *
+ * This function reserves GTM timer for later use. It returns gtm_timer
+ * structure to use with the rest of GTM API, you should use timer->irq
+ * to manage timer interrupt.
+ */
+struct gtm_timer *gtm_get_specific_timer16(struct gtm *gtm,
+                                           unsigned int timer)
+{
+        struct gtm_timer *ret = ERR_PTR(-EBUSY);
+
+        if (timer > 3)
+                return ERR_PTR(-EINVAL);
+
+        spin_lock_irq(&gtm->lock);
+
+        if (gtm->timers[timer].requested)
+                goto out;
+
+        ret = &gtm->timers[timer];
+        ret->requested = true;
+
+out:
+        spin_unlock_irq(&gtm->lock);
+        return ret;
+}
+EXPORT_SYMBOL(gtm_get_specific_timer16);
+
+/**
+ * gtm_put_timer16 - release 16 bits GTM timer
+ * @tmr:        pointer to the gtm_timer structure obtained from gtm_get_timer
+ * Context:     any
+ *
+ * This function releases GTM timer so others may request it.
+ */
+void gtm_put_timer16(struct gtm_timer *tmr)
+{
+        gtm_stop_timer16(tmr);
+
+        spin_lock_irq(&tmr->gtm->lock);
+        tmr->requested = false;
+        spin_unlock_irq(&tmr->gtm->lock);
+}
+EXPORT_SYMBOL(gtm_put_timer16);
+
+/*
+ * This is back-end for the exported functions, it's used to reset single
+ * timer in reference mode.
+ */
+static int gtm_set_ref_timer16(struct gtm_timer *tmr, int frequency,
+                               int reference_value, bool free_run)
+{
+        struct gtm *gtm = tmr->gtm;
+        int num = tmr - &gtm->timers[0];
+        unsigned int prescaler;
+        u8 iclk = GTMDR_ICLK_ICLK;
+        u8 psr;
+        u8 sps;
+        unsigned long flags;
+        int max_prescaler = 256 * 256 * 16;
+
+        /* CPM2 doesn't have primary prescaler */
+        if (!tmr->gtpsr)
+                max_prescaler /= 256;
+
+        prescaler = gtm->clock / frequency;
+        /*
+         * We have two 8 bit prescalers -- primary and secondary (psr, sps),
+         * plus "slow go" mode (clk / 16). So, total prescale value is
+         * 16 * (psr + 1) * (sps + 1). Though, for CPM2 GTMs we losing psr.
+         */
+        if (prescaler > max_prescaler)
+                return -EINVAL;
+
+        if (prescaler > max_prescaler / 16) {
+                iclk = GTMDR_ICLK_SLGO;
+                prescaler /= 16;
+        }
+
+        if (prescaler <= 256) {
+                psr = 0;
+                sps = prescaler - 1;
+        } else {
+                psr = 256 - 1;
+                sps = prescaler / 256 - 1;
+        }
+
+        spin_lock_irqsave(&gtm->lock, flags);
+
+        /*
+         * Properly reset timers: stop, reset, set up prescalers, reference
+         * value and clear event register.
+         */
+        clrsetbits_8(tmr->gtcfr, ~(GTCFR_STP(num) | GTCFR_RST(num)),
+                                 GTCFR_STP(num) | GTCFR_RST(num));
+
+        setbits8(tmr->gtcfr, GTCFR_STP(num));
+
+        if (tmr->gtpsr)
+                out_be16(tmr->gtpsr, psr);
+        clrsetbits_be16(tmr->gtmdr, 0xFFFF, iclk | GTMDR_SPS(sps) |
+                        GTMDR_ORI | (free_run ? GTMDR_FRR : 0));
+        out_be16(tmr->gtcnr, 0);
+        out_be16(tmr->gtrfr, reference_value);
+        out_be16(tmr->gtevr, 0xFFFF);
+
+        /* Let it be. */
+        clrbits8(tmr->gtcfr, GTCFR_STP(num));
+
+        spin_unlock_irqrestore(&gtm->lock, flags);
+
+        return 0;
+}
+
+/**
+ * gtm_set_timer16 - (re)set 16 bit timer with arbitrary precision
+ * @tmr:        pointer to the gtm_timer structure obtained from gtm_get_timer
+ * @usec:       timer interval in microseconds
+ * @reload:     if set, the timer will reset upon expiry rather than
+ *              continue running free.
+ * Context:     any
+ *
+ * This function (re)sets the GTM timer so that it counts up to the requested
+ * interval value, and fires the interrupt when the value is reached. This
+ * function will reduce the precision of the timer as needed in order for the
+ * requested timeout to fit in a 16-bit register.
+ */
+int gtm_set_timer16(struct gtm_timer *tmr, unsigned long usec, bool reload)
+{
+        /* quite obvious, frequency which is enough for µSec precision */
+        int freq = 1000000;
+        unsigned int bit;
+
+        bit = fls_long(usec);
+        if (bit > 15) {
+                freq >>= bit - 15;
+                usec >>= bit - 15;
+        }
+
+        if (!freq)
+                return -EINVAL;
+
+        return gtm_set_ref_timer16(tmr, freq, usec, reload);
+}
+EXPORT_SYMBOL(gtm_set_timer16);
+
+/**
+ * gtm_set_exact_utimer16 - (re)set 16 bits timer
+ * @tmr:        pointer to the gtm_timer structure obtained from gtm_get_timer
+ * @usec:       timer interval in microseconds
+ * @reload:     if set, the timer will reset upon expiry rather than
+ *              continue running free.
+ * Context:     any
+ *
+ * This function (re)sets GTM timer so that it counts up to the requested
+ * interval value, and fires the interrupt when the value is reached. If reload
+ * flag was set, timer will also reset itself upon reference value, otherwise
+ * it continues to increment.
+ *
+ * The _exact_ bit in the function name states that this function will not
+ * crop precision of the "usec" argument, thus usec is limited to 16 bits
+ * (single timer width).
+ */
+int gtm_set_exact_timer16(struct gtm_timer *tmr, u16 usec, bool reload)
+{
+        /* quite obvious, frequency which is enough for µSec precision */
+        const int freq = 1000000;
+
+        /*
+         * We can lower the frequency (and probably power consumption) by
+         * dividing both frequency and usec by 2 until there is no remainder.
+         * But we won't bother with this unless savings are measured, so just
+         * run the timer as is.
+         */
+
+        return gtm_set_ref_timer16(tmr, freq, usec, reload);
+}
+EXPORT_SYMBOL(gtm_set_exact_timer16);
+
+/**
+ * gtm_stop_timer16 - stop single timer
+ * @tmr:        pointer to the gtm_timer structure obtained from gtm_get_timer
+ * Context:     any
+ *
+ * This function simply stops the GTM timer.
+ */
+void gtm_stop_timer16(struct gtm_timer *tmr)
+{
+        struct gtm *gtm = tmr->gtm;
+        int num = tmr - &gtm->timers[0];
+        unsigned long flags;
+
+        spin_lock_irqsave(&gtm->lock, flags);
+
+        setbits8(tmr->gtcfr, GTCFR_STP(num));
+        out_be16(tmr->gtevr, 0xFFFF);
+
+        spin_unlock_irqrestore(&gtm->lock, flags);
+}
+EXPORT_SYMBOL(gtm_stop_timer16);
+
+/**
+ * gtm_ack_timer16 - acknowledge timer event (free-run timers only)
+ * @tmr:        pointer to the gtm_timer structure obtained from gtm_get_timer
+ * @events:     events mask to ack
+ * Context:     any
+ *
+ * Thus function used to acknowledge timer interrupt event, use it inside the
+ * interrupt handler.
+ */
+void gtm_ack_timer16(struct gtm_timer *tmr, u16 events)
+{
+        out_be16(tmr->gtevr, events);
+}
+EXPORT_SYMBOL(gtm_ack_timer16);
+
+static void __init gtm_set_shortcuts(struct device_node *np,
+                                     struct gtm_timer *timers,
+                                     struct gtm_timers_regs __iomem *regs)
+{
+        /*
+         * Yeah, I don't like this either, but timers' registers a bit messed,
+         * so we have to provide shortcuts to write timer independent code.
+         * Alternative option is to create gt*() accessors, but that will be
+         * even uglier and cryptic.
+         */
+        timers[0].gtcfr = &regs->gtcfr1;
+        timers[0].gtmdr = &regs->gtmdr1;
+        timers[0].gtcnr = &regs->gtcnr1;
+        timers[0].gtrfr = &regs->gtrfr1;
+        timers[0].gtevr = &regs->gtevr1;
+
+        timers[1].gtcfr = &regs->gtcfr1;
+        timers[1].gtmdr = &regs->gtmdr2;
+        timers[1].gtcnr = &regs->gtcnr2;
+        timers[1].gtrfr = &regs->gtrfr2;
+        timers[1].gtevr = &regs->gtevr2;
+
+        timers[2].gtcfr = &regs->gtcfr2;
+        timers[2].gtmdr = &regs->gtmdr3;
+        timers[2].gtcnr = &regs->gtcnr3;
+        timers[2].gtrfr = &regs->gtrfr3;
+        timers[2].gtevr = &regs->gtevr3;
+
+        timers[3].gtcfr = &regs->gtcfr2;
+        timers[3].gtmdr = &regs->gtmdr4;
+        timers[3].gtcnr = &regs->gtcnr4;
+        timers[3].gtrfr = &regs->gtrfr4;
+        timers[3].gtevr = &regs->gtevr4;
+
+        /* CPM2 doesn't have primary prescaler */
+        if (!of_device_is_compatible(np, "fsl,cpm2-gtm")) {
+                timers[0].gtpsr = &regs->gtpsr1;
+                timers[1].gtpsr = &regs->gtpsr2;
+                timers[2].gtpsr = &regs->gtpsr3;
+                timers[3].gtpsr = &regs->gtpsr4;
+        }
+}
+
+static int __init fsl_gtm_init(void)
+{
+        struct device_node *np;
+
+        for_each_compatible_node(np, NULL, "fsl,gtm") {
+                int i;
+                struct gtm *gtm;
+                const u32 *clock;
+                int size;
+
+                gtm = kzalloc(sizeof(*gtm), GFP_KERNEL);
+                if (!gtm) {
+                        pr_err("%s: unable to allocate memory\n",
+                                np->full_name);
+                        continue;
+                }
+
+                spin_lock_init(&gtm->lock);
+
+                clock = of_get_property(np, "clock-frequency", &size);
+                if (!clock || size != sizeof(*clock)) {
+                        pr_err("%s: no clock-frequency\n", np->full_name);
+                        goto err;
+                }
+                gtm->clock = *clock;
+
+                for (i = 0; i < ARRAY_SIZE(gtm->timers); i++) {
+                        int ret;
+                        struct resource irq;
+
+                        ret = of_irq_to_resource(np, i, &irq);
+                        if (ret == NO_IRQ) {
+                                pr_err("%s: not enough interrupts specified\n",
+                                       np->full_name);
+                                goto err;
+                        }
+                        gtm->timers[i].irq = irq.start;
+                        gtm->timers[i].gtm = gtm;
+                }
+
+                gtm->regs = of_iomap(np, 0);
+                if (!gtm->regs) {
+                        pr_err("%s: unable to iomap registers\n",
+                               np->full_name);
+                        goto err;
+                }
+
+                gtm_set_shortcuts(np, gtm->timers, gtm->regs);
+                list_add(&gtm->list_node, &gtms);
+
+                /* We don't want to lose the node and its ->data */
+                np->data = gtm;
+                of_node_get(np);
+
+                continue;
+err:
+                kfree(gtm);
+        }
+        return 0;
+}
+arch_initcall(fsl_gtm_init);
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
new file mode 100644
index 000000000000..2c5187cc8a24
--- /dev/null
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -0,0 +1,429 @@
+/*
+ * Copyright (C) 2007-2008 Freescale Semiconductor, Inc. All rights reserved.
+ *
+ * Author: Tony Li <tony.li@freescale.com>
+ *         Jason Jin <Jason.jin@freescale.com>
+ *
+ * The hwirq alloc and free code reuse from sysdev/mpic_msi.c
+ *
+ * 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; version 2 of the
+ * License.
+ *
+ */
+#include <linux/irq.h>
+#include <linux/bootmem.h>
+#include <linux/bitmap.h>
+#include <linux/msi.h>
+#include <linux/pci.h>
+#include <linux/of_platform.h>
+#include <sysdev/fsl_soc.h>
+#include <asm/prom.h>
+#include <asm/hw_irq.h>
+#include <asm/ppc-pci.h>
+#include "fsl_msi.h"
+
+struct fsl_msi_feature {
+        u32 fsl_pic_ip;
+        u32 msiir_offset;
+};
+
+static struct fsl_msi *fsl_msi;
+
+static inline u32 fsl_msi_read(u32 __iomem *base, unsigned int reg)
+{
+        return in_be32(base + (reg >> 2));
+}
+
+/*
+ * We do not need this actually. The MSIR register has been read once
+ * in the cascade interrupt. So, this MSI interrupt has been acked
+*/
+static void fsl_msi_end_irq(unsigned int virq)
+{
+}
+
+static struct irq_chip fsl_msi_chip = {
+        .mask           = mask_msi_irq,
+        .unmask         = unmask_msi_irq,
+        .ack            = fsl_msi_end_irq,
+        .typename       = " FSL-MSI  ",
+};
+
+static int fsl_msi_host_map(struct irq_host *h, unsigned int virq,
+                                irq_hw_number_t hw)
+{
+        struct irq_chip *chip = &fsl_msi_chip;
+
+        get_irq_desc(virq)->status |= IRQ_TYPE_EDGE_FALLING;
+
+        set_irq_chip_and_handler(virq, chip, handle_edge_irq);
+
+        return 0;
+}
+
+static struct irq_host_ops fsl_msi_host_ops = {
+        .map = fsl_msi_host_map,
+};
+
+static irq_hw_number_t fsl_msi_alloc_hwirqs(struct fsl_msi *msi, int num)
+{
+        unsigned long flags;
+        int order = get_count_order(num);
+        int offset;
+
+        spin_lock_irqsave(&msi->bitmap_lock, flags);
+
+        offset = bitmap_find_free_region(msi->fsl_msi_bitmap,
+                                        NR_MSI_IRQS, order);
+
+        spin_unlock_irqrestore(&msi->bitmap_lock, flags);
+
+        pr_debug("%s: allocated 0x%x (2^%d) at offset 0x%x\n",
+                __func__, num, order, offset);
+
+        return offset;
+}
+
+static void fsl_msi_free_hwirqs(struct fsl_msi *msi, int offset, int num)
+{
+        unsigned long flags;
+        int order = get_count_order(num);
+
+        pr_debug("%s: freeing 0x%x (2^%d) at offset 0x%x\n",
+                __func__, num, order, offset);
+
+        spin_lock_irqsave(&msi->bitmap_lock, flags);
+        bitmap_release_region(msi->fsl_msi_bitmap, offset, order);
+        spin_unlock_irqrestore(&msi->bitmap_lock, flags);
+}
+
+static int fsl_msi_free_dt_hwirqs(struct fsl_msi *msi)
+{
+        int i;
+        int len;
+        const u32 *p;
+
+        bitmap_allocate_region(msi->fsl_msi_bitmap, 0,
+                       get_count_order(NR_MSI_IRQS));
+
+        p = of_get_property(msi->of_node, "msi-available-ranges", &len);
+
+        if (!p) {
+                /* No msi-available-ranges property,
+                 * All the 256 MSI interrupts can be used
+                 */
+                fsl_msi_free_hwirqs(msi, 0, 0x100);
+                return 0;
+        }
+
+        if ((len % (2 * sizeof(u32))) != 0) {
+                printk(KERN_WARNING "fsl_msi: Malformed msi-available-ranges "
+                       "property on %s\n", msi->of_node->full_name);
+                return -EINVAL;
+        }
+
+        /* Format is: (<u32 start> <u32 count>)+ */
+        len /= 2 * sizeof(u32);
+        for (i = 0; i < len; i++, p += 2)
+                fsl_msi_free_hwirqs(msi, *p, *(p + 1));
+
+        return 0;
+}
+
+static int fsl_msi_init_allocator(struct fsl_msi *msi_data)
+{
+        int rc;
+        int size = BITS_TO_LONGS(NR_MSI_IRQS) * sizeof(u32);
+
+        msi_data->fsl_msi_bitmap = kzalloc(size, GFP_KERNEL);
+
+        if (msi_data->fsl_msi_bitmap == NULL) {
+                pr_debug("%s: ENOMEM allocating allocator bitmap!\n",
+                                __func__);
+                return -ENOMEM;
+        }
+
+        rc = fsl_msi_free_dt_hwirqs(msi_data);
+        if (rc)
+                goto out_free;
+
+        return 0;
+out_free:
+        kfree(msi_data->fsl_msi_bitmap);
+
+        msi_data->fsl_msi_bitmap = NULL;
+        return rc;
+
+}
+
+static int fsl_msi_check_device(struct pci_dev *pdev, int nvec, int type)
+{
+        if (type == PCI_CAP_ID_MSIX)
+                pr_debug("fslmsi: MSI-X untested, trying anyway.\n");
+
+        return 0;
+}
+
+static void fsl_teardown_msi_irqs(struct pci_dev *pdev)
+{
+        struct msi_desc *entry;
+        struct fsl_msi *msi_data = fsl_msi;
+
+        list_for_each_entry(entry, &pdev->msi_list, list) {
+                if (entry->irq == NO_IRQ)
+                        continue;
+                set_irq_msi(entry->irq, NULL);
+                fsl_msi_free_hwirqs(msi_data, virq_to_hw(entry->irq), 1);
+                irq_dispose_mapping(entry->irq);
+        }
+
+        return;
+}
+
+static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq,
+                                  struct msi_msg *msg)
+{
+        struct fsl_msi *msi_data = fsl_msi;
+
+        msg->address_lo = msi_data->msi_addr_lo;
+        msg->address_hi = msi_data->msi_addr_hi;
+        msg->data = hwirq;
+
+        pr_debug("%s: allocated srs: %d, ibs: %d\n",
+                __func__, hwirq / IRQS_PER_MSI_REG, hwirq % IRQS_PER_MSI_REG);
+}
+
+static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
+{
+        irq_hw_number_t hwirq;
+        int rc;
+        unsigned int virq;
+        struct msi_desc *entry;
+        struct msi_msg msg;
+        struct fsl_msi *msi_data = fsl_msi;
+
+        list_for_each_entry(entry, &pdev->msi_list, list) {
+                hwirq = fsl_msi_alloc_hwirqs(msi_data, 1);
+                if (hwirq < 0) {
+                        rc = hwirq;
+                        pr_debug("%s: fail allocating msi interrupt\n",
+                                        __func__);
+                        goto out_free;
+                }
+
+                virq = irq_create_mapping(msi_data->irqhost, hwirq);
+
+                if (virq == NO_IRQ) {
+                        pr_debug("%s: fail mapping hwirq 0x%lx\n",
+                                        __func__, hwirq);
+                        fsl_msi_free_hwirqs(msi_data, hwirq, 1);
+                        rc = -ENOSPC;
+                        goto out_free;
+                }
+                set_irq_msi(virq, entry);
+
+                fsl_compose_msi_msg(pdev, hwirq, &msg);
+                write_msi_msg(virq, &msg);
+        }
+        return 0;
+
+out_free:
+        return rc;
+}
+
+static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
+{
+        unsigned int cascade_irq;
+        struct fsl_msi *msi_data = fsl_msi;
+        int msir_index = -1;
+        u32 msir_value = 0;
+        u32 intr_index;
+        u32 have_shift = 0;
+
+        spin_lock(&desc->lock);
+        if ((msi_data->feature &  FSL_PIC_IP_MASK) == FSL_PIC_IP_IPIC) {
+                if (desc->chip->mask_ack)
+                        desc->chip->mask_ack(irq);
+                else {
+                        desc->chip->mask(irq);
+                        desc->chip->ack(irq);
+                }
+        }
+
+        if (unlikely(desc->status & IRQ_INPROGRESS))
+                goto unlock;
+
+        msir_index = (int)desc->handler_data;
+
+        if (msir_index >= NR_MSI_REG)
+                cascade_irq = NO_IRQ;
+
+        desc->status |= IRQ_INPROGRESS;
+        switch (fsl_msi->feature & FSL_PIC_IP_MASK) {
+        case FSL_PIC_IP_MPIC:
+                msir_value = fsl_msi_read(msi_data->msi_regs,
+                        msir_index * 0x10);
+                break;
+        case FSL_PIC_IP_IPIC:
+                msir_value = fsl_msi_read(msi_data->msi_regs, msir_index * 0x4);
+                break;
+        }
+
+        while (msir_value) {
+                intr_index = ffs(msir_value) - 1;
+
+                cascade_irq = irq_linear_revmap(msi_data->irqhost,
+                                msir_index * IRQS_PER_MSI_REG +
+                                        intr_index + have_shift);
+                if (cascade_irq != NO_IRQ)
+                        generic_handle_irq(cascade_irq);
+                have_shift += intr_index + 1;
+                msir_value = msir_value >> (intr_index + 1);
+        }
+        desc->status &= ~IRQ_INPROGRESS;
+
+        switch (msi_data->feature & FSL_PIC_IP_MASK) {
+        case FSL_PIC_IP_MPIC:
+                desc->chip->eoi(irq);
+                break;
+        case FSL_PIC_IP_IPIC:
+                if (!(desc->status & IRQ_DISABLED) && desc->chip->unmask)
+                        desc->chip->unmask(irq);
+                break;
+        }
+unlock:
+        spin_unlock(&desc->lock);
+}
+
+static int __devinit fsl_of_msi_probe(struct of_device *dev,
+                                const struct of_device_id *match)
+{
+        struct fsl_msi *msi;
+        struct resource res;
+        int err, i, count;
+        int rc;
+        int virt_msir;
+        const u32 *p;
+        struct fsl_msi_feature *features = match->data;
+
+        printk(KERN_DEBUG "Setting up Freescale MSI support\n");
+
+        msi = kzalloc(sizeof(struct fsl_msi), GFP_KERNEL);
+        if (!msi) {
+                dev_err(&dev->dev, "No memory for MSI structure\n");
+                err = -ENOMEM;
+                goto error_out;
+        }
+
+        msi->of_node = of_node_get(dev->node);
+
+        msi->irqhost = irq_alloc_host(of_node_get(dev->node),
+                                IRQ_HOST_MAP_LINEAR,
+                                NR_MSI_IRQS, &fsl_msi_host_ops, 0);
+        if (msi->irqhost == NULL) {
+                dev_err(&dev->dev, "No memory for MSI irqhost\n");
+                of_node_put(dev->node);
+                err = -ENOMEM;
+                goto error_out;
+        }
+
+        /* Get the MSI reg base */
+        err = of_address_to_resource(dev->node, 0, &res);
+        if (err) {
+                dev_err(&dev->dev, "%s resource error!\n",
+                                dev->node->full_name);
+                goto error_out;
+        }
+
+        msi->msi_regs = ioremap(res.start, res.end - res.start + 1);
+        if (!msi->msi_regs) {
+                dev_err(&dev->dev, "ioremap problem failed\n");
+                goto error_out;
+        }
+
+        msi->feature = features->fsl_pic_ip;
+
+        msi->irqhost->host_data = msi;
+
+        msi->msi_addr_hi = 0x0;
+        msi->msi_addr_lo = res.start + features->msiir_offset;
+
+        rc = fsl_msi_init_allocator(msi);
+        if (rc) {
+                dev_err(&dev->dev, "Error allocating MSI bitmap\n");
+                goto error_out;
+        }
+
+        p = of_get_property(dev->node, "interrupts", &count);
+        if (!p) {
+                dev_err(&dev->dev, "no interrupts property found on %s\n",
+                                dev->node->full_name);
+                err = -ENODEV;
+                goto error_out;
+        }
+        if (count % 8 != 0) {
+                dev_err(&dev->dev, "Malformed interrupts property on %s\n",
+                                dev->node->full_name);
+                err = -EINVAL;
+                goto error_out;
+        }
+
+        count /= sizeof(u32);
+        for (i = 0; i < count / 2; i++) {
+                if (i > NR_MSI_REG)
+                        break;
+                virt_msir = irq_of_parse_and_map(dev->node, i);
+                if (virt_msir != NO_IRQ) {
+                        set_irq_data(virt_msir, (void *)i);
+                        set_irq_chained_handler(virt_msir, fsl_msi_cascade);
+                }
+        }
+
+        fsl_msi = msi;
+
+        WARN_ON(ppc_md.setup_msi_irqs);
+        ppc_md.setup_msi_irqs = fsl_setup_msi_irqs;
+        ppc_md.teardown_msi_irqs = fsl_teardown_msi_irqs;
+        ppc_md.msi_check_device = fsl_msi_check_device;
+        return 0;
+error_out:
+        kfree(msi);
+        return err;
+}
+
+static const struct fsl_msi_feature mpic_msi_feature = {
+        .fsl_pic_ip = FSL_PIC_IP_MPIC,
+        .msiir_offset = 0x140,
+};
+
+static const struct fsl_msi_feature ipic_msi_feature = {
+        .fsl_pic_ip = FSL_PIC_IP_IPIC,
+        .msiir_offset = 0x38,
+};
+
+static const struct of_device_id fsl_of_msi_ids[] = {
+        {
+                .compatible = "fsl,mpic-msi",
+                .data = (void *)&mpic_msi_feature,
+        },
+        {
+                .compatible = "fsl,ipic-msi",
+                .data = (void *)&ipic_msi_feature,
+        },
+        {}
+};
+
+static struct of_platform_driver fsl_of_msi_driver = {
+        .name = "fsl-msi",
+        .match_table = fsl_of_msi_ids,
+        .probe = fsl_of_msi_probe,
+};
+
+static __init int fsl_of_msi_init(void)
+{
+        return of_register_platform_driver(&fsl_of_msi_driver);
+}
+
+subsys_initcall(fsl_of_msi_init);
diff --git a/arch/powerpc/sysdev/fsl_msi.h b/arch/powerpc/sysdev/fsl_msi.h
new file mode 100644
index 000000000000..a653468521fa
--- /dev/null
+++ b/arch/powerpc/sysdev/fsl_msi.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2007-2008 Freescale Semiconductor, Inc. All rights reserved.
+ *
+ * Author: Tony Li <tony.li@freescale.com>
+ *         Jason Jin <Jason.jin@freescale.com>
+ *
+ * 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; version 2 of the
+ * License.
+ *
+ */
+#ifndef _POWERPC_SYSDEV_FSL_MSI_H
+#define _POWERPC_SYSDEV_FSL_MSI_H
+
+#define NR_MSI_REG              8
+#define IRQS_PER_MSI_REG        32
+#define NR_MSI_IRQS     (NR_MSI_REG * IRQS_PER_MSI_REG)
+
+#define FSL_PIC_IP_MASK 0x0000000F
+#define FSL_PIC_IP_MPIC 0x00000001
+#define FSL_PIC_IP_IPIC 0x00000002
+
+struct fsl_msi {
+        /* Device node of the MSI interrupt*/
+        struct device_node *of_node;
+
+        struct irq_host *irqhost;
+
+        unsigned long cascade_irq;
+
+        u32 msi_addr_lo;
+        u32 msi_addr_hi;
+        void __iomem *msi_regs;
+        u32 feature;
+
+        unsigned long *fsl_msi_bitmap;
+        spinlock_t bitmap_lock;
+};
+
+#endif /* _POWERPC_SYSDEV_FSL_MSI_H */
+
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index bf13c2174a4e..87b0aa13ab48 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -106,6 +106,16 @@ void __init setup_pci_cmd(struct pci_controller *hose)
         }
 }
 
+static void __init setup_pci_pcsrbar(struct pci_controller *hose)
+{
+#ifdef CONFIG_PCI_MSI
+        phys_addr_t immr_base;
+
+        immr_base = get_immrbase();
+        early_write_config_dword(hose, 0, 0, PCI_BASE_ADDRESS_0, immr_base);
+#endif
+}
+
 static int fsl_pcie_bus_fixup;
 
 static void __init quirk_fsl_pcie_header(struct pci_dev *dev)
@@ -211,6 +221,8 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary)
         /* Setup PEX window registers */
         setup_pci_atmu(hose, &rsrc);
 
+        /* Setup PEXCSRBAR */
+        setup_pci_pcsrbar(hose);
         return 0;
 }
 
@@ -231,6 +243,8 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8544E, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8544, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8572E, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8572, quirk_fsl_pcie_header);
+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8536E, quirk_fsl_pcie_header);
+DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8536, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 019657c110b6..ebcec7362f95 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -414,128 +414,6 @@ err:
 
 arch_initcall(gfar_of_init);
 
-#ifdef CONFIG_I2C_BOARDINFO
-#include <linux/i2c.h>
-struct i2c_driver_device {
-        char    *of_device;
-        char    *i2c_type;
-};
-
-static struct i2c_driver_device i2c_devices[] __initdata = {
-        {"ricoh,rs5c372a", "rs5c372a"},
-        {"ricoh,rs5c372b", "rs5c372b"},
-        {"ricoh,rv5c386",  "rv5c386"},
-        {"ricoh,rv5c387a", "rv5c387a"},
-        {"dallas,ds1307",  "ds1307"},
-        {"dallas,ds1337",  "ds1337"},
-        {"dallas,ds1338",  "ds1338"},
-        {"dallas,ds1339",  "ds1339"},
-        {"dallas,ds1340",  "ds1340"},
-        {"stm,m41t00",     "m41t00"},
-        {"dallas,ds1374",  "ds1374"},
-};
-
-static int __init of_find_i2c_driver(struct device_node *node,
-                                     struct i2c_board_info *info)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
-                if (!of_device_is_compatible(node, i2c_devices[i].of_device))
-                        continue;
-                if (strlcpy(info->type, i2c_devices[i].i2c_type,
-                            I2C_NAME_SIZE) >= I2C_NAME_SIZE)
-                        return -ENOMEM;
-                return 0;
-        }
-        return -ENODEV;
-}
-
-static void __init of_register_i2c_devices(struct device_node *adap_node,
-                                           int bus_num)
-{
-        struct device_node *node = NULL;
-
-        while ((node = of_get_next_child(adap_node, node))) {
-                struct i2c_board_info info = {};
-                const u32 *addr;
-                int len;
-
-                addr = of_get_property(node, "reg", &len);
-                if (!addr || len < sizeof(int) || *addr > (1 << 10) - 1) {
-                        printk(KERN_WARNING "fsl_soc.c: invalid i2c device entry\n");
-                        continue;
-                }
-
-                info.irq = irq_of_parse_and_map(node, 0);
-                if (info.irq == NO_IRQ)
-                        info.irq = -1;
-
-                if (of_find_i2c_driver(node, &info) < 0)
-                        continue;
-
-                info.addr = *addr;
-
-                i2c_register_board_info(bus_num, &info, 1);
-        }
-}
-
-static int __init fsl_i2c_of_init(void)
-{
-        struct device_node *np;
-        unsigned int i = 0;
-        struct platform_device *i2c_dev;
-        int ret;
-
-        for_each_compatible_node(np, NULL, "fsl-i2c") {
-                struct resource r[2];
-                struct fsl_i2c_platform_data i2c_data;
-                const unsigned char *flags = NULL;
-
-                memset(&r, 0, sizeof(r));
-                memset(&i2c_data, 0, sizeof(i2c_data));
-
-                ret = of_address_to_resource(np, 0, &r[0]);
-                if (ret)
-                        goto err;
-
-                of_irq_to_resource(np, 0, &r[1]);
-
-                i2c_dev = platform_device_register_simple("fsl-i2c", i, r, 2);
-                if (IS_ERR(i2c_dev)) {
-                        ret = PTR_ERR(i2c_dev);
-                        goto err;
-                }
-
-                i2c_data.device_flags = 0;
-                flags = of_get_property(np, "dfsrr", NULL);
-                if (flags)
-                        i2c_data.device_flags |= FSL_I2C_DEV_SEPARATE_DFSRR;
-
-                flags = of_get_property(np, "fsl5200-clocking", NULL);
-                if (flags)
-                        i2c_data.device_flags |= FSL_I2C_DEV_CLOCK_5200;
-
-                ret =
-                    platform_device_add_data(i2c_dev, &i2c_data,
-                                             sizeof(struct
-                                                    fsl_i2c_platform_data));
-                if (ret)
-                        goto unreg;
-
-                of_register_i2c_devices(np, i++);
-        }
-
-        return 0;
-
-unreg:
-        platform_device_unregister(i2c_dev);
-err:
-        return ret;
-}
-
-arch_initcall(fsl_i2c_of_init);
-#endif
 
 #ifdef CONFIG_PPC_83xx
 static int __init mpc83xx_wdt_init(void)
diff --git a/arch/powerpc/sysdev/i8259.c b/arch/powerpc/sysdev/i8259.c
index 216c0f5680d2..a96584ab33dd 100644
--- a/arch/powerpc/sysdev/i8259.c
+++ b/arch/powerpc/sysdev/i8259.c
@@ -276,7 +276,7 @@ void i8259_init(struct device_node *node, unsigned long intack_addr)
         spin_unlock_irqrestore(&i8259_lock, flags);
 
         /* create a legacy host */
-        i8259_host = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LEGACY,
+        i8259_host = irq_alloc_host(node, IRQ_HOST_MAP_LEGACY,
                                     0, &i8259_host_ops, 0);
         if (i8259_host == NULL) {
                 printk(KERN_ERR "i8259: failed to allocate irq host !\n");
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c
index cfbd2aae93e8..7fd49c97501a 100644
--- a/arch/powerpc/sysdev/indirect_pci.c
+++ b/arch/powerpc/sysdev/indirect_pci.c
@@ -123,6 +123,12 @@ indirect_write_config(struct pci_bus *bus, unsigned int devfn, int offset,
                         (bus->number == hose->first_busno))
                 val &= 0xffffff00;
 
+        /* Workaround for PCI_28 Errata in 440EPx/GRx */
+        if ((hose->indirect_type & PPC_INDIRECT_TYPE_BROKEN_MRM) &&
+                        offset == PCI_CACHE_LINE_SIZE) {
+                val = 0;
+        }
+
         /*
          * Note: the caller has already checked that offset is
          * suitably aligned and that len is 1, 2 or 4.
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index 0f2dfb0aaa6a..caba1c0be5a7 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -725,25 +725,21 @@ struct ipic * __init ipic_init(struct device_node *node, unsigned int flags)
         struct resource res;
         u32 temp = 0, ret;
 
+        ret = of_address_to_resource(node, 0, &res);
+        if (ret)
+                return NULL;
+
         ipic = alloc_bootmem(sizeof(struct ipic));
         if (ipic == NULL)
                 return NULL;
 
         memset(ipic, 0, sizeof(struct ipic));
 
-        ipic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+        ipic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
                                        NR_IPIC_INTS,
                                        &ipic_host_ops, 0);
-        if (ipic->irqhost == NULL) {
-                of_node_put(node);
-                return NULL;
-        }
-
-        ret = of_address_to_resource(node, 0, &res);
-        if (ret) {
-                of_node_put(node);
+        if (ipic->irqhost == NULL)
                 return NULL;
-        }
 
         ipic->regs = ioremap(res.start, res.end - res.start + 1);
 
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 6c90c95b454e..8e3478c995ef 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1016,13 +1016,11 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         memset(mpic, 0, sizeof(struct mpic));
         mpic->name = name;
 
-        mpic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+        mpic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
                                        isu_size, &mpic_host_ops,
                                        flags & MPIC_LARGE_VECTORS ? 2048 : 256);
-        if (mpic->irqhost == NULL) {
-                of_node_put(node);
+        if (mpic->irqhost == NULL)
                 return NULL;
-        }
 
         mpic->irqhost->host_data = mpic;
         mpic->hc_irq = mpic_irq_chip;
@@ -1143,10 +1141,14 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         greg_feature = mpic_read(mpic->gregs, MPIC_INFO(GREG_FEATURE_0));
         mpic->num_cpus = ((greg_feature & MPIC_GREG_FEATURE_LAST_CPU_MASK)
                           >> MPIC_GREG_FEATURE_LAST_CPU_SHIFT) + 1;
-        if (isu_size == 0)
-                mpic->num_sources =
-                        ((greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK)
-                         >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1;
+        if (isu_size == 0) {
+                if (flags & MPIC_BROKEN_FRR_NIRQS)
+                        mpic->num_sources = mpic->irq_count;
+                else
+                        mpic->num_sources =
+                                ((greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK)
+                                 >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1;
+        }
 
         /* Map the per-CPU registers */
         for (i = 0; i < mpic->num_cpus; i++) {
diff --git a/arch/powerpc/sysdev/mpic_msi.c b/arch/powerpc/sysdev/mpic_msi.c
index d272a52ecd24..de3e5e8bc324 100644
--- a/arch/powerpc/sysdev/mpic_msi.c
+++ b/arch/powerpc/sysdev/mpic_msi.c
@@ -16,6 +16,7 @@
 #include <asm/hw_irq.h>
 #include <asm/ppc-pci.h>
 
+#include <sysdev/mpic.h>
 
 static void __mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq)
 {
diff --git a/arch/powerpc/sysdev/mpic_pasemi_msi.c b/arch/powerpc/sysdev/mpic_pasemi_msi.c
index 33cbfb22ce3e..68aff6076675 100644
--- a/arch/powerpc/sysdev/mpic_pasemi_msi.c
+++ b/arch/powerpc/sysdev/mpic_pasemi_msi.c
@@ -95,6 +95,7 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
         unsigned int virq;
         struct msi_desc *entry;
         struct msi_msg msg;
+        int ret;
 
         pr_debug("pasemi_msi_setup_msi_irqs, pdev %p nvec %d type %d\n",
                  pdev, nvec, type);
@@ -108,8 +109,9 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                  * few MSIs for someone, but restrictions will apply to how the
                  * sources can be changed independently.
                  */
-                hwirq = mpic_msi_alloc_hwirqs(msi_mpic, ALLOC_CHUNK);
-                if (hwirq < 0) {
+                ret = mpic_msi_alloc_hwirqs(msi_mpic, ALLOC_CHUNK);
+                hwirq = ret;
+                if (ret < 0) {
                         pr_debug("pasemi_msi: failed allocating hwirq\n");
                         return hwirq;
                 }
diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c
index 1d5a40899b74..6e2f8686fdfc 100644
--- a/arch/powerpc/sysdev/mpic_u3msi.c
+++ b/arch/powerpc/sysdev/mpic_u3msi.c
@@ -115,17 +115,19 @@ static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
         struct msi_desc *entry;
         struct msi_msg msg;
         u64 addr;
+        int ret;
 
         addr = find_ht_magic_addr(pdev);
         msg.address_lo = addr & 0xFFFFFFFF;
         msg.address_hi = addr >> 32;
 
         list_for_each_entry(entry, &pdev->msi_list, list) {
-                hwirq = mpic_msi_alloc_hwirqs(msi_mpic, 1);
-                if (hwirq < 0) {
+                ret = mpic_msi_alloc_hwirqs(msi_mpic, 1);
+                if (ret < 0) {
                         pr_debug("u3msi: failed allocating hwirq\n");
-                        return hwirq;
+                        return ret;
                 }
+                hwirq = ret;
 
                 virq = irq_create_mapping(msi_mpic->irqhost, hwirq);
                 if (virq == NO_IRQ) {
diff --git a/arch/powerpc/sysdev/mv64x60_dev.c b/arch/powerpc/sysdev/mv64x60_dev.c
index a132e0de8ca5..32e0ad0ebea8 100644
--- a/arch/powerpc/sysdev/mv64x60_dev.c
+++ b/arch/powerpc/sysdev/mv64x60_dev.c
@@ -15,6 +15,7 @@
 #include <linux/console.h>
 #include <linux/mv643xx.h>
 #include <linux/platform_device.h>
+#include <linux/of_platform.h>
 
 #include <asm/prom.h>
 
@@ -25,6 +26,11 @@
  * PowerPC of_platform_bus_type.  They support platform_bus_type instead.
  */
 
+static struct of_device_id __initdata of_mv64x60_devices[] = {
+        { .compatible = "marvell,mv64306-devctrl", },
+        {}
+};
+
 /*
  * Create MPSC platform devices
  */
@@ -484,6 +490,10 @@ static int __init mv64x60_device_setup(void)
                 of_node_put(np);
         }
 
+        /* Now add every node that is on the device bus */
+        for_each_compatible_node(np, NULL, "marvell,mv64360")
+                of_platform_bus_probe(np, of_mv64x60_devices, NULL);
+
         return 0;
 }
 arch_initcall(mv64x60_device_setup);
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c
index b4a54c52e880..fb368dfde5d4 100644
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -75,6 +75,11 @@ static void fixup_ppc4xx_pci_bridge(struct pci_dev *dev)
             !of_device_is_compatible(hose->dn, "ibm,plb-pci"))
                 return;
 
+        if (of_device_is_compatible(hose->dn, "ibm,plb440epx-pci") ||
+                of_device_is_compatible(hose->dn, "ibm,plb440grx-pci")) {
+                hose->indirect_type |= PPC_INDIRECT_TYPE_BROKEN_MRM;
+        }
+
         /* Hide the PCI host BARs from the kernel as their content doesn't
          * fit well in the resource management
          */
@@ -1634,6 +1639,15 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np)
         }
         port = &ppc4xx_pciex_ports[portno];
         port->index = portno;
+
+        /*
+         * Check if device is enabled
+         */
+        if (!of_device_is_available(np)) {
+                printk(KERN_INFO "PCIE%d: Port disabled via device-tree\n", port->index);
+                return;
+        }
+
         port->node = of_node_get(np);
         pval = of_get_property(np, "sdr-base", NULL);
         if (pval == NULL) {
diff --git a/arch/powerpc/sysdev/qe_lib/Kconfig b/arch/powerpc/sysdev/qe_lib/Kconfig
index adc66212a419..4bb18f57901e 100644
--- a/arch/powerpc/sysdev/qe_lib/Kconfig
+++ b/arch/powerpc/sysdev/qe_lib/Kconfig
@@ -20,3 +20,16 @@ config UCC
         bool
         default y if UCC_FAST || UCC_SLOW
 
+config QE_USB
+        bool
+        help
+          QE USB Host Controller support
+
+config QE_GPIO
+        bool "QE GPIO support"
+        depends on QUICC_ENGINE
+        select GENERIC_GPIO
+        select HAVE_GPIO_LIB
+        help
+          Say Y here if you're going to use hardware that connects to the
+          QE GPIOs.
diff --git a/arch/powerpc/sysdev/qe_lib/Makefile b/arch/powerpc/sysdev/qe_lib/Makefile
index 874fe1a5b1cf..f1855c185291 100644
--- a/arch/powerpc/sysdev/qe_lib/Makefile
+++ b/arch/powerpc/sysdev/qe_lib/Makefile
@@ -6,3 +6,5 @@ obj-$(CONFIG_QUICC_ENGINE)+= qe.o qe_ic.o qe_io.o
 obj-$(CONFIG_UCC)       += ucc.o
 obj-$(CONFIG_UCC_SLOW)  += ucc_slow.o
 obj-$(CONFIG_UCC_FAST)  += ucc_fast.o
+obj-$(CONFIG_QE_USB)    += usb.o
+obj-$(CONFIG_QE_GPIO)   += gpio.o
diff --git a/arch/powerpc/sysdev/qe_lib/gpio.c b/arch/powerpc/sysdev/qe_lib/gpio.c
new file mode 100644
index 000000000000..8e5a0bc36d0b
--- /dev/null
+++ b/arch/powerpc/sysdev/qe_lib/gpio.c
@@ -0,0 +1,149 @@
+/*
+ * QUICC Engine GPIOs
+ *
+ * Copyright (c) MontaVista Software, Inc. 2008.
+ *
+ * Author: Anton Vorontsov <avorontsov@ru.mvista.com>
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/gpio.h>
+#include <asm/qe.h>
+
+struct qe_gpio_chip {
+        struct of_mm_gpio_chip mm_gc;
+        spinlock_t lock;
+
+        /* shadowed data register to clear/set bits safely */
+        u32 cpdata;
+};
+
+static inline struct qe_gpio_chip *
+to_qe_gpio_chip(struct of_mm_gpio_chip *mm_gc)
+{
+        return container_of(mm_gc, struct qe_gpio_chip, mm_gc);
+}
+
+static void qe_gpio_save_regs(struct of_mm_gpio_chip *mm_gc)
+{
+        struct qe_gpio_chip *qe_gc = to_qe_gpio_chip(mm_gc);
+        struct qe_pio_regs __iomem *regs = mm_gc->regs;
+
+        qe_gc->cpdata = in_be32(&regs->cpdata);
+}
+
+static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct qe_pio_regs __iomem *regs = mm_gc->regs;
+        u32 pin_mask = 1 << (QE_PIO_PINS - 1 - gpio);
+
+        return in_be32(&regs->cpdata) & pin_mask;
+}
+
+static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct qe_gpio_chip *qe_gc = to_qe_gpio_chip(mm_gc);
+        struct qe_pio_regs __iomem *regs = mm_gc->regs;
+        unsigned long flags;
+        u32 pin_mask = 1 << (QE_PIO_PINS - 1 - gpio);
+
+        spin_lock_irqsave(&qe_gc->lock, flags);
+
+        if (val)
+                qe_gc->cpdata |= pin_mask;
+        else
+                qe_gc->cpdata &= ~pin_mask;
+
+        out_be32(&regs->cpdata, qe_gc->cpdata);
+
+        spin_unlock_irqrestore(&qe_gc->lock, flags);
+}
+
+static int qe_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct qe_gpio_chip *qe_gc = to_qe_gpio_chip(mm_gc);
+        unsigned long flags;
+
+        spin_lock_irqsave(&qe_gc->lock, flags);
+
+        __par_io_config_pin(mm_gc->regs, gpio, QE_PIO_DIR_IN, 0, 0, 0);
+
+        spin_unlock_irqrestore(&qe_gc->lock, flags);
+
+        return 0;
+}
+
+static int qe_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct qe_gpio_chip *qe_gc = to_qe_gpio_chip(mm_gc);
+        unsigned long flags;
+
+        spin_lock_irqsave(&qe_gc->lock, flags);
+
+        __par_io_config_pin(mm_gc->regs, gpio, QE_PIO_DIR_OUT, 0, 0, 0);
+
+        spin_unlock_irqrestore(&qe_gc->lock, flags);
+
+        qe_gpio_set(gc, gpio, val);
+
+        return 0;
+}
+
+static int __init qe_add_gpiochips(void)
+{
+        struct device_node *np;
+
+        for_each_compatible_node(np, NULL, "fsl,mpc8323-qe-pario-bank") {
+                int ret;
+                struct qe_gpio_chip *qe_gc;
+                struct of_mm_gpio_chip *mm_gc;
+                struct of_gpio_chip *of_gc;
+                struct gpio_chip *gc;
+
+                qe_gc = kzalloc(sizeof(*qe_gc), GFP_KERNEL);
+                if (!qe_gc) {
+                        ret = -ENOMEM;
+                        goto err;
+                }
+
+                spin_lock_init(&qe_gc->lock);
+
+                mm_gc = &qe_gc->mm_gc;
+                of_gc = &mm_gc->of_gc;
+                gc = &of_gc->gc;
+
+                mm_gc->save_regs = qe_gpio_save_regs;
+                of_gc->gpio_cells = 2;
+                gc->ngpio = QE_PIO_PINS;
+                gc->direction_input = qe_gpio_dir_in;
+                gc->direction_output = qe_gpio_dir_out;
+                gc->get = qe_gpio_get;
+                gc->set = qe_gpio_set;
+
+                ret = of_mm_gpiochip_add(np, mm_gc);
+                if (ret)
+                        goto err;
+                continue;
+err:
+                pr_err("%s: registration failed with status %d\n",
+                       np->full_name, ret);
+                kfree(qe_gc);
+                /* try others anyway */
+        }
+        return 0;
+}
+arch_initcall(qe_add_gpiochips);
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c
index cff550eec7e8..9e82d7e725a5 100644
--- a/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/arch/powerpc/sysdev/qe_lib/qe.c
@@ -35,7 +35,6 @@
 #include <asm/rheap.h>
 
 static void qe_snums_init(void);
-static void qe_muram_init(void);
 static int qe_sdma_init(void);
 
 static DEFINE_SPINLOCK(qe_lock);
@@ -88,7 +87,7 @@ phys_addr_t get_qe_base(void)
 
 EXPORT_SYMBOL(get_qe_base);
 
-void qe_reset(void)
+void __init qe_reset(void)
 {
         if (qe_immr == NULL)
                 qe_immr = ioremap(get_qe_base(), QE_IMMAP_SIZE);
@@ -325,97 +324,6 @@ static int qe_sdma_init(void)
         return 0;
 }
 
-/*
- * muram_alloc / muram_free bits.
- */
-static DEFINE_SPINLOCK(qe_muram_lock);
-
-/* 16 blocks should be enough to satisfy all requests
- * until the memory subsystem goes up... */
-static rh_block_t qe_boot_muram_rh_block[16];
-static rh_info_t qe_muram_info;
-
-static void qe_muram_init(void)
-{
-        struct device_node *np;
-        const u32 *address;
-        u64 size;
-        unsigned int flags;
-
-        /* initialize the info header */
-        rh_init(&qe_muram_info, 1,
-                sizeof(qe_boot_muram_rh_block) /
-                sizeof(qe_boot_muram_rh_block[0]), qe_boot_muram_rh_block);
-
-        /* Attach the usable muram area */
-        /* XXX: This is a subset of the available muram. It
-         * varies with the processor and the microcode patches activated.
-         */
-        np = of_find_compatible_node(NULL, NULL, "fsl,qe-muram-data");
-        if (!np) {
-                np = of_find_node_by_name(NULL, "data-only");
-                if (!np) {
-                        WARN_ON(1);
-                        return;
-                }
-        }
-
-        address = of_get_address(np, 0, &size, &flags);
-        WARN_ON(!address);
-
-        of_node_put(np);
-        if (address)
-                rh_attach_region(&qe_muram_info, *address, (int)size);
-}
-
-/* This function returns an index into the MURAM area.
- */
-unsigned long qe_muram_alloc(int size, int align)
-{
-        unsigned long start;
-        unsigned long flags;
-
-        spin_lock_irqsave(&qe_muram_lock, flags);
-        start = rh_alloc_align(&qe_muram_info, size, align, "QE");
-        spin_unlock_irqrestore(&qe_muram_lock, flags);
-
-        return start;
-}
-EXPORT_SYMBOL(qe_muram_alloc);
-
-int qe_muram_free(unsigned long offset)
-{
-        int ret;
-        unsigned long flags;
-
-        spin_lock_irqsave(&qe_muram_lock, flags);
-        ret = rh_free(&qe_muram_info, offset);
-        spin_unlock_irqrestore(&qe_muram_lock, flags);
-
-        return ret;
-}
-EXPORT_SYMBOL(qe_muram_free);
-
-/* not sure if this is ever needed */
-unsigned long qe_muram_alloc_fixed(unsigned long offset, int size)
-{
-        unsigned long start;
-        unsigned long flags;
-
-        spin_lock_irqsave(&qe_muram_lock, flags);
-        start = rh_alloc_fixed(&qe_muram_info, offset, size, "commproc");
-        spin_unlock_irqrestore(&qe_muram_lock, flags);
-
-        return start;
-}
-EXPORT_SYMBOL(qe_muram_alloc_fixed);
-
-void qe_muram_dump(void)
-{
-        rh_dump(&qe_muram_info);
-}
-EXPORT_SYMBOL(qe_muram_dump);
-
 /* The maximum number of RISCs we support */
 #define MAX_QE_RISC     2
 
diff --git a/arch/powerpc/sysdev/qe_lib/qe_ic.c b/arch/powerpc/sysdev/qe_lib/qe_ic.c
index f59444d3be75..63cdf9887f36 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_ic.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_ic.c
@@ -329,21 +329,19 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags,
         struct resource res;
         u32 temp = 0, ret, high_active = 0;
 
+        ret = of_address_to_resource(node, 0, &res);
+        if (ret)
+                return;
+
         qe_ic = alloc_bootmem(sizeof(struct qe_ic));
         if (qe_ic == NULL)
                 return;
 
         memset(qe_ic, 0, sizeof(struct qe_ic));
 
-        qe_ic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+        qe_ic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
                                         NR_QE_IC_INTS, &qe_ic_host_ops, 0);
-        if (qe_ic->irqhost == NULL) {
-                of_node_put(node);
-                return;
-        }
-
-        ret = of_address_to_resource(node, 0, &res);
-        if (ret)
+        if (qe_ic->irqhost == NULL)
                 return;
 
         qe_ic->regs = ioremap(res.start, res.end - res.start + 1);
diff --git a/arch/powerpc/sysdev/qe_lib/qe_io.c b/arch/powerpc/sysdev/qe_lib/qe_io.c
index 93916a48afec..7c87460179ef 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_io.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_io.c
@@ -28,21 +28,7 @@
 
 #undef DEBUG
 
-#define NUM_OF_PINS     32
-
-struct port_regs {
-        __be32  cpodr;          /* Open drain register */
-        __be32  cpdata;         /* Data register */
-        __be32  cpdir1;         /* Direction register */
-        __be32  cpdir2;         /* Direction register */
-        __be32  cppar1;         /* Pin assignment register */
-        __be32  cppar2;         /* Pin assignment register */
-#ifdef CONFIG_PPC_85xx
-        u8      pad[8];
-#endif
-};
-
-static struct port_regs __iomem *par_io;
+static struct qe_pio_regs __iomem *par_io;
 static int num_par_io_ports = 0;
 
 int par_io_init(struct device_node *np)
@@ -64,69 +50,79 @@ int par_io_init(struct device_node *np)
         return 0;
 }
 
-int par_io_config_pin(u8 port, u8 pin, int dir, int open_drain,
-                      int assignment, int has_irq)
+void __par_io_config_pin(struct qe_pio_regs __iomem *par_io, u8 pin, int dir,
+                         int open_drain, int assignment, int has_irq)
 {
-        u32 pin_mask1bit, pin_mask2bits, new_mask2bits, tmp_val;
-
-        if (!par_io)
-                return -1;
+        u32 pin_mask1bit;
+        u32 pin_mask2bits;
+        u32 new_mask2bits;
+        u32 tmp_val;
 
         /* calculate pin location for single and 2 bits information */
-        pin_mask1bit = (u32) (1 << (NUM_OF_PINS - (pin + 1)));
+        pin_mask1bit = (u32) (1 << (QE_PIO_PINS - (pin + 1)));
 
         /* Set open drain, if required */
-        tmp_val = in_be32(&par_io[port].cpodr);
+        tmp_val = in_be32(&par_io->cpodr);
         if (open_drain)
-                out_be32(&par_io[port].cpodr, pin_mask1bit | tmp_val);
+                out_be32(&par_io->cpodr, pin_mask1bit | tmp_val);
         else
-                out_be32(&par_io[port].cpodr, ~pin_mask1bit & tmp_val);
+                out_be32(&par_io->cpodr, ~pin_mask1bit & tmp_val);
 
         /* define direction */
-        tmp_val = (pin > (NUM_OF_PINS / 2) - 1) ?
-                in_be32(&par_io[port].cpdir2) :
-                in_be32(&par_io[port].cpdir1);
+        tmp_val = (pin > (QE_PIO_PINS / 2) - 1) ?
+                in_be32(&par_io->cpdir2) :
+                in_be32(&par_io->cpdir1);
 
         /* get all bits mask for 2 bit per port */
-        pin_mask2bits = (u32) (0x3 << (NUM_OF_PINS -
-                                (pin % (NUM_OF_PINS / 2) + 1) * 2));
+        pin_mask2bits = (u32) (0x3 << (QE_PIO_PINS -
+                                (pin % (QE_PIO_PINS / 2) + 1) * 2));
 
         /* Get the final mask we need for the right definition */
-        new_mask2bits = (u32) (dir << (NUM_OF_PINS -
-                                (pin % (NUM_OF_PINS / 2) + 1) * 2));
+        new_mask2bits = (u32) (dir << (QE_PIO_PINS -
+                                (pin % (QE_PIO_PINS / 2) + 1) * 2));
 
         /* clear and set 2 bits mask */
-        if (pin > (NUM_OF_PINS / 2) - 1) {
-                out_be32(&par_io[port].cpdir2,
+        if (pin > (QE_PIO_PINS / 2) - 1) {
+                out_be32(&par_io->cpdir2,
                          ~pin_mask2bits & tmp_val);
                 tmp_val &= ~pin_mask2bits;
-                out_be32(&par_io[port].cpdir2, new_mask2bits | tmp_val);
+                out_be32(&par_io->cpdir2, new_mask2bits | tmp_val);
         } else {
-                out_be32(&par_io[port].cpdir1,
+                out_be32(&par_io->cpdir1,
                          ~pin_mask2bits & tmp_val);
                 tmp_val &= ~pin_mask2bits;
-                out_be32(&par_io[port].cpdir1, new_mask2bits | tmp_val);
+                out_be32(&par_io->cpdir1, new_mask2bits | tmp_val);
         }
         /* define pin assignment */
-        tmp_val = (pin > (NUM_OF_PINS / 2) - 1) ?
-                in_be32(&par_io[port].cppar2) :
-                in_be32(&par_io[port].cppar1);
+        tmp_val = (pin > (QE_PIO_PINS / 2) - 1) ?
+                in_be32(&par_io->cppar2) :
+                in_be32(&par_io->cppar1);
 
-        new_mask2bits = (u32) (assignment << (NUM_OF_PINS -
-                        (pin % (NUM_OF_PINS / 2) + 1) * 2));
+        new_mask2bits = (u32) (assignment << (QE_PIO_PINS -
+                        (pin % (QE_PIO_PINS / 2) + 1) * 2));
         /* clear and set 2 bits mask */
-        if (pin > (NUM_OF_PINS / 2) - 1) {
-                out_be32(&par_io[port].cppar2,
+        if (pin > (QE_PIO_PINS / 2) - 1) {
+                out_be32(&par_io->cppar2,
                          ~pin_mask2bits & tmp_val);
                 tmp_val &= ~pin_mask2bits;
-                out_be32(&par_io[port].cppar2, new_mask2bits | tmp_val);
+                out_be32(&par_io->cppar2, new_mask2bits | tmp_val);
         } else {
-                out_be32(&par_io[port].cppar1,
+                out_be32(&par_io->cppar1,
                          ~pin_mask2bits & tmp_val);
                 tmp_val &= ~pin_mask2bits;
-                out_be32(&par_io[port].cppar1, new_mask2bits | tmp_val);
+                out_be32(&par_io->cppar1, new_mask2bits | tmp_val);
         }
+}
+EXPORT_SYMBOL(__par_io_config_pin);
+
+int par_io_config_pin(u8 port, u8 pin, int dir, int open_drain,
+                      int assignment, int has_irq)
+{
+        if (!par_io || port >= num_par_io_ports)
+                return -EINVAL;
 
+        __par_io_config_pin(&par_io[port], pin, dir, open_drain, assignment,
+                            has_irq);
         return 0;
 }
 EXPORT_SYMBOL(par_io_config_pin);
@@ -137,10 +133,10 @@ int par_io_data_set(u8 port, u8 pin, u8 val)
 
         if (port >= num_par_io_ports)
                 return -EINVAL;
-        if (pin >= NUM_OF_PINS)
+        if (pin >= QE_PIO_PINS)
                 return -EINVAL;
         /* calculate pin location */
-        pin_mask = (u32) (1 << (NUM_OF_PINS - 1 - pin));
+        pin_mask = (u32) (1 << (QE_PIO_PINS - 1 - pin));
 
         tmp_val = in_be32(&par_io[port].cpdata);
 
diff --git a/arch/powerpc/sysdev/qe_lib/ucc.c b/arch/powerpc/sysdev/qe_lib/ucc.c
index 0e348d9af8a6..d3c7f5af9bc8 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc.c
@@ -26,7 +26,8 @@
 #include <asm/qe.h>
 #include <asm/ucc.h>
 
-static DEFINE_SPINLOCK(ucc_lock);
+DEFINE_SPINLOCK(cmxgcr_lock);
+EXPORT_SYMBOL(cmxgcr_lock);
 
 int ucc_set_qe_mux_mii_mng(unsigned int ucc_num)
 {
@@ -35,10 +36,10 @@ int ucc_set_qe_mux_mii_mng(unsigned int ucc_num)
         if (ucc_num > UCC_MAX_NUM - 1)
                 return -EINVAL;
 
-        spin_lock_irqsave(&ucc_lock, flags);
+        spin_lock_irqsave(&cmxgcr_lock, flags);
         clrsetbits_be32(&qe_immr->qmx.cmxgcr, QE_CMXGCR_MII_ENET_MNG,
                 ucc_num << QE_CMXGCR_MII_ENET_MNG_SHIFT);
-        spin_unlock_irqrestore(&ucc_lock, flags);
+        spin_unlock_irqrestore(&cmxgcr_lock, flags);
 
         return 0;
 }
diff --git a/arch/powerpc/sysdev/qe_lib/usb.c b/arch/powerpc/sysdev/qe_lib/usb.c
new file mode 100644
index 000000000000..8105462078eb
--- /dev/null
+++ b/arch/powerpc/sysdev/qe_lib/usb.c
@@ -0,0 +1,55 @@
+/*
+ * QE USB routines
+ *
+ * Copyright (c) Freescale Semicondutor, Inc. 2006.
+ *               Shlomi Gridish <gridish@freescale.com>
+ *               Jerry Huang <Chang-Ming.Huang@freescale.com>
+ * Copyright (c) MontaVista Software, Inc. 2008.
+ *               Anton Vorontsov <avorontsov@ru.mvista.com>
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/io.h>
+#include <asm/immap_qe.h>
+#include <asm/qe.h>
+
+int qe_usb_clock_set(enum qe_clock clk, int rate)
+{
+        struct qe_mux __iomem *mux = &qe_immr->qmx;
+        unsigned long flags;
+        u32 val;
+
+        switch (clk) {
+        case QE_CLK3:  val = QE_CMXGCR_USBCS_CLK3;  break;
+        case QE_CLK5:  val = QE_CMXGCR_USBCS_CLK5;  break;
+        case QE_CLK7:  val = QE_CMXGCR_USBCS_CLK7;  break;
+        case QE_CLK9:  val = QE_CMXGCR_USBCS_CLK9;  break;
+        case QE_CLK13: val = QE_CMXGCR_USBCS_CLK13; break;
+        case QE_CLK17: val = QE_CMXGCR_USBCS_CLK17; break;
+        case QE_CLK19: val = QE_CMXGCR_USBCS_CLK19; break;
+        case QE_CLK21: val = QE_CMXGCR_USBCS_CLK21; break;
+        case QE_BRG9:  val = QE_CMXGCR_USBCS_BRG9;  break;
+        case QE_BRG10: val = QE_CMXGCR_USBCS_BRG10; break;
+        default:
+                pr_err("%s: requested unknown clock %d\n", __func__, clk);
+                return -EINVAL;
+        }
+
+        if (qe_clock_is_brg(clk))
+                qe_setbrg(clk, rate, 1);
+
+        spin_lock_irqsave(&cmxgcr_lock, flags);
+
+        clrsetbits_be32(&mux->cmxgcr, QE_CMXGCR_USBCS, val);
+
+        spin_unlock_irqrestore(&cmxgcr_lock, flags);
+
+        return 0;
+}
+EXPORT_SYMBOL(qe_usb_clock_set);
diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index ac1a72dc21e5..24e1f5a197ae 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -426,11 +426,10 @@ void __init tsi108_pci_int_init(struct device_node *node)
 {
         DBG("Tsi108_pci_int_init: initializing PCI interrupts\n");
 
-        pci_irq_host = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LEGACY,
+        pci_irq_host = irq_alloc_host(node, IRQ_HOST_MAP_LEGACY,
                                       0, &pci_irq_host_ops, 0);
         if (pci_irq_host == NULL) {
                 printk(KERN_ERR "pci_irq_host: failed to allocate irq host !\n");
-                of_node_put(node);
                 return;
         }
 
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index 625b275c3795..d35405c59434 100644
--- a/arch/powerpc/sysdev/uic.c
+++ b/arch/powerpc/sysdev/uic.c
@@ -280,12 +280,10 @@ static struct uic * __init uic_init_one(struct device_node *node)
         }
         uic->dcrbase = *dcrreg;
 
-        uic->irqhost = irq_alloc_host(of_node_get(node), IRQ_HOST_MAP_LINEAR,
+        uic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR,
                                       NR_UIC_INTS, &uic_host_ops, -1);
-        if (! uic->irqhost) {
-                of_node_put(node);
+        if (! uic->irqhost)
                 return NULL; /* FIXME: panic? */
-        }
 
         uic->irqhost->host_data = uic;
 
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index bfcf70ee8959..34c3d0688fe0 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -54,7 +54,7 @@
 #define skipbl  xmon_skipbl
 
 #ifdef CONFIG_SMP
-cpumask_t cpus_in_xmon = CPU_MASK_NONE;
+static cpumask_t cpus_in_xmon = CPU_MASK_NONE;
 static unsigned long xmon_taken = 1;
 static int xmon_owner;
 static int xmon_gate;
@@ -154,7 +154,7 @@ static int do_spu_cmd(void);
 static void dump_tlb_44x(void);
 #endif
 
-int xmon_no_auto_backtrace;
+static int xmon_no_auto_backtrace;
 
 extern void xmon_enter(void);
 extern void xmon_leave(void);
@@ -327,6 +327,11 @@ static void release_output_lock(void)
 {
         xmon_speaker = 0;
 }
+
+int cpus_are_in_xmon(void)
+{
+        return !cpus_empty(cpus_in_xmon);
+}
 #endif
 
 static int xmon_core(struct pt_regs *regs, int fromipi)
@@ -593,7 +598,7 @@ static int xmon_iabr_match(struct pt_regs *regs)
 {
         if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) != (MSR_IR|MSR_SF))
                 return 0;
-        if (iabr == 0)
+        if (iabr == NULL)
                 return 0;
         xmon_core(regs, 0);
         return 1;
@@ -1142,7 +1147,7 @@ bpt_cmds(void)
                 } else {
                         /* assume a breakpoint address */
                         bp = at_breakpoint(a);
-                        if (bp == 0) {
+                        if (bp == NULL) {
                                 printf("No breakpoint at %x\n", a);
                                 break;
                         }
@@ -1370,7 +1375,7 @@ static void print_bug_trap(struct pt_regs *regs)
 #endif
 }
 
-void excprint(struct pt_regs *fp)
+static void excprint(struct pt_regs *fp)
 {
         unsigned long trap;
 
@@ -1408,7 +1413,7 @@ void excprint(struct pt_regs *fp)
                 print_bug_trap(fp);
 }
 
-void prregs(struct pt_regs *fp)
+static void prregs(struct pt_regs *fp)
 {
         int n, trap;
         unsigned long base;
@@ -1463,7 +1468,7 @@ void prregs(struct pt_regs *fp)
                 printf("dar = "REG"   dsisr = %.8lx\n", fp->dar, fp->dsisr);
 }
 
-void cacheflush(void)
+static void cacheflush(void)
 {
         int cmd;
         unsigned long nflush;
@@ -1495,7 +1500,7 @@ void cacheflush(void)
         catch_memory_errors = 0;
 }
 
-unsigned long
+static unsigned long
 read_spr(int n)
 {
         unsigned int instrs[2];
@@ -1533,7 +1538,7 @@ read_spr(int n)
         return ret;
 }
 
-void
+static void
 write_spr(int n, unsigned long val)
 {
         unsigned int instrs[2];
@@ -1571,7 +1576,7 @@ static unsigned long regno;
 extern char exc_prolog;
 extern char dec_exc;
 
-void super_regs(void)
+static void super_regs(void)
 {
         int cmd;
         unsigned long val;
@@ -1629,7 +1634,7 @@ void super_regs(void)
 /*
  * Stuff for reading and writing memory safely
  */
-int
+static int
 mread(unsigned long adrs, void *buf, int size)
 {
         volatile int n;
@@ -1666,7 +1671,7 @@ mread(unsigned long adrs, void *buf, int size)
         return n;
 }
 
-int
+static int
 mwrite(unsigned long adrs, void *buf, int size)
 {
         volatile int n;
@@ -1731,7 +1736,7 @@ static int handle_fault(struct pt_regs *regs)
 
 #define SWAP(a, b, t)   ((t) = (a), (a) = (b), (b) = (t))
 
-void
+static void
 byterev(unsigned char *val, int size)
 {
         int t;
@@ -1793,7 +1798,7 @@ static char *memex_subcmd_help_string =
     "  x        exit this mode\n"
     "";
 
-void
+static void
 memex(void)
 {
         int cmd, inc, i, nslash;
@@ -1944,7 +1949,7 @@ memex(void)
         }
 }
 
-int
+static int
 bsesc(void)
 {
         int c;
@@ -1984,7 +1989,7 @@ static void xmon_rawdump (unsigned long adrs, long ndump)
 #define isxdigit(c)     (('0' <= (c) && (c) <= '9') \
                          || ('a' <= (c) && (c) <= 'f') \
                          || ('A' <= (c) && (c) <= 'F'))
-void
+static void
 dump(void)
 {
         int c;
@@ -2022,7 +2027,7 @@ dump(void)
         }
 }
 
-void
+static void
 prdump(unsigned long adrs, long ndump)
 {
         long n, m, c, r, nr;
@@ -2066,7 +2071,7 @@ prdump(unsigned long adrs, long ndump)
 
 typedef int (*instruction_dump_func)(unsigned long inst, unsigned long addr);
 
-int
+static int
 generic_inst_dump(unsigned long adr, long count, int praddr,
                         instruction_dump_func dump_func)
 {
@@ -2104,7 +2109,7 @@ generic_inst_dump(unsigned long adr, long count, int praddr,
         return adr - first_adr;
 }
 
-int
+static int
 ppc_inst_dump(unsigned long adr, long count, int praddr)
 {
         return generic_inst_dump(adr, count, praddr, print_insn_powerpc);
@@ -2126,7 +2131,7 @@ static unsigned long mval;		/* byte value to set memory to */
 static unsigned long mcount;            /* # bytes to affect */
 static unsigned long mdiffs;            /* max # differences to print */
 
-void
+static void
 memops(int cmd)
 {
         scanhex((void *)&mdest);
@@ -2152,7 +2157,7 @@ memops(int cmd)
         }
 }
 
-void
+static void
 memdiffs(unsigned char *p1, unsigned char *p2, unsigned nb, unsigned maxpr)
 {
         unsigned n, prt;
@@ -2170,7 +2175,7 @@ memdiffs(unsigned char *p1, unsigned char *p2, unsigned nb, unsigned maxpr)
 static unsigned mend;
 static unsigned mask;
 
-void
+static void
 memlocate(void)
 {
         unsigned a, n;
@@ -2203,7 +2208,7 @@ memlocate(void)
 static unsigned long mskip = 0x1000;
 static unsigned long mlim = 0xffffffff;
 
-void
+static void
 memzcan(void)
 {
         unsigned char v;
@@ -2230,7 +2235,7 @@ memzcan(void)
                 printf("%.8x\n", a - mskip);
 }
 
-void proccall(void)
+static void proccall(void)
 {
         unsigned long args[8];
         unsigned long ret;
@@ -2388,7 +2393,7 @@ scanhex(unsigned long *vp)
         return 1;
 }
 
-void
+static void
 scannl(void)
 {
         int c;
@@ -2399,7 +2404,7 @@ scannl(void)
                 c = inchar();
 }
 
-int hexdigit(int c)
+static int hexdigit(int c)
 {
         if( '0' <= c && c <= '9' )
                 return c - '0';
@@ -2430,13 +2435,13 @@ getstring(char *s, int size)
 static char line[256];
 static char *lineptr;
 
-void
+static void
 flush_input(void)
 {
         lineptr = NULL;
 }
 
-int
+static int
 inchar(void)
 {
         if (lineptr == NULL || *lineptr == 0) {
@@ -2449,7 +2454,7 @@ inchar(void)
         return *lineptr++;
 }
 
-void
+static void
 take_input(char *str)
 {
         lineptr = str;
@@ -2618,7 +2623,8 @@ static void dump_tlb_44x(void)
         }
 }
 #endif /* CONFIG_44x */
-void xmon_init(int enable)
+
+static void xmon_init(int enable)
 {
 #ifdef CONFIG_PPC_ISERIES
         if (firmware_has_feature(FW_FEATURE_ISERIES))