167 files changed, 14914 insertions, 2019 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 3934e2659407..2cde4e333fd5 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -538,6 +538,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/boot/Makefile b/arch/powerpc/boot/Makefile
index 1cee2f9fdf06..4721baf92892 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -63,10 +63,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 redboot-83xx.c cuboot-sam440ep.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -213,6 +213,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 +243,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 +256,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 +266,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.
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..f9fe03252150 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";
                                 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 0x00000070>;
                                 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>;
@@ -295,23 +297,23 @@
                                 device_type = "network";
                                 compatible = "ibm,emac-460ex", "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 0x00000070>;
                                 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..463650c5f61d 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 0x00000070>;
                                 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 0x00000070>;
                                 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 0x00000070>;
                                 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 0x00000070>;
                                 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..2c2fceaabbcd 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";
                                 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 0x00000070>;
                                 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..b94bf61b9bcc 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 0x00000070>;
                                 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..3ed6a8fee1d5 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";
                                 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 0x00000070>;
                                 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";
                                 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 0x00000070>;
                                 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..fd5804398417 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>;
                 };
         };
 
@@ -62,7 +63,7 @@
                         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 */
@@ -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 {                                    /* For TSECs */
                         #address-cells = <1>;
                         #size-cells = <0>;
diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts
index 84cc5e72ddd8..1dfcd7ed199c 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";
                                 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 0x00000070>;
                                 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";
                                 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 0x00000070>;
                                 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/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/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index e1f0dca8ac39..b2068430a06d 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";
diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
index d7a1ececa30f..a40e8064d429 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>;
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index 539e02fb3526..b5968b6c8a29 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -114,6 +114,41 @@
                         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";
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 179c81c6a7ac..a798d8639a7d 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,7 +89,42 @@
                         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 {
@@ -98,7 +133,7 @@
                         compatible = "talitos";
                         reg = <0x30000 0x7000>;
                         interrupts = <11 0x8>;
-                        interrupt-parent = <&pic>;
+                        interrupt-parent = <&ipic>;
                         /* Rev. 2.2 */
                         num-channels = <1>;
                         channel-fifo-len = <24>;
@@ -106,7 +141,7 @@
                         descriptor-types-mask = <0x0122003f>;
                 };
 
-                pic:pic@700 {
+                ipic:pic@700 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
@@ -240,13 +275,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 +296,7 @@
                         reg = <0x80 0x80>;
                         big-endian;
                         interrupts = <32 0x8 33 0x8>; //high:32 low:33
-                        interrupt-parent = <&pic>;
+                        interrupt-parent = <&ipic>;
                 };
         };
 
@@ -270,21 +305,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..fc0f4c918c76 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>;
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index f81d735e6e72..e6afb1d1e19e 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>;
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 0199c5c548d8..9c75c7c69e21 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 {
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 8160ff24e87e..8e33b155f112 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -118,6 +118,41 @@
                         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";
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..49a38cb95b52 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,41 @@
                         };
                 };
 
+                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>;
+                };
+
                 /* 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..1f4538790302 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>;
diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts
index 1d6ea080ad73..99ad49d4f13f 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>;
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
index 0e872a60e091..44e34d3f21cf 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>;
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts
index 6f78a9fd9826..980be8136276 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>;
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts
index 1eb8defaff6f..eeedf5884881 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>;
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..21ad71b825c1 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>;
@@ -148,14 +190,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;
                 };
 
                 cpm@919c0 {
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts
index 6a0d8db96d97..6cf533f4b5fb 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
@@ -210,14 +211,28 @@
                 };
 
                 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..d1fa6bbfaea0 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>;
@@ -208,14 +250,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;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index b025c566c10d..6fc8059b5a01 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>;
@@ -148,14 +190,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;
                 };
 
                 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..be9a289c0d62 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>;
@@ -202,14 +244,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;
                 };
 
                 par_io@e0100 {
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
index 66f27ab613a2..cb06325f0b79 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,29 @@
                         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>;
+                };
+
                 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..65a5f64b2339 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 {
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/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..2afb63a42ea9 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 0x00000070>;
                                 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 0x00000070>;
                                 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..5b76bb26085a 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 {
diff --git a/arch/powerpc/boot/dts/sbc8548.dts b/arch/powerpc/boot/dts/sbc8548.dts
index 22d967178fe9..21cbacb1000c 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>;
@@ -265,12 +307,10 @@
                 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..149dabc55217 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 0x00000070>;
                                 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 0x00000070>;
                                 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..d4867ded8699 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 0x00000070>;
                                 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 0x00000070>;
                                 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 0x00000070>;
                                 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 0x00000070>;
                                 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/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..d083a648a81d 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>;
@@ -164,6 +206,7 @@
                         #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..13cd7280cb26
--- /dev/null
+++ b/arch/powerpc/boot/dts/tqm8548.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@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;
+                };
+
+                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..96b0b94ad925 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>;
@@ -164,6 +206,7 @@
                         #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/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/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/wrapper b/arch/powerpc/boot/wrapper
index d6c96d9ab291..cb87a015be7c 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -171,13 +171,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
@@ -203,6 +203,10 @@ simpleboot-virtex405-*)
     platformo="$object/virtex405-head.o $object/simpleboot.o"
     binary=y
     ;;
+asp834x-redboot)
+    platformo="$object/fixed-head.o $object/redboot-83xx.o"
+    binary=y
+    ;;
 esac
 
 vmz="$tmpdir/`basename \"$kernel\"`.$ext"
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/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..5d5b898767a3
--- /dev/null
+++ b/arch/powerpc/configs/85xx/tqm8548_defconfig
@@ -0,0 +1,1094 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26-rc4
+# Tue Jun  3 14:39:30 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_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_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_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 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_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 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_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 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/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 2346d271fbfd..0e8f928fef70 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -38,6 +38,7 @@ 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 \
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index ec9228d687b0..8655c7670350 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));
@@ -242,6 +246,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..f247fc6ad12d 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);
@@ -1427,9 +1428,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 +1493,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 +1509,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 +1522,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,
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 0c8614d9875c..ab2d62f70b14 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -44,29 +44,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
 
@@ -77,6 +102,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
 
@@ -141,13 +176,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:
@@ -160,10 +196,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
 
 /*
@@ -668,7 +711,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:
@@ -859,17 +902,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 */
 
@@ -925,7 +1041,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/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..2944529e8bf9 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -742,15 +742,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_booke.h b/arch/powerpc/kernel/head_booke.h
index aefafc6330c9..505494f1ee7c 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;                                                                 \
@@ -367,4 +380,25 @@ label:
         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/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/irq.c b/arch/powerpc/kernel/irq.c
index bcc249d90c4d..d6df018bb584 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 704375bda73a..631dfd614b21 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_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/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/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 34843c318419..2a60bd3e3afa 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 5112a4aa801d..9e83add54290 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -127,6 +127,11 @@ 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 +253,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 +332,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/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_32.c b/arch/powerpc/kernel/signal_32.c
index ad6943468ee9..4ae16d179803 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -243,7 +243,7 @@ long sys_sigsuspend(old_sigset_t mask)
 
         current->state = TASK_INTERRUPTIBLE;
         schedule();
-        set_thread_flag(TIF_RESTORE_SIGMASK);
+        set_restore_sigmask();
         return -ERESTARTNOHAND;
 }
 
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 1457aa0a08f1..ba7989ffaeee 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -365,12 +365,8 @@ void smp_call_function_interrupt(void)
         }
 }
 
-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/time.c b/arch/powerpc/kernel/time.c
index 73401e83739a..c73fc33aa817 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;
@@ -832,7 +832,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..b463d48145a4 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1030,21 +1030,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 */
diff --git a/arch/powerpc/kernel/vdso64/vdso64.lds.S b/arch/powerpc/kernel/vdso64/vdso64.lds.S
index 932b3fdb34b9..7d6585f90277 100644
--- a/arch/powerpc/kernel/vdso64/vdso64.lds.S
+++ b/arch/powerpc/kernel/vdso64/vdso64.lds.S
@@ -43,15 +43,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/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 0f2d239d94c4..bf5b6d7ed30f 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 */
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index 1952b4d3fa7f..45418590b6a9 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"
 
@@ -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/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 e2d867ce1c7e..509bc560159b 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..bee49ca704ef 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
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index 774165f9acdd..4e71e77f9a23 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -3,6 +3,7 @@ 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
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/warp-nand.c b/arch/powerpc/platforms/44x/warp-nand.c
index 9150318cfc56..7bec2815771a 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,23 @@ 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 = 2;
+                }
+                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/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 13587e2e8680..fe75b2ac3c9f 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -58,6 +58,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 +90,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..9cb8e29987a3 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -75,6 +75,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/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_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index dfd8b4ad9b28..b010dc9dec65 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -78,7 +78,8 @@ 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);
 
@@ -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/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index dea13208bf64..eb16208b29d9 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -70,7 +70,8 @@ static void __init mpc86xx_hpcd_init_irq(void)
 
         /* Alloc mpic structure and per isu has 16 INT entries. */
         mpic1 = mpic_alloc(np, res.start,
-                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
+                        MPIC_PRIMARY | MPIC_WANTS_RESET |
+                        MPIC_BIG_ENDIAN | MPIC_BROKEN_FRR_NIRQS,
                         0, 256, " MPIC     ");
         BUG_ON(mpic1 == NULL);
 
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index f7efaa925a13..1a1ccfbb9232 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
@@ -157,7 +162,7 @@ config ALTIVEC
 
 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
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/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/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/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/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/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/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 2cbaedb17f3e..3b4651b6ee05 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)
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/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/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..9b75d164bdf9 100644
--- a/arch/powerpc/sysdev/cpm_common.c
+++ b/arch/powerpc/sysdev/cpm_common.c
@@ -85,9 +85,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 +193,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..489ca5a397b1 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;
 }
 
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 019657c110b6..ca54563d5c7e 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -433,6 +433,7 @@ static struct i2c_driver_device i2c_devices[] __initdata = {
         {"dallas,ds1340",  "ds1340"},
         {"stm,m41t00",     "m41t00"},
         {"dallas,ds1374",  "ds1374"},
+        {"cirrus,cs4270",  "cs4270"},
 };
 
 static int __init of_find_i2c_driver(struct device_node *node,
@@ -448,6 +449,10 @@ static int __init of_find_i2c_driver(struct device_node *node,
                         return -ENOMEM;
                 return 0;
         }
+
+        pr_warning("fsl_soc.c: unrecognized i2c node %s\n",
+                (const char *) of_get_property(node, "compatible", NULL));
+
         return -ENODEV;
 }
 
@@ -491,6 +496,8 @@ static int __init fsl_i2c_of_init(void)
                 struct resource r[2];
                 struct fsl_i2c_platform_data i2c_data;
                 const unsigned char *flags = NULL;
+                int idx;
+                const u32 *iprop;
 
                 memset(&r, 0, sizeof(r));
                 memset(&i2c_data, 0, sizeof(i2c_data));
@@ -501,7 +508,10 @@ static int __init fsl_i2c_of_init(void)
 
                 of_irq_to_resource(np, 0, &r[1]);
 
-                i2c_dev = platform_device_register_simple("fsl-i2c", i, r, 2);
+                iprop = of_get_property(np, "cell-index", NULL);
+                idx = iprop ? *iprop : i;
+
+                i2c_dev = platform_device_register_simple("fsl-i2c", idx, r, 2);
                 if (IS_ERR(i2c_dev)) {
                         ret = PTR_ERR(i2c_dev);
                         goto err;
@@ -523,7 +533,8 @@ static int __init fsl_i2c_of_init(void)
                 if (ret)
                         goto unreg;
 
-                of_register_i2c_devices(np, i++);
+                of_register_i2c_devices(np, idx);
+                i++;
         }
 
         return 0;
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 7680001676a6..5788a6ab1254 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))