Merge branch 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'for-2.6.25' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (454 commits)
  [POWERPC] Cell IOMMU fixed mapping support
  [POWERPC] Split out the ioid fetching/checking logic
  [POWERPC] Add support to cell_iommu_setup_page_tables() for multiple windows
  [POWERPC] Split out the IOMMU logic from cell_dma_dev_setup()
  [POWERPC] Split cell_iommu_setup_hardware() into two parts
  [POWERPC] Split out the logic that allocates struct iommus
  [POWERPC] Allocate the hash table under 1G on cell
  [POWERPC] Add set_dma_ops() to match get_dma_ops()
  [POWERPC] 83xx: Clean up / convert mpc83xx board DTS files to v1 format.
  [POWERPC] 85xx: Only invalidate TLB0 and TLB1
  [POWERPC] 83xx: Fix typo in mpc837x compatible entries
  [POWERPC] 85xx: convert sbc85* boards to use machine_device_initcall
  [POWERPC] 83xx: rework platform Kconfig
  [POWERPC] 85xx: rework platform Kconfig
  [POWERPC] 86xx: Remove unused IRQ defines
  [POWERPC] QE: Explicitly set address-cells and size cells for muram
  [POWERPC] Convert StorCenter DTS file to /dts-v1/ format.
  [POWERPC] 86xx: Convert all 86xx DTS files to /dts-v1/ format.
  [PPC] Remove 85xx from arch/ppc
  [PPC] Remove 83xx from arch/ppc
  ...

124 files changed, 22190 insertions, 2977 deletions

diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index 65f4118cbe78..5ef2bdf8d189 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -1,4 +1,5 @@
 addnote
+dtc
 empty.c
 hack-coff
 infblock.c
@@ -30,6 +31,7 @@ zImage.*lds
 zImage.miboot
 zImage.pmac
 zImage.pseries
+zImage.redboot*
 zImage.sandpoint
 zImage.vmode
 zconf.h
diff --git a/arch/powerpc/boot/4xx.c b/arch/powerpc/boot/4xx.c
index ebf9e217612d..758edf1c5815 100644
--- a/arch/powerpc/boot/4xx.c
+++ b/arch/powerpc/boot/4xx.c
@@ -22,16 +22,14 @@
 #include "dcr.h"
 
 /* Read the 4xx SDRAM controller to get size of system memory. */
-void ibm4xx_fixup_memsize(void)
+void ibm4xx_sdram_fixup_memsize(void)
 {
         int i;
         unsigned long memsize, bank_config;
 
         memsize = 0;
         for (i = 0; i < ARRAY_SIZE(sdram_bxcr); i++) {
-                mtdcr(DCRN_SDRAM0_CFGADDR, sdram_bxcr[i]);
-                bank_config = mfdcr(DCRN_SDRAM0_CFGDATA);
-
+                bank_config = SDRAM0_READ(sdram_bxcr[i]);
                 if (bank_config & SDRAM_CONFIG_BANK_ENABLE)
                         memsize += SDRAM_CONFIG_BANK_SIZE(bank_config);
         }
@@ -39,6 +37,69 @@ void ibm4xx_fixup_memsize(void)
         dt_fixup_memory(0, memsize);
 }
 
+/* Read the 440SPe MQ controller to get size of system memory. */
+#define DCRN_MQ0_B0BAS          0x40
+#define DCRN_MQ0_B1BAS          0x41
+#define DCRN_MQ0_B2BAS          0x42
+#define DCRN_MQ0_B3BAS          0x43
+
+static u64 ibm440spe_decode_bas(u32 bas)
+{
+        u64 base = ((u64)(bas & 0xFFE00000u)) << 2;
+
+        /* open coded because I'm paranoid about invalid values */
+        switch ((bas >> 4) & 0xFFF) {
+        case 0:
+                return 0;
+        case 0xffc:
+                return base + 0x000800000ull;
+        case 0xff8:
+                return base + 0x001000000ull;
+        case 0xff0:
+                return base + 0x002000000ull;
+        case 0xfe0:
+                return base + 0x004000000ull;
+        case 0xfc0:
+                return base + 0x008000000ull;
+        case 0xf80:
+                return base + 0x010000000ull;
+        case 0xf00:
+                return base + 0x020000000ull;
+        case 0xe00:
+                return base + 0x040000000ull;
+        case 0xc00:
+                return base + 0x080000000ull;
+        case 0x800:
+                return base + 0x100000000ull;
+        }
+        printf("Memory BAS value 0x%08x unsupported !\n", bas);
+        return 0;
+}
+
+void ibm440spe_fixup_memsize(void)
+{
+        u64 banktop, memsize = 0;
+
+        /* Ultimately, we should directly construct the memory node
+         * so we are able to handle holes in the memory address space
+         */
+        banktop = ibm440spe_decode_bas(mfdcr(DCRN_MQ0_B0BAS));
+        if (banktop > memsize)
+                memsize = banktop;
+        banktop = ibm440spe_decode_bas(mfdcr(DCRN_MQ0_B1BAS));
+        if (banktop > memsize)
+                memsize = banktop;
+        banktop = ibm440spe_decode_bas(mfdcr(DCRN_MQ0_B2BAS));
+        if (banktop > memsize)
+                memsize = banktop;
+        banktop = ibm440spe_decode_bas(mfdcr(DCRN_MQ0_B3BAS));
+        if (banktop > memsize)
+                memsize = banktop;
+
+        dt_fixup_memory(0, memsize);
+}
+
+
 /* 4xx DDR1/2 Denali memory controller support */
 /* DDR0 registers */
 #define DDR0_02                 2
@@ -77,19 +138,13 @@ void ibm4xx_fixup_memsize(void)
 
 #define DDR_GET_VAL(val, mask, shift)   (((val) >> (shift)) & (mask))
 
-static inline u32 mfdcr_sdram0(u32 reg)
-{
-        mtdcr(DCRN_SDRAM0_CFGADDR, reg);
-        return mfdcr(DCRN_SDRAM0_CFGDATA);
-}
-
 void ibm4xx_denali_fixup_memsize(void)
 {
         u32 val, max_cs, max_col, max_row;
         u32 cs, col, row, bank, dpath;
         unsigned long memsize;
 
-        val = mfdcr_sdram0(DDR0_02);
+        val = SDRAM0_READ(DDR0_02);
         if (!DDR_GET_VAL(val, DDR_START, DDR_START_SHIFT))
                 fatal("DDR controller is not initialized\n");
 
@@ -99,12 +154,12 @@ void ibm4xx_denali_fixup_memsize(void)
         max_row = DDR_GET_VAL(val, DDR_MAX_ROW_REG, DDR_MAX_ROW_REG_SHIFT);
 
         /* get CS value */
-        val = mfdcr_sdram0(DDR0_10);
+        val = SDRAM0_READ(DDR0_10);
 
         val = DDR_GET_VAL(val, DDR_CS_MAP, DDR_CS_MAP_SHIFT);
         cs = 0;
         while (val) {
-                if (val && 0x1)
+                if (val & 0x1)
                         cs++;
                 val = val >> 1;
         }
@@ -115,15 +170,15 @@ void ibm4xx_denali_fixup_memsize(void)
                 fatal("DDR wrong CS configuration\n");
 
         /* get data path bytes */
-        val = mfdcr_sdram0(DDR0_14);
+        val = SDRAM0_READ(DDR0_14);
 
         if (DDR_GET_VAL(val, DDR_REDUC, DDR_REDUC_SHIFT))
                 dpath = 8; /* 64 bits */
         else
                 dpath = 4; /* 32 bits */
 
-        /* get adress pins (rows) */
-        val = mfdcr_sdram0(DDR0_42);
+        /* get address pins (rows) */
+        val = SDRAM0_READ(DDR0_42);
 
         row = DDR_GET_VAL(val, DDR_APIN, DDR_APIN_SHIFT);
         if (row > max_row)
@@ -131,7 +186,7 @@ void ibm4xx_denali_fixup_memsize(void)
         row = max_row - row;
 
         /* get collomn size and banks */
-        val = mfdcr_sdram0(DDR0_43);
+        val = SDRAM0_READ(DDR0_43);
 
         col = DDR_GET_VAL(val, DDR_COL_SZ, DDR_COL_SZ_SHIFT);
         if (col > max_col)
@@ -179,13 +234,17 @@ void ibm40x_dbcr_reset(void)
 #define EMAC_RESET 0x20000000
 void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1)
 {
-        /* Quiesce the MAL and EMAC(s) since PIBS/OpenBIOS don't do this for us */
+        /* Quiesce the MAL and EMAC(s) since PIBS/OpenBIOS don't
+         * do this for us
+         */
         if (emac0)
                 *emac0 = EMAC_RESET;
         if (emac1)
                 *emac1 = EMAC_RESET;
 
         mtdcr(DCRN_MAL0_CFG, MAL_RESET);
+        while (mfdcr(DCRN_MAL0_CFG) & MAL_RESET)
+                ; /* loop until reset takes effect */
 }
 
 /* Read 4xx EBC bus bridge registers to get mappings of the peripheral
@@ -217,84 +276,335 @@ void ibm4xx_fixup_ebc_ranges(const char *ebc)
         setprop(devp, "ranges", ranges, (p - ranges) * sizeof(u32));
 }
 
-#define SPRN_CCR1 0x378
-void ibm440ep_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)
+/* Calculate 440GP clocks */
+void ibm440gp_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk)
 {
-        u32 cpu, plb, opb, ebc, tb, uart0, m, vco;
-        u32 reg;
-        u32 fwdva, fwdvb, fbdv, lfbdv, opbdv0, perdv0, spcid0, prbdv0, tmp;
-
-        mtdcr(DCRN_CPR0_ADDR, CPR0_PLLD0);
-        reg = mfdcr(DCRN_CPR0_DATA);
-        tmp = (reg & 0x000F0000) >> 16;
-        fwdva = tmp ? tmp : 16;
-        tmp = (reg & 0x00000700) >> 8;
-        fwdvb = tmp ? tmp : 8;
-        tmp = (reg & 0x1F000000) >> 24;
-        fbdv = tmp ? tmp : 32;
-        lfbdv = (reg & 0x0000007F);
-
-        mtdcr(DCRN_CPR0_ADDR, CPR0_OPBD0);
-        reg = mfdcr(DCRN_CPR0_DATA);
-        tmp = (reg & 0x03000000) >> 24;
-        opbdv0 = tmp ? tmp : 4;
-
-        mtdcr(DCRN_CPR0_ADDR, CPR0_PERD0);
-        reg = mfdcr(DCRN_CPR0_DATA);
-        tmp = (reg & 0x07000000) >> 24;
-        perdv0 = tmp ? tmp : 8;
-
-        mtdcr(DCRN_CPR0_ADDR, CPR0_PRIMBD0);
-        reg = mfdcr(DCRN_CPR0_DATA);
-        tmp = (reg & 0x07000000) >> 24;
-        prbdv0 = tmp ? tmp : 8;
-
-        mtdcr(DCRN_CPR0_ADDR, CPR0_SCPID);
-        reg = mfdcr(DCRN_CPR0_DATA);
-        tmp = (reg & 0x03000000) >> 24;
-        spcid0 = tmp ? tmp : 4;
-
-        /* Calculate M */
-        mtdcr(DCRN_CPR0_ADDR, CPR0_PLLC0);
-        reg = mfdcr(DCRN_CPR0_DATA);
-        tmp = (reg & 0x03000000) >> 24;
-        if (tmp == 0) { /* PLL output */
-                tmp = (reg & 0x20000000) >> 29;
-                if (!tmp) /* PLLOUTA */
-                        m = fbdv * lfbdv * fwdva;
+        u32 sys0 = mfdcr(DCRN_CPC0_SYS0);
+        u32 cr0 = mfdcr(DCRN_CPC0_CR0);
+        u32 cpu, plb, opb, ebc, tb, uart0, uart1, m;
+        u32 opdv = CPC0_SYS0_OPDV(sys0);
+        u32 epdv = CPC0_SYS0_EPDV(sys0);
+
+        if (sys0 & CPC0_SYS0_BYPASS) {
+                /* Bypass system PLL */
+                cpu = plb = sys_clk;
+        } else {
+                if (sys0 & CPC0_SYS0_EXTSL)
+                        /* PerClk */
+                        m = CPC0_SYS0_FWDVB(sys0) * opdv * epdv;
                 else
-                        m = fbdv * lfbdv * fwdvb;
+                        /* CPU clock */
+                        m = CPC0_SYS0_FBDV(sys0) * CPC0_SYS0_FWDVA(sys0);
+                cpu = sys_clk * m / CPC0_SYS0_FWDVA(sys0);
+                plb = sys_clk * m / CPC0_SYS0_FWDVB(sys0);
         }
-        else if (tmp == 1) /* CPU output */
-                m = fbdv * fwdva;
+
+        opb = plb / opdv;
+        ebc = opb / epdv;
+
+        /* FIXME: Check if this is for all 440GP, or just Ebony */
+        if ((mfpvr() & 0xf0000fff) == 0x40000440)
+                /* Rev. B 440GP, use external system clock */
+                tb = sys_clk;
         else
-                m = perdv0 * opbdv0 * fwdvb;
+                /* Rev. C 440GP, errata force us to use internal clock */
+                tb = cpu;
 
-        vco = (m * sysclk) + (m >> 1);
-        cpu = vco / fwdva;
-        plb = vco / fwdvb / prbdv0;
-        opb = plb / opbdv0;
-        ebc = plb / perdv0;
+        if (cr0 & CPC0_CR0_U0EC)
+                /* External UART clock */
+                uart0 = ser_clk;
+        else
+                /* Internal UART clock */
+                uart0 = plb / CPC0_CR0_UDIV(cr0);
+
+        if (cr0 & CPC0_CR0_U1EC)
+                /* External UART clock */
+                uart1 = ser_clk;
+        else
+                /* Internal UART clock */
+                uart1 = plb / CPC0_CR0_UDIV(cr0);
 
-        /* FIXME */
-        uart0 = ser_clk;
+        printf("PPC440GP: SysClk = %dMHz (%x)\n\r",
+               (sys_clk + 500000) / 1000000, sys_clk);
+
+        dt_fixup_cpu_clocks(cpu, tb, 0);
+
+        dt_fixup_clock("/plb", plb);
+        dt_fixup_clock("/plb/opb", opb);
+        dt_fixup_clock("/plb/opb/ebc", ebc);
+        dt_fixup_clock("/plb/opb/serial@40000200", uart0);
+        dt_fixup_clock("/plb/opb/serial@40000300", uart1);
+}
+
+#define SPRN_CCR1 0x378
+
+static inline u32 __fix_zero(u32 v, u32 def)
+{
+        return v ? v : def;
+}
+
+static unsigned int __ibm440eplike_fixup_clocks(unsigned int sys_clk,
+                                                unsigned int tmr_clk,
+                                                int per_clk_from_opb)
+{
+        /* PLL config */
+        u32 pllc  = CPR0_READ(DCRN_CPR0_PLLC);
+        u32 plld  = CPR0_READ(DCRN_CPR0_PLLD);
+
+        /* Dividers */
+        u32 fbdv   = __fix_zero((plld >> 24) & 0x1f, 32);
+        u32 fwdva  = __fix_zero((plld >> 16) & 0xf, 16);
+        u32 fwdvb  = __fix_zero((plld >> 8) & 7, 8);
+        u32 lfbdv  = __fix_zero(plld & 0x3f, 64);
+        u32 pradv0 = __fix_zero((CPR0_READ(DCRN_CPR0_PRIMAD) >> 24) & 7, 8);
+        u32 prbdv0 = __fix_zero((CPR0_READ(DCRN_CPR0_PRIMBD) >> 24) & 7, 8);
+        u32 opbdv0 = __fix_zero((CPR0_READ(DCRN_CPR0_OPBD) >> 24) & 3, 4);
+        u32 perdv0 = __fix_zero((CPR0_READ(DCRN_CPR0_PERD) >> 24) & 3, 4);
+
+        /* Input clocks for primary dividers */
+        u32 clk_a, clk_b;
+
+        /* Resulting clocks */
+        u32 cpu, plb, opb, ebc, vco;
+
+        /* Timebase */
+        u32 ccr1, tb = tmr_clk;
+
+        if (pllc & 0x40000000) {
+                u32 m;
+
+                /* Feedback path */
+                switch ((pllc >> 24) & 7) {
+                case 0:
+                        /* PLLOUTx */
+                        m = ((pllc & 0x20000000) ? fwdvb : fwdva) * lfbdv;
+                        break;
+                case 1:
+                        /* CPU */
+                        m = fwdva * pradv0;
+                        break;
+                case 5:
+                        /* PERClk */
+                        m = fwdvb * prbdv0 * opbdv0 * perdv0;
+                        break;
+                default:
+                        printf("WARNING ! Invalid PLL feedback source !\n");
+                        goto bypass;
+                }
+                m *= fbdv;
+                vco = sys_clk * m;
+                clk_a = vco / fwdva;
+                clk_b = vco / fwdvb;
+        } else {
+bypass:
+                /* Bypass system PLL */
+                vco = 0;
+                clk_a = clk_b = sys_clk;
+        }
+
+        cpu = clk_a / pradv0;
+        plb = clk_b / prbdv0;
+        opb = plb / opbdv0;
+        ebc = (per_clk_from_opb ? opb : plb) / perdv0;
 
         /* Figure out timebase.  Either CPU or default TmrClk */
-        asm volatile (
-                        "mfspr  %0,%1\n"
-                        :
-                        "=&r"(reg) : "i"(SPRN_CCR1));
-        if (reg & 0x0080)
-                tb = 25000000; /* TmrClk is 25MHz */
-        else
+        ccr1 = mfspr(SPRN_CCR1);
+
+        /* If passed a 0 tmr_clk, force CPU clock */
+        if (tb == 0) {
+                ccr1 &= ~0x80u;
+                mtspr(SPRN_CCR1, ccr1);
+        }
+        if ((ccr1 & 0x0080) == 0)
                 tb = cpu;
 
         dt_fixup_cpu_clocks(cpu, tb, 0);
         dt_fixup_clock("/plb", plb);
         dt_fixup_clock("/plb/opb", opb);
         dt_fixup_clock("/plb/opb/ebc", ebc);
+
+        return plb;
+}
+
+static void eplike_fixup_uart_clk(int index, const char *path,
+                                  unsigned int ser_clk,
+                                  unsigned int plb_clk)
+{
+        unsigned int sdr;
+        unsigned int clock;
+
+        switch (index) {
+        case 0:
+                sdr = SDR0_READ(DCRN_SDR0_UART0);
+                break;
+        case 1:
+                sdr = SDR0_READ(DCRN_SDR0_UART1);
+                break;
+        case 2:
+                sdr = SDR0_READ(DCRN_SDR0_UART2);
+                break;
+        case 3:
+                sdr = SDR0_READ(DCRN_SDR0_UART3);
+                break;
+        default:
+                return;
+        }
+
+        if (sdr & 0x00800000u)
+                clock = ser_clk;
+        else
+                clock = plb_clk / __fix_zero(sdr & 0xff, 256);
+
+        dt_fixup_clock(path, clock);
+}
+
+void ibm440ep_fixup_clocks(unsigned int sys_clk,
+                           unsigned int ser_clk,
+                           unsigned int tmr_clk)
+{
+        unsigned int plb_clk = __ibm440eplike_fixup_clocks(sys_clk, tmr_clk, 0);
+
+        /* serial clocks beed fixup based on int/ext */
+        eplike_fixup_uart_clk(0, "/plb/opb/serial@ef600300", ser_clk, plb_clk);
+        eplike_fixup_uart_clk(1, "/plb/opb/serial@ef600400", ser_clk, plb_clk);
+        eplike_fixup_uart_clk(2, "/plb/opb/serial@ef600500", ser_clk, plb_clk);
+        eplike_fixup_uart_clk(3, "/plb/opb/serial@ef600600", ser_clk, plb_clk);
+}
+
+void ibm440gx_fixup_clocks(unsigned int sys_clk,
+                           unsigned int ser_clk,
+                           unsigned int tmr_clk)
+{
+        unsigned int plb_clk = __ibm440eplike_fixup_clocks(sys_clk, tmr_clk, 1);
+
+        /* serial clocks beed fixup based on int/ext */
+        eplike_fixup_uart_clk(0, "/plb/opb/serial@40000200", ser_clk, plb_clk);
+        eplike_fixup_uart_clk(1, "/plb/opb/serial@40000300", ser_clk, plb_clk);
+}
+
+void ibm440spe_fixup_clocks(unsigned int sys_clk,
+                            unsigned int ser_clk,
+                            unsigned int tmr_clk)
+{
+        unsigned int plb_clk = __ibm440eplike_fixup_clocks(sys_clk, tmr_clk, 1);
+
+        /* serial clocks beed fixup based on int/ext */
+        eplike_fixup_uart_clk(0, "/plb/opb/serial@10000200", ser_clk, plb_clk);
+        eplike_fixup_uart_clk(1, "/plb/opb/serial@10000300", ser_clk, plb_clk);
+        eplike_fixup_uart_clk(2, "/plb/opb/serial@10000600", ser_clk, plb_clk);
+}
+
+void ibm405gp_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk)
+{
+        u32 pllmr = mfdcr(DCRN_CPC0_PLLMR);
+        u32 cpc0_cr0 = mfdcr(DCRN_405_CPC0_CR0);
+        u32 cpc0_cr1 = mfdcr(DCRN_405_CPC0_CR1);
+        u32 psr = mfdcr(DCRN_405_CPC0_PSR);
+        u32 cpu, plb, opb, ebc, tb, uart0, uart1, m;
+        u32 fwdv, fwdvb, fbdv, cbdv, opdv, epdv, ppdv, udiv;
+
+        fwdv = (8 - ((pllmr & 0xe0000000) >> 29));
+        fbdv = (pllmr & 0x1e000000) >> 25;
+        if (fbdv == 0)
+                fbdv = 16;
+        cbdv = ((pllmr & 0x00060000) >> 17) + 1; /* CPU:PLB */
+        opdv = ((pllmr & 0x00018000) >> 15) + 1; /* PLB:OPB */
+        ppdv = ((pllmr & 0x00001800) >> 13) + 1; /* PLB:PCI */
+        epdv = ((pllmr & 0x00001800) >> 11) + 2; /* PLB:EBC */
+        udiv = ((cpc0_cr0 & 0x3e) >> 1) + 1;
+
+        /* check for 405GPr */
+        if ((mfpvr() & 0xfffffff0) == (0x50910951 & 0xfffffff0)) {
+                fwdvb = 8 - (pllmr & 0x00000007);
+                if (!(psr & 0x00001000)) /* PCI async mode enable == 0 */
+                        if (psr & 0x00000020) /* New mode enable */
+                                m = fwdvb * 2 * ppdv;
+                        else
+                                m = fwdvb * cbdv * ppdv;
+                else if (psr & 0x00000020) /* New mode enable */
+                        if (psr & 0x00000800) /* PerClk synch mode */
+                                m = fwdvb * 2 * epdv;
+                        else
+                                m = fbdv * fwdv;
+                else if (epdv == fbdv)
+                        m = fbdv * cbdv * epdv;
+                else
+                        m = fbdv * fwdvb * cbdv;
+
+                cpu = sys_clk * m / fwdv;
+                plb = sys_clk * m / (fwdvb * cbdv);
+        } else {
+                m = fwdv * fbdv * cbdv;
+                cpu = sys_clk * m / fwdv;
+                plb = cpu / cbdv;
+        }
+        opb = plb / opdv;
+        ebc = plb / epdv;
+
+        if (cpc0_cr0 & 0x80)
+                /* uart0 uses the external clock */
+                uart0 = ser_clk;
+        else
+                uart0 = cpu / udiv;
+
+        if (cpc0_cr0 & 0x40)
+                /* uart1 uses the external clock */
+                uart1 = ser_clk;
+        else
+                uart1 = cpu / udiv;
+
+        /* setup the timebase clock to tick at the cpu frequency */
+        cpc0_cr1 = cpc0_cr1 & ~0x00800000;
+        mtdcr(DCRN_405_CPC0_CR1, cpc0_cr1);
+        tb = cpu;
+
+        dt_fixup_cpu_clocks(cpu, tb, 0);
+        dt_fixup_clock("/plb", plb);
+        dt_fixup_clock("/plb/opb", opb);
+        dt_fixup_clock("/plb/ebc", ebc);
+        dt_fixup_clock("/plb/opb/serial@ef600300", uart0);
+        dt_fixup_clock("/plb/opb/serial@ef600400", uart1);
+}
+
+
+void ibm405ep_fixup_clocks(unsigned int sys_clk)
+{
+        u32 pllmr0 = mfdcr(DCRN_CPC0_PLLMR0);
+        u32 pllmr1 = mfdcr(DCRN_CPC0_PLLMR1);
+        u32 cpc0_ucr = mfdcr(DCRN_CPC0_UCR);
+        u32 cpu, plb, opb, ebc, uart0, uart1;
+        u32 fwdva, fwdvb, fbdv, cbdv, opdv, epdv;
+        u32 pllmr0_ccdv, tb, m;
+
+        fwdva = 8 - ((pllmr1 & 0x00070000) >> 16);
+        fwdvb = 8 - ((pllmr1 & 0x00007000) >> 12);
+        fbdv = (pllmr1 & 0x00f00000) >> 20;
+        if (fbdv == 0)
+                fbdv = 16;
+
+        cbdv = ((pllmr0 & 0x00030000) >> 16) + 1; /* CPU:PLB */
+        epdv = ((pllmr0 & 0x00000300) >> 8) + 2;  /* PLB:EBC */
+        opdv = ((pllmr0 & 0x00003000) >> 12) + 1; /* PLB:OPB */
+
+        m = fbdv * fwdvb;
+
+        pllmr0_ccdv = ((pllmr0 & 0x00300000) >> 20) + 1;
+        if (pllmr1 & 0x80000000)
+                cpu = sys_clk * m / (fwdva * pllmr0_ccdv);
+        else
+                cpu = sys_clk / pllmr0_ccdv;
+
+        plb = cpu / cbdv;
+        opb = plb / opdv;
+        ebc = plb / epdv;
+        tb = cpu;
+        uart0 = cpu / (cpc0_ucr & 0x0000007f);
+        uart1 = cpu / ((cpc0_ucr & 0x00007f00) >> 8);
+
+        dt_fixup_cpu_clocks(cpu, tb, 0);
+        dt_fixup_clock("/plb", plb);
+        dt_fixup_clock("/plb/opb", opb);
+        dt_fixup_clock("/plb/ebc", ebc);
         dt_fixup_clock("/plb/opb/serial@ef600300", uart0);
-        dt_fixup_clock("/plb/opb/serial@ef600400", uart0);
-        dt_fixup_clock("/plb/opb/serial@ef600500", uart0);
-        dt_fixup_clock("/plb/opb/serial@ef600600", uart0);
+        dt_fixup_clock("/plb/opb/serial@ef600400", uart1);
 }
diff --git a/arch/powerpc/boot/4xx.h b/arch/powerpc/boot/4xx.h
index adba6a599a93..2606e64f0c4b 100644
--- a/arch/powerpc/boot/4xx.h
+++ b/arch/powerpc/boot/4xx.h
@@ -11,12 +11,22 @@
 #ifndef _POWERPC_BOOT_4XX_H_
 #define _POWERPC_BOOT_4XX_H_
 
-void ibm4xx_fixup_memsize(void);
+void ibm4xx_sdram_fixup_memsize(void);
+void ibm440spe_fixup_memsize(void);
 void ibm4xx_denali_fixup_memsize(void);
 void ibm44x_dbcr_reset(void);
 void ibm40x_dbcr_reset(void);
 void ibm4xx_quiesce_eth(u32 *emac0, u32 *emac1);
 void ibm4xx_fixup_ebc_ranges(const char *ebc);
-void ibm440ep_fixup_clocks(unsigned int sysclk, unsigned int ser_clk);
+
+void ibm405gp_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk);
+void ibm405ep_fixup_clocks(unsigned int sys_clk);
+void ibm440gp_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk);
+void ibm440ep_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk,
+                           unsigned int tmr_clk);
+void ibm440gx_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk,
+                           unsigned int tmr_clk);
+void ibm440spe_fixup_clocks(unsigned int sys_clk, unsigned int ser_clk,
+                            unsigned int tmr_clk);
 
 #endif /* _POWERPC_BOOT_4XX_H_ */
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 4b1d98b8135e..122a27078998 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -33,12 +33,15 @@ ifeq ($(call cc-option-yn, -fstack-protector),y)
 BOOTCFLAGS      += -fno-stack-protector
 endif
 
-BOOTCFLAGS      += -I$(obj) -I$(srctree)/$(obj)
+BOOTCFLAGS      += -I$(obj) -I$(srctree)/$(obj) -I$(srctree)/$(src)/libfdt
 
 $(obj)/4xx.o: BOOTCFLAGS += -mcpu=440
 $(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
+$(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=440
+$(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=440
 $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
 
+
 zlib       := inffast.c inflate.c inftrees.c
 zlibheader := inffast.h inffixed.h inflate.h inftrees.h infutil.h
 zliblinuxheader := zlib.h zconf.h zutil.h
@@ -46,17 +49,21 @@ zliblinuxheader := zlib.h zconf.h zutil.h
 $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \
         $(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))
 
-src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \
+src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
+src-wlib := string.S crt0.S stdio.c main.c \
+                $(addprefix libfdt/,$(src-libfdt)) libfdt-wrapper.c \
                 ns16550.c serial.c simple_alloc.c div64.S util.S \
                 gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
                 4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \
                 cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \
                 fsl-soc.c mpc8xx.c pq2.c
-src-plat := of.c cuboot-52xx.c cuboot-83xx.c cuboot-85xx.c holly.c \
+src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \
                 cuboot-ebony.c treeboot-ebony.c prpmc2800.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 \
-                fixed-head.S ep88xc.c cuboot-hpc2.c
+                fixed-head.S ep88xc.c cuboot-hpc2.c ep405.c cuboot-taishan.c \
+                cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
+                cuboot-warp.c cuboot-85xx-cpm2.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -101,24 +108,61 @@ quiet_cmd_bootar = BOOTAR  $@
       cmd_bootar = $(CROSS32AR) -cr $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@
 
 $(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c FORCE
+        $(Q)mkdir -p $(dir $@)
         $(call if_changed_dep,bootcc)
 $(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S FORCE
+        $(Q)mkdir -p $(dir $@)
         $(call if_changed_dep,bootas)
 
 $(obj)/wrapper.a: $(obj-wlib) FORCE
         $(call if_changed,bootar)
 
-hostprogs-y     := addnote addRamDisk hack-coff mktree
+hostprogs-y     := addnote addRamDisk hack-coff mktree dtc
 
 targets         += $(patsubst $(obj)/%,%,$(obj-boot) wrapper.a)
 extra-y         := $(obj)/wrapper.a $(obj-plat) $(obj)/empty.o \
                    $(obj)/zImage.lds $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds
 
 wrapper         :=$(srctree)/$(src)/wrapper
-wrapperbits     := $(extra-y) $(addprefix $(obj)/,addnote hack-coff mktree) \
+wrapperbits     := $(extra-y) $(addprefix $(obj)/,addnote hack-coff mktree dtc) \
                         $(wrapper) FORCE
 
 #############
+# Bits for building dtc
+# DTC_GENPARSER      := 1    # Uncomment to rebuild flex/bison output
+
+dtc-objs := dtc.o flattree.o fstree.o data.o livetree.o treesource.o srcpos.o checks.o
+dtc-objs += dtc-lexer.lex.o dtc-parser.tab.o
+dtc-objs := $(addprefix dtc-src/, $(dtc-objs))
+
+# prerequisites on generated files needs to be explicit
+$(obj)/dtc-src/dtc-parser.tab.o: $(obj)/dtc-src/dtc-parser.tab.c $(obj)/dtc-src/dtc-parser.tab.h
+$(obj)/dtc-src/dtc-lexer.lex.o:  $(obj)/dtc-src/dtc-lexer.lex.c $(obj)/dtc-src/dtc-parser.tab.h
+
+HOSTCFLAGS += -I$(src)/dtc-src/ -I$(src)/libfdt/
+
+targets += dtc-src/dtc-parser.tab.c
+targets += dtc-src/dtc-lexer.lex.c
+
+ifdef DTC_GENPARSER
+BISON = bison
+FLEX = flex
+
+quiet_cmd_bison = BISON   $@
+      cmd_bison = $(BISON) -o$@ -d $<; cp $@ $@_shipped
+quiet_cmd_flex = FLEX    $@
+      cmd_flex = $(FLEX) -o$@ $<; cp $@ $@_shipped
+
+$(obj)/dtc-src/dtc-parser.tab.c: $(src)/dtc-src/dtc-parser.y FORCE
+     $(call if_changed,bison)
+
+$(obj)/dtc-src/dtc-parser.tab.h: $(obj)/dtc-src/dtc-parser.tab.c
+
+$(obj)/dtc-src/dtc-lexer.lex.c: $(src)/dtc-src/dtc-lexer.l FORCE
+     $(call if_changed,flex)
+endif
+
+#############
 # Bits for building various flavours of zImage
 
 ifneq ($(CROSS32_COMPILE),)
@@ -150,15 +194,29 @@ image-$(CONFIG_DEFAULT_UIMAGE)		+= uImage
 ifneq ($(CONFIG_DEVICE_TREE),"")
 image-$(CONFIG_PPC_8xx)                 += cuImage.8xx
 image-$(CONFIG_PPC_EP88XC)              += zImage.ep88xc
+image-$(CONFIG_EP405)                   += zImage.ep405
 image-$(CONFIG_8260)                    += cuImage.pq2
+image-$(CONFIG_EP8248E)                 += zImage.ep8248e
 image-$(CONFIG_PPC_MPC52xx)             += cuImage.52xx
+image-$(CONFIG_STORCENTER)              += cuImage.824x
 image-$(CONFIG_PPC_83xx)                += cuImage.83xx
 image-$(CONFIG_PPC_85xx)                += cuImage.85xx
+ifeq ($(CONFIG_CPM2),y)
+image-$(CONFIG_PPC_85xx)                += cuImage.85xx-cpm2
+endif
 image-$(CONFIG_MPC7448HPC2)             += cuImage.hpc2
 image-$(CONFIG_EBONY)                   += treeImage.ebony cuImage.ebony
 image-$(CONFIG_BAMBOO)                  += treeImage.bamboo cuImage.bamboo
 image-$(CONFIG_SEQUOIA)                 += cuImage.sequoia
+image-$(CONFIG_RAINIER)                 += cuImage.rainier
 image-$(CONFIG_WALNUT)                  += treeImage.walnut
+image-$(CONFIG_TAISHAN)                 += cuImage.taishan
+image-$(CONFIG_KATMAI)                  += cuImage.katmai
+image-$(CONFIG_WARP)                    += cuImage.warp
+endif
+
+ifneq ($(CONFIG_REDBOOT),"")
+image-$(CONFIG_PPC_8xx)                 += zImage.redboot-8xx
 endif
 
 # For 32-bit powermacs, build the COFF and miboot images
@@ -243,3 +301,51 @@ clean-kernel := vmlinux.strip vmlinux.bin
 clean-kernel += $(addsuffix .gz,$(clean-kernel))
 # If not absolute clean-files are relative to $(obj).
 clean-files += $(addprefix $(objtree)/, $(clean-kernel))
+
+WRAPPER_OBJDIR := /usr/lib/kernel-wrapper
+WRAPPER_DTSDIR := /usr/lib/kernel-wrapper/dts
+WRAPPER_BINDIR := /usr/sbin
+INSTALL := install
+
+extra-installed         := $(patsubst $(obj)/%, $(DESTDIR)$(WRAPPER_OBJDIR)/%, $(extra-y))
+hostprogs-installed     := $(patsubst %, $(DESTDIR)$(WRAPPER_BINDIR)/%, $(hostprogs-y))
+wrapper-installed       := $(DESTDIR)$(WRAPPER_BINDIR)/wrapper
+dts-installed           := $(patsubst $(obj)/dts/%, $(DESTDIR)$(WRAPPER_DTSDIR)/%, $(wildcard $(obj)/dts/*.dts))
+
+all-installed           := $(extra-installed) $(hostprogs-installed) $(wrapper-installed) $(dts-installed)
+
+quiet_cmd_mkdir           = MKDIR   $(patsubst $(INSTALL_HDR_PATH)/%,%,$@)
+      cmd_mkdir           = mkdir -p $@
+
+quiet_cmd_install         = INSTALL $(patsubst $(DESTDIR)$(WRAPPER_OBJDIR)/%,%,$@)
+      cmd_install         = $(INSTALL)  -m0644 $(patsubst $(DESTDIR)$(WRAPPER_OBJDIR)/%,$(obj)/%,$@) $@
+
+quiet_cmd_install_dts     = INSTALL $(patsubst $(DESTDIR)$(WRAPPER_DTSDIR)/%,dts/%,$@)
+      cmd_install_dts     = $(INSTALL)  -m0644 $(patsubst $(DESTDIR)$(WRAPPER_DTSDIR)/%,$(srctree)/$(obj)/dts/%,$@) $@
+
+quiet_cmd_install_exe     = INSTALL $(patsubst $(DESTDIR)$(WRAPPER_BINDIR)/%,%,$@)
+      cmd_install_exe     = $(INSTALL)  -m0755 $(patsubst $(DESTDIR)$(WRAPPER_BINDIR)/%,$(obj)/%,$@) $@
+
+quiet_cmd_install_wrapper = INSTALL $(patsubst $(DESTDIR)$(WRAPPER_BINDIR)/%,%,$@)
+      cmd_install_wrapper = $(INSTALL)  -m0755 $(patsubst $(DESTDIR)$(WRAPPER_BINDIR)/%,$(srctree)/$(obj)/%,$@) $@ ;\
+                                sed -i $@ -e 's%^object=.*%object=$(WRAPPER_OBJDIR)%' \
+                                          -e 's%^objbin=.*%objbin=$(WRAPPER_BINDIR)%' \
+
+
+$(DESTDIR)$(WRAPPER_OBJDIR) $(DESTDIR)$(WRAPPER_DTSDIR) $(DESTDIR)$(WRAPPER_BINDIR):
+        $(call cmd,mkdir)
+
+$(extra-installed)      : $(DESTDIR)$(WRAPPER_OBJDIR)/% : $(obj)/% | $(DESTDIR)$(WRAPPER_OBJDIR)
+        $(call cmd,install)
+
+$(hostprogs-installed)  : $(DESTDIR)$(WRAPPER_BINDIR)/% : $(obj)/% | $(DESTDIR)$(WRAPPER_BINDIR)
+        $(call cmd,install_exe)
+
+$(dts-installed)        : $(DESTDIR)$(WRAPPER_DTSDIR)/% : $(srctree)/$(obj)/dts/% | $(DESTDIR)$(WRAPPER_DTSDIR)
+        $(call cmd,install_dts)
+
+$(wrapper-installed): $(DESTDIR)$(WRAPPER_BINDIR) $(srctree)/$(obj)/wrapper | $(DESTDIR)$(WRAPPER_BINDIR)
+        $(call cmd,install_wrapper)
+
+$(obj)/bootwrapper_install: $(all-installed)
+
diff --git a/arch/powerpc/boot/bamboo.c b/arch/powerpc/boot/bamboo.c
index f61fcdab1c7c..54b33f1500e2 100644
--- a/arch/powerpc/boot/bamboo.c
+++ b/arch/powerpc/boot/bamboo.c
@@ -30,8 +30,8 @@ static void bamboo_fixups(void)
 {
         unsigned long sysclk = 33333333;
 
-        ibm440ep_fixup_clocks(sysclk, 11059200);
-        ibm4xx_fixup_memsize();
+        ibm440ep_fixup_clocks(sysclk, 11059200, 25000000);
+        ibm4xx_sdram_fixup_memsize();
         ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
         dt_fixup_mac_addresses(bamboo_mac0, bamboo_mac1);
 }
@@ -42,6 +42,6 @@ void bamboo_init(void *mac0, void *mac1)
         platform_ops.exit = ibm44x_dbcr_reset;
         bamboo_mac0 = mac0;
         bamboo_mac1 = mac1;
-        ft_init(_dtb_start, 0, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
 }
diff --git a/arch/powerpc/boot/cuboot-52xx.c b/arch/powerpc/boot/cuboot-52xx.c
index 9256a26d40e4..a8611546a656 100644
--- a/arch/powerpc/boot/cuboot-52xx.c
+++ b/arch/powerpc/boot/cuboot-52xx.c
@@ -53,7 +53,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
         CUBOOT_INIT();
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
         platform_ops.fixups = platform_fixups;
 }
diff --git a/arch/powerpc/boot/cuboot-824x.c b/arch/powerpc/boot/cuboot-824x.c
new file mode 100644
index 000000000000..ced90c53de48
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-824x.c
@@ -0,0 +1,53 @@
+/*
+ * Old U-boot compatibility for 824x
+ *
+ * Copyright (c) 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 "ops.h"
+#include "stdio.h"
+#include "cuboot.h"
+
+#define TARGET_824x
+#include "ppcboot.h"
+
+static bd_t bd;
+
+
+static void platform_fixups(void)
+{
+        void *soc;
+
+        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 / 4, bd.bi_busfreq);
+
+        soc = find_node_by_devtype(NULL, "soc");
+        if (soc) {
+                void *serial = NULL;
+
+                setprop(soc, "bus-frequency", &bd.bi_busfreq,
+                        sizeof(bd.bi_busfreq));
+
+                while ((serial = find_node_by_devtype(serial, "serial"))) {
+                        if (get_parent(serial) != soc)
+                                continue;
+
+                        setprop(serial, "clock-frequency", &bd.bi_busfreq,
+                                sizeof(bd.bi_busfreq));
+                }
+        }
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+        fdt_init(_dtb_start);
+        serial_console_init();
+        platform_ops.fixups = platform_fixups;
+}
diff --git a/arch/powerpc/boot/cuboot-83xx.c b/arch/powerpc/boot/cuboot-83xx.c
index a0505509abcc..61af1c1e8255 100644
--- a/arch/powerpc/boot/cuboot-83xx.c
+++ b/arch/powerpc/boot/cuboot-83xx.c
@@ -24,7 +24,8 @@ static void platform_fixups(void)
         void *soc;
 
         dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
-        dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr);
+        dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
+        dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
         dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 4, bd.bi_busfreq);
 
         /* Unfortunately, the specific model number is encoded in the
@@ -52,7 +53,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
         CUBOOT_INIT();
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
         platform_ops.fixups = platform_fixups;
 }
diff --git a/arch/powerpc/boot/cuboot-85xx-cpm2.c b/arch/powerpc/boot/cuboot-85xx-cpm2.c
new file mode 100644
index 000000000000..723872ddd447
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-85xx-cpm2.c
@@ -0,0 +1,66 @@
+/*
+ * Old U-boot compatibility for 85xx
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 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 "ops.h"
+#include "stdio.h"
+#include "cuboot.h"
+
+#define TARGET_85xx
+#define TARGET_CPM2
+#include "ppcboot.h"
+
+static bd_t bd;
+
+static void platform_fixups(void)
+{
+        void *devp;
+
+        dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
+        dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
+        dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
+        dt_fixup_mac_address_by_alias("ethernet2", bd.bi_enet2addr);
+        dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 8, bd.bi_busfreq);
+
+        /* Unfortunately, the specific model number is encoded in the
+         * soc node name in existing dts files -- once that is fixed,
+         * this can do a simple path lookup.
+         */
+        devp = find_node_by_devtype(NULL, "soc");
+        if (devp) {
+                void *serial = NULL;
+
+                setprop(devp, "bus-frequency", &bd.bi_busfreq,
+                        sizeof(bd.bi_busfreq));
+
+                while ((serial = find_node_by_devtype(serial, "serial"))) {
+                        if (get_parent(serial) != devp)
+                                continue;
+
+                        setprop(serial, "clock-frequency", &bd.bi_busfreq,
+                                sizeof(bd.bi_busfreq));
+                }
+        }
+
+        devp = find_node_by_compatible(NULL, "fsl,cpm2-brg");
+        if (devp)
+                setprop(devp, "clock-frequency", &bd.bi_brgfreq,
+                        sizeof(bd.bi_brgfreq));
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+        fdt_init(_dtb_start);
+        serial_console_init();
+        platform_ops.fixups = platform_fixups;
+}
diff --git a/arch/powerpc/boot/cuboot-85xx.c b/arch/powerpc/boot/cuboot-85xx.c
index 345dcbecef0f..6776a1a29f13 100644
--- a/arch/powerpc/boot/cuboot-85xx.c
+++ b/arch/powerpc/boot/cuboot-85xx.c
@@ -24,8 +24,9 @@ static void platform_fixups(void)
         void *soc;
 
         dt_fixup_memory(bd.bi_memstart, bd.bi_memsize);
-        dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr,
-                               bd.bi_enet2addr);
+        dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
+        dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
+        dt_fixup_mac_address_by_alias("ethernet2", bd.bi_enet2addr);
         dt_fixup_cpu_clocks(bd.bi_intfreq, bd.bi_busfreq / 8, bd.bi_busfreq);
 
         /* Unfortunately, the specific model number is encoded in the
@@ -53,7 +54,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
         CUBOOT_INIT();
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
         platform_ops.fixups = platform_fixups;
 }
diff --git a/arch/powerpc/boot/cuboot-8xx.c b/arch/powerpc/boot/cuboot-8xx.c
index 0e82015a5f95..c202c8868bd6 100644
--- a/arch/powerpc/boot/cuboot-8xx.c
+++ b/arch/powerpc/boot/cuboot-8xx.c
@@ -41,7 +41,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
         CUBOOT_INIT();
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
         platform_ops.fixups = platform_fixups;
 }
diff --git a/arch/powerpc/boot/cuboot-hpc2.c b/arch/powerpc/boot/cuboot-hpc2.c
index d333898bca30..1b8953259d75 100644
--- a/arch/powerpc/boot/cuboot-hpc2.c
+++ b/arch/powerpc/boot/cuboot-hpc2.c
@@ -42,7 +42,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                 unsigned long r6, unsigned long r7)
 {
         CUBOOT_INIT();
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
         platform_ops.fixups = platform_fixups;
 }
diff --git a/arch/powerpc/boot/cuboot-katmai.c b/arch/powerpc/boot/cuboot-katmai.c
new file mode 100644
index 000000000000..c021167f9381
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-katmai.c
@@ -0,0 +1,56 @@
+/*
+ * Old U-boot compatibility for Katmai
+ *
+ * Author: Hugh Blemings <hugh@au.ibm.com>
+ *
+ * Copyright 2007 Hugh Blemings, IBM Corporation.
+ *   Based on cuboot-ebony.c which is:
+ * Copyright 2007 David Gibson, IBM Corporation.
+ *   Based on cuboot-83xx.c, which is:
+ * Copyright (c) 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 "ops.h"
+#include "stdio.h"
+#include "reg.h"
+#include "dcr.h"
+#include "4xx.h"
+#include "44x.h"
+#include "cuboot.h"
+
+#define TARGET_44x
+#include "ppcboot.h"
+
+static bd_t bd;
+
+BSS_STACK(4096);
+
+static void katmai_fixups(void)
+{
+        unsigned long sysclk = 33333000;
+
+        /* 440SP Clock logic is all but identical to 440GX
+         * so we just use that code for now at least
+         */
+        ibm440spe_fixup_clocks(sysclk, 6 * 1843200, 0);
+
+        ibm440spe_fixup_memsize();
+
+        dt_fixup_mac_address(0, bd.bi_enetaddr);
+
+        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+
+        platform_ops.fixups = katmai_fixups;
+        fdt_init(_dtb_start);
+        serial_console_init();
+}
diff --git a/arch/powerpc/boot/cuboot-pq2.c b/arch/powerpc/boot/cuboot-pq2.c
index 61574f3272dd..f56ac6cae9f3 100644
--- a/arch/powerpc/boot/cuboot-pq2.c
+++ b/arch/powerpc/boot/cuboot-pq2.c
@@ -255,7 +255,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
                    unsigned long r6, unsigned long r7)
 {
         CUBOOT_INIT();
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
         platform_ops.fixups = pq2_platform_fixups;
 }
diff --git a/arch/powerpc/boot/cuboot-rainier.c b/arch/powerpc/boot/cuboot-rainier.c
new file mode 100644
index 000000000000..cf452b66dce8
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-rainier.c
@@ -0,0 +1,56 @@
+/*
+ * Old U-boot compatibility for Rainier
+ *
+ * Valentine Barshak <vbarshak@ru.mvista.com>
+ * Copyright 2007 MontaVista Software, Inc
+ *
+ * Based on Ebony code by David Gibson <david@gibson.dropbear.id.au>
+ * Copyright IBM Corporation, 2007
+ *
+ * Based on Bamboo code by Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ * Copyright IBM Corporation, 2007
+ *
+ * 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 <stdarg.h>
+#include <stddef.h>
+#include "types.h"
+#include "elf.h"
+#include "string.h"
+#include "stdio.h"
+#include "page.h"
+#include "ops.h"
+#include "dcr.h"
+#include "4xx.h"
+#include "44x.h"
+#include "cuboot.h"
+
+#define TARGET_4xx
+#define TARGET_44x
+#include "ppcboot.h"
+
+static bd_t bd;
+
+
+static void rainier_fixups(void)
+{
+        unsigned long sysclk = 33333333;
+
+        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
+        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
+        ibm4xx_denali_fixup_memsize();
+        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 = rainier_fixups;
+        platform_ops.exit = ibm44x_dbcr_reset;
+        fdt_init(_dtb_start);
+        serial_console_init();
+}
diff --git a/arch/powerpc/boot/cuboot-sequoia.c b/arch/powerpc/boot/cuboot-sequoia.c
index ec635e0bd4ec..f555575a44de 100644
--- a/arch/powerpc/boot/cuboot-sequoia.c
+++ b/arch/powerpc/boot/cuboot-sequoia.c
@@ -39,7 +39,7 @@ static void sequoia_fixups(void)
 {
         unsigned long sysclk = 33333333;
 
-        ibm440ep_fixup_clocks(sysclk, 11059200);
+        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
         ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
         ibm4xx_denali_fixup_memsize();
         dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
@@ -51,6 +51,6 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
         CUBOOT_INIT();
         platform_ops.fixups = sequoia_fixups;
         platform_ops.exit = ibm44x_dbcr_reset;
-        ft_init(_dtb_start, 0, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
 }
diff --git a/arch/powerpc/boot/cuboot-taishan.c b/arch/powerpc/boot/cuboot-taishan.c
new file mode 100644
index 000000000000..f66455a45ab1
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-taishan.c
@@ -0,0 +1,54 @@
+/*
+ * Old U-boot compatibility for Taishan
+ *
+ * Author: Hugh Blemings <hugh@au.ibm.com>
+ *
+ * Copyright 2007 Hugh Blemings, IBM Corporation.
+ *   Based on cuboot-ebony.c which is:
+ * Copyright 2007 David Gibson, IBM Corporation.
+ *   Based on cuboot-83xx.c, which is:
+ * Copyright (c) 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 "ops.h"
+#include "stdio.h"
+#include "cuboot.h"
+#include "reg.h"
+#include "dcr.h"
+#include "4xx.h"
+
+#define TARGET_44x
+#include "ppcboot.h"
+
+static bd_t bd;
+
+BSS_STACK(4096);
+
+static void taishan_fixups(void)
+{
+        /* FIXME: sysclk should be derived by reading the FPGA
+           registers */
+        unsigned long sysclk = 33000000;
+
+        ibm440gx_fixup_clocks(sysclk, 6 * 1843200, 25000000);
+
+        ibm4xx_sdram_fixup_memsize();
+
+        dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr);
+
+        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+
+        platform_ops.fixups = taishan_fixups;
+        fdt_init(_dtb_start);
+        serial_console_init();
+}
diff --git a/arch/powerpc/boot/cuboot-warp.c b/arch/powerpc/boot/cuboot-warp.c
new file mode 100644
index 000000000000..bdedebe1bc14
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-warp.c
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2008 PIKA Technologies
+ *   Sean MacLennan <smaclennan@pikatech.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 "4xx.h"
+#include "cuboot.h"
+
+#define TARGET_44x
+#include "ppcboot.h"
+
+static bd_t bd;
+
+static void warp_fixups(void)
+{
+        unsigned long sysclk = 66000000;
+
+        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
+        ibm4xx_sdram_fixup_memsize();
+        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
+        dt_fixup_mac_addresses(&bd.bi_enetaddr);
+}
+
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+
+        platform_ops.fixups = warp_fixups;
+        platform_ops.exit = ibm44x_dbcr_reset;
+        fdt_init(_dtb_start);
+        serial_console_init();
+}
diff --git a/arch/powerpc/boot/dcr.h b/arch/powerpc/boot/dcr.h
index 83b88aa92888..95b9f5344016 100644
--- a/arch/powerpc/boot/dcr.h
+++ b/arch/powerpc/boot/dcr.h
@@ -14,12 +14,20 @@
 #define DCRN_SDRAM0_CFGADDR                             0x010
 #define DCRN_SDRAM0_CFGDATA                             0x011
 
+#define SDRAM0_READ(offset) ({\
+        mtdcr(DCRN_SDRAM0_CFGADDR, offset); \
+        mfdcr(DCRN_SDRAM0_CFGDATA); })
+#define SDRAM0_WRITE(offset, data) ({\
+        mtdcr(DCRN_SDRAM0_CFGADDR, offset); \
+        mtdcr(DCRN_SDRAM0_CFGDATA, data); })
+
 #define         SDRAM0_B0CR                             0x40
 #define         SDRAM0_B1CR                             0x44
 #define         SDRAM0_B2CR                             0x48
 #define         SDRAM0_B3CR                             0x4c
 
-static const unsigned long sdram_bxcr[] = { SDRAM0_B0CR, SDRAM0_B1CR, SDRAM0_B2CR, SDRAM0_B3CR };
+static const unsigned long sdram_bxcr[] = { SDRAM0_B0CR, SDRAM0_B1CR,
+                                            SDRAM0_B2CR, SDRAM0_B3CR };
 
 #define                 SDRAM_CONFIG_BANK_ENABLE        0x00000001
 #define                 SDRAM_CONFIG_SIZE_MASK          0x000e0000
@@ -138,5 +146,54 @@ static const unsigned long sdram_bxcr[] = { SDRAM0_B0CR, SDRAM0_B1CR, SDRAM0_B2C
 #define DCRN_CPC0_PLLMR 0xb0
 #define DCRN_405_CPC0_CR0 0xb1
 #define DCRN_405_CPC0_CR1 0xb2
+#define DCRN_405_CPC0_PSR 0xb4
+
+/* 405EP Clocking/Power Management/Chip Control regs */
+#define DCRN_CPC0_PLLMR0  0xf0
+#define DCRN_CPC0_PLLMR1  0xf4
+#define DCRN_CPC0_UCR     0xf5
+
+/* 440GX Clock control etc */
+
+
+#define DCRN_CPR0_CLKUPD                                0x020
+#define DCRN_CPR0_PLLC                                  0x040
+#define DCRN_CPR0_PLLD                                  0x060
+#define DCRN_CPR0_PRIMAD                                0x080
+#define DCRN_CPR0_PRIMBD                                0x0a0
+#define DCRN_CPR0_OPBD                                  0x0c0
+#define DCRN_CPR0_PERD                                  0x0e0
+#define DCRN_CPR0_MALD                                  0x100
+
+#define DCRN_SDR0_CONFIG_ADDR   0xe
+#define DCRN_SDR0_CONFIG_DATA   0xf
+
+/* SDR read/write helper macros */
+#define SDR0_READ(offset) ({\
+        mtdcr(DCRN_SDR0_CONFIG_ADDR, offset); \
+        mfdcr(DCRN_SDR0_CONFIG_DATA); })
+#define SDR0_WRITE(offset, data) ({\
+        mtdcr(DCRN_SDR0_CONFIG_ADDR, offset); \
+        mtdcr(DCRN_SDR0_CONFIG_DATA, data); })
+
+#define DCRN_SDR0_UART0         0x0120
+#define DCRN_SDR0_UART1         0x0121
+#define DCRN_SDR0_UART2         0x0122
+#define DCRN_SDR0_UART3         0x0123
+
+
+/* CPRs read/write helper macros - based off include/asm-ppc/ibm44x.h */
+
+#define DCRN_CPR0_CFGADDR                               0xc
+#define DCRN_CPR0_CFGDATA                               0xd
+
+#define CPR0_READ(offset) ({\
+        mtdcr(DCRN_CPR0_CFGADDR, offset); \
+        mfdcr(DCRN_CPR0_CFGDATA); })
+#define CPR0_WRITE(offset, data) ({\
+        mtdcr(DCRN_CPR0_CFGADDR, offset); \
+        mtdcr(DCRN_CPR0_CFGDATA, data); })
+
+
 
 #endif  /* _PPC_BOOT_DCR_H_ */
diff --git a/arch/powerpc/boot/devtree.c b/arch/powerpc/boot/devtree.c
index e5dfe4497313..60f561e307a9 100644
--- a/arch/powerpc/boot/devtree.c
+++ b/arch/powerpc/boot/devtree.c
@@ -88,6 +88,20 @@ void dt_fixup_clock(const char *path, u32 freq)
         }
 }
 
+void dt_fixup_mac_address_by_alias(const char *alias, const u8 *addr)
+{
+        void *devp = find_node_by_alias(alias);
+
+        if (devp) {
+                printf("%s: local-mac-address <-"
+                       " %02x:%02x:%02x:%02x:%02x:%02x\n\r", alias,
+                       addr[0], addr[1], addr[2],
+                       addr[3], addr[4], addr[5]);
+
+                setprop(devp, "local-mac-address", addr, 6);
+        }
+}
+
 void dt_fixup_mac_address(u32 index, const u8 *addr)
 {
         void *devp = find_node_by_prop_value(NULL, "linux,network-index",
diff --git a/arch/powerpc/boot/dtc-src/.gitignore b/arch/powerpc/boot/dtc-src/.gitignore
new file mode 100644
index 000000000000..a7c3f94e5e75
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/.gitignore
@@ -0,0 +1,3 @@
+dtc-lexer.lex.c
+dtc-parser.tab.c
+dtc-parser.tab.h
diff --git a/arch/powerpc/boot/dtc-src/Makefile.dtc b/arch/powerpc/boot/dtc-src/Makefile.dtc
new file mode 100644
index 000000000000..d607fdb8df8d
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/Makefile.dtc
@@ -0,0 +1,25 @@
+# Makefile.dtc
+#
+# This is not a complete Makefile of itself.  Instead, it is designed to
+# be easily embeddable into other systems of Makefiles.
+#
+DTC_SRCS = dtc.c flattree.c fstree.c data.c livetree.c treesource.c srcpos.c \
+        checks.c
+DTC_EXTRA = dtc.h srcpos.h
+DTC_LEXFILES = dtc-lexer.l
+DTC_BISONFILES = dtc-parser.y
+
+DTC_LEX_SRCS = $(DTC_LEXFILES:%.l=%.lex.c)
+DTC_BISON_SRCS = $(DTC_BISONFILES:%.y=%.tab.c)
+DTC_BISON_INCLUDES = $(DTC_BISONFILES:%.y=%.tab.h)
+
+DTC_GEN_SRCS = $(DTC_LEX_SRCS) $(DTC_BISON_SRCS)
+DTC_GEN_ALL = $(DTC_GEN_SRCS) $(DTC_BISON_INCLUDES)
+DTC_OBJS = $(DTC_SRCS:%.c=%.o) $(DTC_GEN_SRCS:%.c=%.o)
+
+DTC_CLEANFILES = $(DTC_GEN_ALL)
+
+# We assume the containing Makefile system can do auto-dependencies for most
+# things, but we supply the dependencies on generated header files explicitly
+
+$(addprefix $(DTC_objdir)/,$(DTC_GEN_SRCS:%.c=%.o)): $(addprefix $(DTC_objdir)/,$(DTC_BISON_INCLUDES))
diff --git a/arch/powerpc/boot/dtc-src/checks.c b/arch/powerpc/boot/dtc-src/checks.c
new file mode 100644
index 000000000000..2ce961cd414d
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/checks.c
@@ -0,0 +1,750 @@
+/*
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2007.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+#include "dtc.h"
+
+#ifdef TRACE_CHECKS
+#define TRACE(c, ...) \
+        do { \
+                fprintf(stderr, "=== %s: ", (c)->name); \
+                fprintf(stderr, __VA_ARGS__); \
+                fprintf(stderr, "\n"); \
+        } while (0)
+#else
+#define TRACE(c, fmt, ...)      do { } while (0)
+#endif
+
+enum checklevel {
+        IGNORE = 0,
+        WARN = 1,
+        ERROR = 2,
+};
+
+enum checkstatus {
+        UNCHECKED = 0,
+        PREREQ,
+        PASSED,
+        FAILED,
+};
+
+struct check;
+
+typedef void (*tree_check_fn)(struct check *c, struct node *dt);
+typedef void (*node_check_fn)(struct check *c, struct node *dt, struct node *node);
+typedef void (*prop_check_fn)(struct check *c, struct node *dt,
+                              struct node *node, struct property *prop);
+
+struct check {
+        const char *name;
+        tree_check_fn tree_fn;
+        node_check_fn node_fn;
+        prop_check_fn prop_fn;
+        void *data;
+        enum checklevel level;
+        enum checkstatus status;
+        int inprogress;
+        int num_prereqs;
+        struct check **prereq;
+};
+
+#define CHECK(nm, tfn, nfn, pfn, d, lvl, ...) \
+        static struct check *nm##_prereqs[] = { __VA_ARGS__ }; \
+        static struct check nm = { \
+                .name = #nm, \
+                .tree_fn = (tfn), \
+                .node_fn = (nfn), \
+                .prop_fn = (pfn), \
+                .data = (d), \
+                .level = (lvl), \
+                .status = UNCHECKED, \
+                .num_prereqs = ARRAY_SIZE(nm##_prereqs), \
+                .prereq = nm##_prereqs, \
+        };
+
+#define TREE_CHECK(nm, d, lvl, ...) \
+        CHECK(nm, check_##nm, NULL, NULL, d, lvl, __VA_ARGS__)
+#define NODE_CHECK(nm, d, lvl, ...) \
+        CHECK(nm, NULL, check_##nm, NULL, d, lvl, __VA_ARGS__)
+#define PROP_CHECK(nm, d, lvl, ...) \
+        CHECK(nm, NULL, NULL, check_##nm, d, lvl, __VA_ARGS__)
+#define BATCH_CHECK(nm, lvl, ...) \
+        CHECK(nm, NULL, NULL, NULL, NULL, lvl, __VA_ARGS__)
+
+#ifdef __GNUC__
+static inline void check_msg(struct check *c, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
+#endif
+static inline void check_msg(struct check *c, const char *fmt, ...)
+{
+        va_list ap;
+        va_start(ap, fmt);
+
+        if ((c->level < WARN) || (c->level <= quiet))
+                return; /* Suppress message */
+
+        fprintf(stderr, "%s (%s): ",
+                (c->level == ERROR) ? "ERROR" : "Warning", c->name);
+        vfprintf(stderr, fmt, ap);
+        fprintf(stderr, "\n");
+}
+
+#define FAIL(c, ...) \
+        do { \
+                TRACE((c), "\t\tFAILED at %s:%d", __FILE__, __LINE__); \
+                (c)->status = FAILED; \
+                check_msg((c), __VA_ARGS__); \
+        } while (0)
+
+static void check_nodes_props(struct check *c, struct node *dt, struct node *node)
+{
+        struct node *child;
+        struct property *prop;
+
+        TRACE(c, "%s", node->fullpath);
+        if (c->node_fn)
+                c->node_fn(c, dt, node);
+
+        if (c->prop_fn)
+                for_each_property(node, prop) {
+                        TRACE(c, "%s\t'%s'", node->fullpath, prop->name);
+                        c->prop_fn(c, dt, node, prop);
+                }
+
+        for_each_child(node, child)
+                check_nodes_props(c, dt, child);
+}
+
+static int run_check(struct check *c, struct node *dt)
+{
+        int error = 0;
+        int i;
+
+        assert(!c->inprogress);
+
+        if (c->status != UNCHECKED)
+                goto out;
+
+        c->inprogress = 1;
+
+        for (i = 0; i < c->num_prereqs; i++) {
+                struct check *prq = c->prereq[i];
+                error |= run_check(prq, dt);
+                if (prq->status != PASSED) {
+                        c->status = PREREQ;
+                        check_msg(c, "Failed prerequisite '%s'",
+                                  c->prereq[i]->name);
+                }
+        }
+
+        if (c->status != UNCHECKED)
+                goto out;
+
+        if (c->node_fn || c->prop_fn)
+                check_nodes_props(c, dt, dt);
+
+        if (c->tree_fn)
+                c->tree_fn(c, dt);
+        if (c->status == UNCHECKED)
+                c->status = PASSED;
+
+        TRACE(c, "\tCompleted, status %d", c->status);
+
+out:
+        c->inprogress = 0;
+        if ((c->status != PASSED) && (c->level == ERROR))
+                error = 1;
+        return error;
+}
+
+/*
+ * Utility check functions
+ */
+
+static void check_is_string(struct check *c, struct node *root,
+                            struct node *node)
+{
+        struct property *prop;
+        char *propname = c->data;
+
+        prop = get_property(node, propname);
+        if (!prop)
+                return; /* Not present, assumed ok */
+
+        if (!data_is_one_string(prop->val))
+                FAIL(c, "\"%s\" property in %s is not a string",
+                     propname, node->fullpath);
+}
+#define CHECK_IS_STRING(nm, propname, lvl) \
+        CHECK(nm, NULL, check_is_string, NULL, (propname), (lvl))
+
+static void check_is_cell(struct check *c, struct node *root,
+                          struct node *node)
+{
+        struct property *prop;
+        char *propname = c->data;
+
+        prop = get_property(node, propname);
+        if (!prop)
+                return; /* Not present, assumed ok */
+
+        if (prop->val.len != sizeof(cell_t))
+                FAIL(c, "\"%s\" property in %s is not a single cell",
+                     propname, node->fullpath);
+}
+#define CHECK_IS_CELL(nm, propname, lvl) \
+        CHECK(nm, NULL, check_is_cell, NULL, (propname), (lvl))
+
+/*
+ * Structural check functions
+ */
+
+static void check_duplicate_node_names(struct check *c, struct node *dt,
+                                       struct node *node)
+{
+        struct node *child, *child2;
+
+        for_each_child(node, child)
+                for (child2 = child->next_sibling;
+                     child2;
+                     child2 = child2->next_sibling)
+                        if (streq(child->name, child2->name))
+                                FAIL(c, "Duplicate node name %s",
+                                     child->fullpath);
+}
+NODE_CHECK(duplicate_node_names, NULL, ERROR);
+
+static void check_duplicate_property_names(struct check *c, struct node *dt,
+                                           struct node *node)
+{
+        struct property *prop, *prop2;
+
+        for_each_property(node, prop)
+                for (prop2 = prop->next; prop2; prop2 = prop2->next)
+                        if (streq(prop->name, prop2->name))
+                                FAIL(c, "Duplicate property name %s in %s",
+                                     prop->name, node->fullpath);
+}
+NODE_CHECK(duplicate_property_names, NULL, ERROR);
+
+static void check_explicit_phandles(struct check *c, struct node *root,
+                                          struct node *node)
+{
+        struct property *prop;
+        struct node *other;
+        cell_t phandle;
+
+        prop = get_property(node, "linux,phandle");
+        if (! prop)
+                return; /* No phandle, that's fine */
+
+        if (prop->val.len != sizeof(cell_t)) {
+                FAIL(c, "%s has bad length (%d) linux,phandle property",
+                     node->fullpath, prop->val.len);
+                return;
+        }
+
+        phandle = propval_cell(prop);
+        if ((phandle == 0) || (phandle == -1)) {
+                FAIL(c, "%s has invalid linux,phandle value 0x%x",
+                     node->fullpath, phandle);
+                return;
+        }
+
+        other = get_node_by_phandle(root, phandle);
+        if (other) {
+                FAIL(c, "%s has duplicated phandle 0x%x (seen before at %s)",
+                     node->fullpath, phandle, other->fullpath);
+                return;
+        }
+
+        node->phandle = phandle;
+}
+NODE_CHECK(explicit_phandles, NULL, ERROR);
+
+static void check_name_properties(struct check *c, struct node *root,
+                                  struct node *node)
+{
+        struct property *prop;
+
+        prop = get_property(node, "name");
+        if (!prop)
+                return; /* No name property, that's fine */
+
+        if ((prop->val.len != node->basenamelen+1)
+            || (memcmp(prop->val.val, node->name, node->basenamelen) != 0))
+                FAIL(c, "\"name\" property in %s is incorrect (\"%s\" instead"
+                     " of base node name)", node->fullpath, prop->val.val);
+}
+CHECK_IS_STRING(name_is_string, "name", ERROR);
+NODE_CHECK(name_properties, NULL, ERROR, &name_is_string);
+
+/*
+ * Reference fixup functions
+ */
+
+static void fixup_phandle_references(struct check *c, struct node *dt,
+                                     struct node *node, struct property *prop)
+{
+      struct marker *m = prop->val.markers;
+      struct node *refnode;
+      cell_t phandle;
+
+      for_each_marker_of_type(m, REF_PHANDLE) {
+              assert(m->offset + sizeof(cell_t) <= prop->val.len);
+
+              refnode = get_node_by_ref(dt, m->ref);
+              if (! refnode) {
+                      FAIL(c, "Reference to non-existent node or label \"%s\"\n",
+                           m->ref);
+                      continue;
+              }
+
+              phandle = get_node_phandle(dt, refnode);
+              *((cell_t *)(prop->val.val + m->offset)) = cpu_to_be32(phandle);
+      }
+}
+CHECK(phandle_references, NULL, NULL, fixup_phandle_references, NULL, ERROR,
+      &duplicate_node_names, &explicit_phandles);
+
+static void fixup_path_references(struct check *c, struct node *dt,
+                                  struct node *node, struct property *prop)
+{
+        struct marker *m = prop->val.markers;
+        struct node *refnode;
+        char *path;
+
+        for_each_marker_of_type(m, REF_PATH) {
+                assert(m->offset <= prop->val.len);
+
+                refnode = get_node_by_ref(dt, m->ref);
+                if (!refnode) {
+                        FAIL(c, "Reference to non-existent node or label \"%s\"\n",
+                             m->ref);
+                        continue;
+                }
+
+                path = refnode->fullpath;
+                prop->val = data_insert_at_marker(prop->val, m, path,
+                                                  strlen(path) + 1);
+        }
+}
+CHECK(path_references, NULL, NULL, fixup_path_references, NULL, ERROR,
+      &duplicate_node_names);
+
+/*
+ * Semantic checks
+ */
+CHECK_IS_CELL(address_cells_is_cell, "#address-cells", WARN);
+CHECK_IS_CELL(size_cells_is_cell, "#size-cells", WARN);
+CHECK_IS_CELL(interrupt_cells_is_cell, "#interrupt-cells", WARN);
+
+CHECK_IS_STRING(device_type_is_string, "device_type", WARN);
+CHECK_IS_STRING(model_is_string, "model", WARN);
+CHECK_IS_STRING(status_is_string, "status", WARN);
+
+static void fixup_addr_size_cells(struct check *c, struct node *dt,
+                                  struct node *node)
+{
+        struct property *prop;
+
+        node->addr_cells = -1;
+        node->size_cells = -1;
+
+        prop = get_property(node, "#address-cells");
+        if (prop)
+                node->addr_cells = propval_cell(prop);
+
+        prop = get_property(node, "#size-cells");
+        if (prop)
+                node->size_cells = propval_cell(prop);
+}
+CHECK(addr_size_cells, NULL, fixup_addr_size_cells, NULL, NULL, WARN,
+      &address_cells_is_cell, &size_cells_is_cell);
+
+#define node_addr_cells(n) \
+        (((n)->addr_cells == -1) ? 2 : (n)->addr_cells)
+#define node_size_cells(n) \
+        (((n)->size_cells == -1) ? 1 : (n)->size_cells)
+
+static void check_reg_format(struct check *c, struct node *dt,
+                             struct node *node)
+{
+        struct property *prop;
+        int addr_cells, size_cells, entrylen;
+
+        prop = get_property(node, "reg");
+        if (!prop)
+                return; /* No "reg", that's fine */
+
+        if (!node->parent) {
+                FAIL(c, "Root node has a \"reg\" property");
+                return;
+        }
+
+        if (prop->val.len == 0)
+                FAIL(c, "\"reg\" property in %s is empty", node->fullpath);
+
+        addr_cells = node_addr_cells(node->parent);
+        size_cells = node_size_cells(node->parent);
+        entrylen = (addr_cells + size_cells) * sizeof(cell_t);
+
+        if ((prop->val.len % entrylen) != 0)
+                FAIL(c, "\"reg\" property in %s has invalid length (%d bytes) "
+                     "(#address-cells == %d, #size-cells == %d)",
+                     node->fullpath, prop->val.len, addr_cells, size_cells);
+}
+NODE_CHECK(reg_format, NULL, WARN, &addr_size_cells);
+
+static void check_ranges_format(struct check *c, struct node *dt,
+                                struct node *node)
+{
+        struct property *prop;
+        int c_addr_cells, p_addr_cells, c_size_cells, p_size_cells, entrylen;
+
+        prop = get_property(node, "ranges");
+        if (!prop)
+                return;
+
+        if (!node->parent) {
+                FAIL(c, "Root node has a \"ranges\" property");
+                return;
+        }
+
+        p_addr_cells = node_addr_cells(node->parent);
+        p_size_cells = node_size_cells(node->parent);
+        c_addr_cells = node_addr_cells(node);
+        c_size_cells = node_size_cells(node);
+        entrylen = (p_addr_cells + c_addr_cells + c_size_cells) * sizeof(cell_t);
+
+        if (prop->val.len == 0) {
+                if (p_addr_cells != c_addr_cells)
+                        FAIL(c, "%s has empty \"ranges\" property but its "
+                             "#address-cells (%d) differs from %s (%d)",
+                             node->fullpath, c_addr_cells, node->parent->fullpath,
+                             p_addr_cells);
+                if (p_size_cells != c_size_cells)
+                        FAIL(c, "%s has empty \"ranges\" property but its "
+                             "#size-cells (%d) differs from %s (%d)",
+                             node->fullpath, c_size_cells, node->parent->fullpath,
+                             p_size_cells);
+        } else if ((prop->val.len % entrylen) != 0) {
+                FAIL(c, "\"ranges\" property in %s has invalid length (%d bytes) "
+                     "(parent #address-cells == %d, child #address-cells == %d, "
+                     "#size-cells == %d)", node->fullpath, prop->val.len,
+                     p_addr_cells, c_addr_cells, c_size_cells);
+        }
+}
+NODE_CHECK(ranges_format, NULL, WARN, &addr_size_cells);
+
+/*
+ * Style checks
+ */
+static void check_avoid_default_addr_size(struct check *c, struct node *dt,
+                                          struct node *node)
+{
+        struct property *reg, *ranges;
+
+        if (!node->parent)
+                return; /* Ignore root node */
+
+        reg = get_property(node, "reg");
+        ranges = get_property(node, "ranges");
+
+        if (!reg && !ranges)
+                return;
+
+        if ((node->parent->addr_cells == -1))
+                FAIL(c, "Relying on default #address-cells value for %s",
+                     node->fullpath);
+
+        if ((node->parent->size_cells == -1))
+                FAIL(c, "Relying on default #size-cells value for %s",
+                     node->fullpath);
+}
+NODE_CHECK(avoid_default_addr_size, NULL, WARN, &addr_size_cells);
+
+static void check_obsolete_chosen_interrupt_controller(struct check *c,
+                                                       struct node *dt)
+{
+        struct node *chosen;
+        struct property *prop;
+
+        chosen = get_node_by_path(dt, "/chosen");
+        if (!chosen)
+                return;
+
+        prop = get_property(chosen, "interrupt-controller");
+        if (prop)
+                FAIL(c, "/chosen has obsolete \"interrupt-controller\" "
+                     "property");
+}
+TREE_CHECK(obsolete_chosen_interrupt_controller, NULL, WARN);
+
+static struct check *check_table[] = {
+        &duplicate_node_names, &duplicate_property_names,
+        &name_is_string, &name_properties,
+        &explicit_phandles,
+        &phandle_references, &path_references,
+
+        &address_cells_is_cell, &size_cells_is_cell, &interrupt_cells_is_cell,
+        &device_type_is_string, &model_is_string, &status_is_string,
+
+        &addr_size_cells, &reg_format, &ranges_format,
+
+        &avoid_default_addr_size,
+        &obsolete_chosen_interrupt_controller,
+};
+
+int check_semantics(struct node *dt, int outversion, int boot_cpuid_phys);
+
+void process_checks(int force, struct boot_info *bi,
+                    int checkflag, int outversion, int boot_cpuid_phys)
+{
+        struct node *dt = bi->dt;
+        int i;
+        int error = 0;
+
+        for (i = 0; i < ARRAY_SIZE(check_table); i++) {
+                struct check *c = check_table[i];
+
+                if (c->level != IGNORE)
+                        error = error || run_check(c, dt);
+        }
+
+        if (error) {
+                if (!force) {
+                        fprintf(stderr, "ERROR: Input tree has errors, aborting "
+                                "(use -f to force output)\n");
+                        exit(2);
+                } else if (quiet < 3) {
+                        fprintf(stderr, "Warning: Input tree has errors, "
+                                "output forced\n");
+                }
+        }
+
+        if (checkflag) {
+                if (error) {
+                        fprintf(stderr, "Warning: Skipping semantic checks due to structural errors\n");
+                } else {
+                        if (!check_semantics(bi->dt, outversion,
+                                             boot_cpuid_phys))
+                                fprintf(stderr, "Warning: Input tree has semantic errors\n");
+                }
+        }
+}
+
+/*
+ * Semantic check functions
+ */
+
+#define ERRMSG(...) if (quiet < 2) fprintf(stderr, "ERROR: " __VA_ARGS__)
+#define WARNMSG(...) if (quiet < 1) fprintf(stderr, "Warning: " __VA_ARGS__)
+
+#define DO_ERR(...) do {ERRMSG(__VA_ARGS__); ok = 0; } while (0)
+
+#define CHECK_HAVE(node, propname) \
+        do { \
+                if (! (prop = get_property((node), (propname)))) \
+                        DO_ERR("Missing \"%s\" property in %s\n", (propname), \
+                                (node)->fullpath); \
+        } while (0);
+
+#define CHECK_HAVE_WARN(node, propname) \
+        do { \
+                if (! (prop  = get_property((node), (propname)))) \
+                        WARNMSG("%s has no \"%s\" property\n", \
+                                (node)->fullpath, (propname)); \
+        } while (0)
+
+#define CHECK_HAVE_STRING(node, propname) \
+        do { \
+                CHECK_HAVE((node), (propname)); \
+                if (prop && !data_is_one_string(prop->val)) \
+                        DO_ERR("\"%s\" property in %s is not a string\n", \
+                                (propname), (node)->fullpath); \
+        } while (0)
+
+#define CHECK_HAVE_STREQ(node, propname, value) \
+        do { \
+                CHECK_HAVE_STRING((node), (propname)); \
+                if (prop && !streq(prop->val.val, (value))) \
+                        DO_ERR("%s has wrong %s, %s (should be %s\n", \
+                                (node)->fullpath, (propname), \
+                                prop->val.val, (value)); \
+        } while (0)
+
+#define CHECK_HAVE_ONECELL(node, propname) \
+        do { \
+                CHECK_HAVE((node), (propname)); \
+                if (prop && (prop->val.len != sizeof(cell_t))) \
+                        DO_ERR("\"%s\" property in %s has wrong size %d (should be 1 cell)\n", (propname), (node)->fullpath, prop->val.len); \
+        } while (0)
+
+#define CHECK_HAVE_WARN_ONECELL(node, propname) \
+        do { \
+                CHECK_HAVE_WARN((node), (propname)); \
+                if (prop && (prop->val.len != sizeof(cell_t))) \
+                        DO_ERR("\"%s\" property in %s has wrong size %d (should be 1 cell)\n", (propname), (node)->fullpath, prop->val.len); \
+        } while (0)
+
+#define CHECK_HAVE_WARN_PHANDLE(xnode, propname, root) \
+        do { \
+                struct node *ref; \
+                CHECK_HAVE_WARN_ONECELL((xnode), (propname)); \
+                if (prop) {\
+                        cell_t phandle = propval_cell(prop); \
+                        if ((phandle == 0) || (phandle == -1)) { \
+                                DO_ERR("\"%s\" property in %s contains an invalid phandle %x\n", (propname), (xnode)->fullpath, phandle); \
+                        } else { \
+                                ref = get_node_by_phandle((root), propval_cell(prop)); \
+                                if (! ref) \
+                                        DO_ERR("\"%s\" property in %s refers to non-existant phandle %x\n", (propname), (xnode)->fullpath, propval_cell(prop)); \
+                        } \
+                } \
+        } while (0)
+
+#define CHECK_HAVE_WARN_STRING(node, propname) \
+        do { \
+                CHECK_HAVE_WARN((node), (propname)); \
+                if (prop && !data_is_one_string(prop->val)) \
+                        DO_ERR("\"%s\" property in %s is not a string\n", \
+                                (propname), (node)->fullpath); \
+        } while (0)
+
+static int check_root(struct node *root)
+{
+        struct property *prop;
+        int ok = 1;
+
+        CHECK_HAVE_STRING(root, "model");
+        CHECK_HAVE_WARN(root, "compatible");
+
+        return ok;
+}
+
+static int check_cpus(struct node *root, int outversion, int boot_cpuid_phys)
+{
+        struct node *cpus, *cpu;
+        struct property *prop;
+        struct node *bootcpu = NULL;
+        int ok = 1;
+
+        cpus = get_subnode(root, "cpus");
+        if (! cpus) {
+                ERRMSG("Missing /cpus node\n");
+                return 0;
+        }
+
+        if (cpus->addr_cells != 1)
+                DO_ERR("%s has bad #address-cells value %d (should be 1)\n",
+                       cpus->fullpath, cpus->addr_cells);
+        if (cpus->size_cells != 0)
+                DO_ERR("%s has bad #size-cells value %d (should be 0)\n",
+                       cpus->fullpath, cpus->size_cells);
+
+        for_each_child(cpus, cpu) {
+                CHECK_HAVE_STREQ(cpu, "device_type", "cpu");
+
+                CHECK_HAVE_ONECELL(cpu, "reg");
+                if (prop) {
+                        cell_t unitnum;
+                        char *eptr;
+
+                        unitnum = strtol(get_unitname(cpu), &eptr, 16);
+                        if (*eptr) {
+                                WARNMSG("%s has bad format unit name %s (should be CPU number\n",
+                                        cpu->fullpath, get_unitname(cpu));
+                        } else if (unitnum != propval_cell(prop)) {
+                                WARNMSG("%s unit name \"%s\" does not match \"reg\" property <%x>\n",
+                                       cpu->fullpath, get_unitname(cpu),
+                                       propval_cell(prop));
+                        }
+                }
+
+/*              CHECK_HAVE_ONECELL(cpu, "d-cache-line-size"); */
+/*              CHECK_HAVE_ONECELL(cpu, "i-cache-line-size"); */
+                CHECK_HAVE_ONECELL(cpu, "d-cache-size");
+                CHECK_HAVE_ONECELL(cpu, "i-cache-size");
+
+                CHECK_HAVE_WARN_ONECELL(cpu, "clock-frequency");
+                CHECK_HAVE_WARN_ONECELL(cpu, "timebase-frequency");
+
+                prop = get_property(cpu, "linux,boot-cpu");
+                if (prop) {
+                        if (prop->val.len)
+                                WARNMSG("\"linux,boot-cpu\" property in %s is non-empty\n",
+                                        cpu->fullpath);
+                        if (bootcpu)
+                                DO_ERR("Multiple boot cpus (%s and %s)\n",
+                                       bootcpu->fullpath, cpu->fullpath);
+                        else
+                                bootcpu = cpu;
+                }
+        }
+
+        if (outversion < 2) {
+                if (! bootcpu)
+                        WARNMSG("No cpu has \"linux,boot-cpu\" property\n");
+        } else {
+                if (bootcpu)
+                        WARNMSG("\"linux,boot-cpu\" property is deprecated in blob version 2 or higher\n");
+                if (boot_cpuid_phys == 0xfeedbeef)
+                        WARNMSG("physical boot CPU not set.  Use -b option to set\n");
+        }
+
+        return ok;
+}
+
+static int check_memory(struct node *root)
+{
+        struct node *mem;
+        struct property *prop;
+        int nnodes = 0;
+        int ok = 1;
+
+        for_each_child(root, mem) {
+                if (! strneq(mem->name, "memory", mem->basenamelen))
+                        continue;
+
+                nnodes++;
+
+                CHECK_HAVE_STREQ(mem, "device_type", "memory");
+                CHECK_HAVE(mem, "reg");
+        }
+
+        if (nnodes == 0) {
+                ERRMSG("No memory nodes\n");
+                return 0;
+        }
+
+        return ok;
+}
+
+int check_semantics(struct node *dt, int outversion, int boot_cpuid_phys)
+{
+        int ok = 1;
+
+        ok = ok && check_root(dt);
+        ok = ok && check_cpus(dt, outversion, boot_cpuid_phys);
+        ok = ok && check_memory(dt);
+        if (! ok)
+                return 0;
+
+        return 1;
+}
diff --git a/arch/powerpc/boot/dtc-src/data.c b/arch/powerpc/boot/dtc-src/data.c
new file mode 100644
index 000000000000..a94718c731a9
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/data.c
@@ -0,0 +1,321 @@
+/*
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+#include "dtc.h"
+
+void data_free(struct data d)
+{
+        struct marker *m, *nm;
+
+        m = d.markers;
+        while (m) {
+                nm = m->next;
+                free(m->ref);
+                free(m);
+                m = nm;
+        }
+
+        assert(!d.val || d.asize);
+
+        if (d.val)
+                free(d.val);
+}
+
+struct data data_grow_for(struct data d, int xlen)
+{
+        struct data nd;
+        int newsize;
+
+        /* we must start with an allocated datum */
+        assert(!d.val || d.asize);
+
+        if (xlen == 0)
+                return d;
+
+        nd = d;
+
+        newsize = xlen;
+
+        while ((d.len + xlen) > newsize)
+                newsize *= 2;
+
+        nd.asize = newsize;
+        nd.val = xrealloc(d.val, newsize);
+
+        assert(nd.asize >= (d.len + xlen));
+
+        return nd;
+}
+
+struct data data_copy_mem(const char *mem, int len)
+{
+        struct data d;
+
+        d = data_grow_for(empty_data, len);
+
+        d.len = len;
+        memcpy(d.val, mem, len);
+
+        return d;
+}
+
+static char get_oct_char(const char *s, int *i)
+{
+        char x[4];
+        char *endx;
+        long val;
+
+        x[3] = '\0';
+        x[0] = s[(*i)];
+        if (x[0]) {
+                x[1] = s[(*i)+1];
+                if (x[1])
+                        x[2] = s[(*i)+2];
+        }
+
+        val = strtol(x, &endx, 8);
+        if ((endx - x) == 0)
+                fprintf(stderr, "Empty \\nnn escape\n");
+
+        (*i) += endx - x;
+        return val;
+}
+
+static char get_hex_char(const char *s, int *i)
+{
+        char x[3];
+        char *endx;
+        long val;
+
+        x[2] = '\0';
+        x[0] = s[(*i)];
+        if (x[0])
+                x[1] = s[(*i)+1];
+
+        val = strtol(x, &endx, 16);
+        if ((endx - x) == 0)
+                fprintf(stderr, "Empty \\x escape\n");
+
+        (*i) += endx - x;
+        return val;
+}
+
+struct data data_copy_escape_string(const char *s, int len)
+{
+        int i = 0;
+        struct data d;
+        char *q;
+
+        d = data_grow_for(empty_data, strlen(s)+1);
+
+        q = d.val;
+        while (i < len) {
+                char c = s[i++];
+
+                if (c != '\\') {
+                        q[d.len++] = c;
+                        continue;
+                }
+
+                c = s[i++];
+                assert(c);
+                switch (c) {
+                case 'a':
+                        q[d.len++] = '\a';
+                        break;
+                case 'b':
+                        q[d.len++] = '\b';
+                        break;
+                case 't':
+                        q[d.len++] = '\t';
+                        break;
+                case 'n':
+                        q[d.len++] = '\n';
+                        break;
+                case 'v':
+                        q[d.len++] = '\v';
+                        break;
+                case 'f':
+                        q[d.len++] = '\f';
+                        break;
+                case 'r':
+                        q[d.len++] = '\r';
+                        break;
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                        i--; /* need to re-read the first digit as
+                              * part of the octal value */
+                        q[d.len++] = get_oct_char(s, &i);
+                        break;
+                case 'x':
+                        q[d.len++] = get_hex_char(s, &i);
+                        break;
+                default:
+                        q[d.len++] = c;
+                }
+        }
+
+        q[d.len++] = '\0';
+        return d;
+}
+
+struct data data_copy_file(FILE *f, size_t len)
+{
+        struct data d;
+
+        d = data_grow_for(empty_data, len);
+
+        d.len = len;
+        fread(d.val, len, 1, f);
+
+        return d;
+}
+
+struct data data_append_data(struct data d, const void *p, int len)
+{
+        d = data_grow_for(d, len);
+        memcpy(d.val + d.len, p, len);
+        d.len += len;
+        return d;
+}
+
+struct data data_insert_at_marker(struct data d, struct marker *m,
+                                  const void *p, int len)
+{
+        d = data_grow_for(d, len);
+        memmove(d.val + m->offset + len, d.val + m->offset, d.len - m->offset);
+        memcpy(d.val + m->offset, p, len);
+        d.len += len;
+
+        /* Adjust all markers after the one we're inserting at */
+        m = m->next;
+        for_each_marker(m)
+                m->offset += len;
+        return d;
+}
+
+struct data data_append_markers(struct data d, struct marker *m)
+{
+        struct marker **mp = &d.markers;
+
+        /* Find the end of the markerlist */
+        while (*mp)
+                mp = &((*mp)->next);
+        *mp = m;
+        return d;
+}
+
+struct data data_merge(struct data d1, struct data d2)
+{
+        struct data d;
+        struct marker *m2 = d2.markers;
+
+        d = data_append_markers(data_append_data(d1, d2.val, d2.len), m2);
+
+        /* Adjust for the length of d1 */
+        for_each_marker(m2)
+                m2->offset += d1.len;
+
+        d2.markers = NULL; /* So data_free() doesn't clobber them */
+        data_free(d2);
+
+        return d;
+}
+
+struct data data_append_cell(struct data d, cell_t word)
+{
+        cell_t beword = cpu_to_be32(word);
+
+        return data_append_data(d, &beword, sizeof(beword));
+}
+
+struct data data_append_re(struct data d, const struct fdt_reserve_entry *re)
+{
+        struct fdt_reserve_entry bere;
+
+        bere.address = cpu_to_be64(re->address);
+        bere.size = cpu_to_be64(re->size);
+
+        return data_append_data(d, &bere, sizeof(bere));
+}
+
+struct data data_append_addr(struct data d, u64 addr)
+{
+        u64 beaddr = cpu_to_be64(addr);
+
+        return data_append_data(d, &beaddr, sizeof(beaddr));
+}
+
+struct data data_append_byte(struct data d, uint8_t byte)
+{
+        return data_append_data(d, &byte, 1);
+}
+
+struct data data_append_zeroes(struct data d, int len)
+{
+        d = data_grow_for(d, len);
+
+        memset(d.val + d.len, 0, len);
+        d.len += len;
+        return d;
+}
+
+struct data data_append_align(struct data d, int align)
+{
+        int newlen = ALIGN(d.len, align);
+        return data_append_zeroes(d, newlen - d.len);
+}
+
+struct data data_add_marker(struct data d, enum markertype type, char *ref)
+{
+        struct marker *m;
+
+        m = xmalloc(sizeof(*m));
+        m->offset = d.len;
+        m->type = type;
+        m->ref = ref;
+        m->next = NULL;
+
+        return data_append_markers(d, m);
+}
+
+int data_is_one_string(struct data d)
+{
+        int i;
+        int len = d.len;
+
+        if (len == 0)
+                return 0;
+
+        for (i = 0; i < len-1; i++)
+                if (d.val[i] == '\0')
+                        return 0;
+
+        if (d.val[len-1] != '\0')
+                return 0;
+
+        return 1;
+}
diff --git a/arch/powerpc/boot/dtc-src/dtc-lexer.l b/arch/powerpc/boot/dtc-src/dtc-lexer.l
new file mode 100644
index 000000000000..c811b221b31e
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/dtc-lexer.l
@@ -0,0 +1,328 @@
+/*
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+%option noyywrap nounput yylineno
+
+%x INCLUDE
+%x BYTESTRING
+%x PROPNODENAME
+%s V1
+
+PROPNODECHAR    [a-zA-Z0-9,._+*#?@-]
+PATHCHAR        ({PROPNODECHAR}|[/])
+LABEL           [a-zA-Z_][a-zA-Z0-9_]*
+
+%{
+#include "dtc.h"
+#include "srcpos.h"
+#include "dtc-parser.tab.h"
+
+
+/*#define LEXDEBUG      1*/
+
+#ifdef LEXDEBUG
+#define DPRINT(fmt, ...)        fprintf(stderr, fmt, ##__VA_ARGS__)
+#else
+#define DPRINT(fmt, ...)        do { } while (0)
+#endif
+
+static int dts_version; /* = 0 */
+
+#define BEGIN_DEFAULT() if (dts_version == 0) { \
+                                DPRINT("<INITIAL>\n"); \
+                                BEGIN(INITIAL); \
+                        } else { \
+                                DPRINT("<V1>\n"); \
+                                BEGIN(V1); \
+                        }
+%}
+
+%%
+<*>"/include/"          BEGIN(INCLUDE);
+
+<INCLUDE>\"[^"\n]*\"    {
+                        yytext[strlen(yytext) - 1] = 0;
+                        if (!push_input_file(yytext + 1)) {
+                                /* Some unrecoverable error.*/
+                                exit(1);
+                        }
+                        BEGIN_DEFAULT();
+                }
+
+
+<*><<EOF>>              {
+                        if (!pop_input_file()) {
+                                yyterminate();
+                        }
+                }
+
+<*>\"([^\\"]|\\.)*\"    {
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("String: %s\n", yytext);
+                        yylval.data = data_copy_escape_string(yytext+1,
+                                        yyleng-2);
+                        yylloc.first_line = yylineno;
+                        return DT_STRING;
+                }
+
+<*>"/dts-v1/"   {
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Keyword: /dts-v1/\n");
+                        dts_version = 1;
+                        BEGIN_DEFAULT();
+                        return DT_V1;
+                }
+
+<*>"/memreserve/"       {
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Keyword: /memreserve/\n");
+                        BEGIN_DEFAULT();
+                        return DT_MEMRESERVE;
+                }
+
+<*>{LABEL}:     {
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Label: %s\n", yytext);
+                        yylval.labelref = strdup(yytext);
+                        yylval.labelref[yyleng-1] = '\0';
+                        return DT_LABEL;
+                }
+
+<INITIAL>[bodh]# {
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        if (*yytext == 'b')
+                                yylval.cbase = 2;
+                        else if (*yytext == 'o')
+                                yylval.cbase = 8;
+                        else if (*yytext == 'd')
+                                yylval.cbase = 10;
+                        else
+                                yylval.cbase = 16;
+                        DPRINT("Base: %d\n", yylval.cbase);
+                        return DT_BASE;
+                }
+
+<INITIAL>[0-9a-fA-F]+   {
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        yylval.literal = strdup(yytext);
+                        DPRINT("Literal: '%s'\n", yylval.literal);
+                        return DT_LEGACYLITERAL;
+                }
+
+<V1>[0-9]+|0[xX][0-9a-fA-F]+      {
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        yylval.literal = strdup(yytext);
+                        DPRINT("Literal: '%s'\n", yylval.literal);
+                        return DT_LITERAL;
+                }
+
+\&{LABEL}       {       /* label reference */
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Ref: %s\n", yytext+1);
+                        yylval.labelref = strdup(yytext+1);
+                        return DT_REF;
+                }
+
+"&{/"{PATHCHAR}+\}      {       /* new-style path reference */
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        yytext[yyleng-1] = '\0';
+                        DPRINT("Ref: %s\n", yytext+2);
+                        yylval.labelref = strdup(yytext+2);
+                        return DT_REF;
+                }
+
+<INITIAL>"&/"{PATHCHAR}+ {      /* old-style path reference */
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Ref: %s\n", yytext+1);
+                        yylval.labelref = strdup(yytext+1);
+                        return DT_REF;
+                }
+
+<BYTESTRING>[0-9a-fA-F]{2} {
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        yylval.byte = strtol(yytext, NULL, 16);
+                        DPRINT("Byte: %02x\n", (int)yylval.byte);
+                        return DT_BYTE;
+                }
+
+<BYTESTRING>"]" {
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("/BYTESTRING\n");
+                        BEGIN_DEFAULT();
+                        return ']';
+                }
+
+<PROPNODENAME>{PROPNODECHAR}+ {
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("PropNodeName: %s\n", yytext);
+                        yylval.propnodename = strdup(yytext);
+                        BEGIN_DEFAULT();
+                        return DT_PROPNODENAME;
+                }
+
+
+<*>[[:space:]]+ /* eat whitespace */
+
+<*>"/*"([^*]|\*+[^*/])*\*+"/"   {
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Comment: %s\n", yytext);
+                        /* eat comments */
+                }
+
+<*>"//".*\n     /* eat line comments */
+
+<*>.            {
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Char: %c (\\x%02x)\n", yytext[0],
+                                (unsigned)yytext[0]);
+                        if (yytext[0] == '[') {
+                                DPRINT("<BYTESTRING>\n");
+                                BEGIN(BYTESTRING);
+                        }
+                        if ((yytext[0] == '{')
+                            || (yytext[0] == ';')) {
+                                DPRINT("<PROPNODENAME>\n");
+                                BEGIN(PROPNODENAME);
+                        }
+                        return yytext[0];
+                }
+
+%%
+
+
+/*
+ * Stack of nested include file contexts.
+ */
+
+struct incl_file {
+        int filenum;
+        FILE *file;
+        YY_BUFFER_STATE yy_prev_buf;
+        int yy_prev_lineno;
+        struct incl_file *prev;
+};
+
+struct incl_file *incl_file_stack;
+
+
+/*
+ * Detect infinite include recursion.
+ */
+#define MAX_INCLUDE_DEPTH       (100)
+
+static int incl_depth = 0;
+
+
+int push_input_file(const char *filename)
+{
+        FILE *f;
+        struct incl_file *incl_file;
+
+        if (!filename) {
+                yyerror("No include file name given.");
+                return 0;
+        }
+
+        if (incl_depth++ >= MAX_INCLUDE_DEPTH) {
+                yyerror("Includes nested too deeply");
+                return 0;
+        }
+
+        f = dtc_open_file(filename);
+
+        incl_file = malloc(sizeof(struct incl_file));
+        if (!incl_file) {
+                yyerror("Can not allocate include file space.");
+                return 0;
+        }
+
+        /*
+         * Save current context.
+         */
+        incl_file->yy_prev_buf = YY_CURRENT_BUFFER;
+        incl_file->yy_prev_lineno = yylineno;
+        incl_file->filenum = srcpos_filenum;
+        incl_file->file = yyin;
+        incl_file->prev = incl_file_stack;
+
+        incl_file_stack = incl_file;
+
+        /*
+         * Establish new context.
+         */
+        srcpos_filenum = lookup_file_name(filename, 0);
+        yylineno = 1;
+        yyin = f;
+        yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
+
+        return 1;
+}
+
+
+int pop_input_file(void)
+{
+        struct incl_file *incl_file;
+
+        if (incl_file_stack == 0)
+                return 0;
+
+        fclose(yyin);
+
+        /*
+         * Pop.
+         */
+        --incl_depth;
+        incl_file = incl_file_stack;
+        incl_file_stack = incl_file->prev;
+
+        /*
+         * Recover old context.
+         */
+        yy_delete_buffer(YY_CURRENT_BUFFER);
+        yy_switch_to_buffer(incl_file->yy_prev_buf);
+        yylineno = incl_file->yy_prev_lineno;
+        srcpos_filenum = incl_file->filenum;
+        yyin = incl_file->file;
+
+        /*
+         * Free old state.
+         */
+        free(incl_file);
+
+        if (YY_CURRENT_BUFFER == 0)
+                return 0;
+
+        return 1;
+}
diff --git a/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped b/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped
new file mode 100644
index 000000000000..d0f742460f92
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped
@@ -0,0 +1,2174 @@
+#line 2 "dtc-lexer.lex.c"
+
+#line 4 "dtc-lexer.lex.c"
+
+#define  YY_INT_ALIGNED short int
+
+/* A lexical scanner generated by flex */
+
+#define FLEX_SCANNER
+#define YY_FLEX_MAJOR_VERSION 2
+#define YY_FLEX_MINOR_VERSION 5
+#define YY_FLEX_SUBMINOR_VERSION 33
+#if YY_FLEX_SUBMINOR_VERSION > 0
+#define FLEX_BETA
+#endif
+
+/* First, we deal with  platform-specific or compiler-specific issues. */
+
+/* begin standard C headers. */
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
+
+#if __STDC_VERSION__ >= 199901L
+
+/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
+ * if you want the limit (max/min) macros for int types. 
+ */
+#ifndef __STDC_LIMIT_MACROS
+#define __STDC_LIMIT_MACROS 1
+#endif
+
+#include <inttypes.h>
+typedef int8_t flex_int8_t;
+typedef uint8_t flex_uint8_t;
+typedef int16_t flex_int16_t;
+typedef uint16_t flex_uint16_t;
+typedef int32_t flex_int32_t;
+typedef uint32_t flex_uint32_t;
+#else
+typedef signed char flex_int8_t;
+typedef short int flex_int16_t;
+typedef int flex_int32_t;
+typedef unsigned char flex_uint8_t; 
+typedef unsigned short int flex_uint16_t;
+typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */
+
+/* Limits of integral types. */
+#ifndef INT8_MIN
+#define INT8_MIN               (-128)
+#endif
+#ifndef INT16_MIN
+#define INT16_MIN              (-32767-1)
+#endif
+#ifndef INT32_MIN
+#define INT32_MIN              (-2147483647-1)
+#endif
+#ifndef INT8_MAX
+#define INT8_MAX               (127)
+#endif
+#ifndef INT16_MAX
+#define INT16_MAX              (32767)
+#endif
+#ifndef INT32_MAX
+#define INT32_MAX              (2147483647)
+#endif
+#ifndef UINT8_MAX
+#define UINT8_MAX              (255U)
+#endif
+#ifndef UINT16_MAX
+#define UINT16_MAX             (65535U)
+#endif
+#ifndef UINT32_MAX
+#define UINT32_MAX             (4294967295U)
+#endif
+
+#endif /* ! FLEXINT_H */
+
+#ifdef __cplusplus
+
+/* The "const" storage-class-modifier is valid. */
+#define YY_USE_CONST
+
+#else   /* ! __cplusplus */
+
+#if __STDC__
+
+#define YY_USE_CONST
+
+#endif  /* __STDC__ */
+#endif  /* ! __cplusplus */
+
+#ifdef YY_USE_CONST
+#define yyconst const
+#else
+#define yyconst
+#endif
+
+/* Returned upon end-of-file. */
+#define YY_NULL 0
+
+/* Promotes a possibly negative, possibly signed char to an unsigned
+ * integer for use as an array index.  If the signed char is negative,
+ * we want to instead treat it as an 8-bit unsigned char, hence the
+ * double cast.
+ */
+#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+
+/* Enter a start condition.  This macro really ought to take a parameter,
+ * but we do it the disgusting crufty way forced on us by the ()-less
+ * definition of BEGIN.
+ */
+#define BEGIN (yy_start) = 1 + 2 *
+
+/* Translate the current start state into a value that can be later handed
+ * to BEGIN to return to the state.  The YYSTATE alias is for lex
+ * compatibility.
+ */
+#define YY_START (((yy_start) - 1) / 2)
+#define YYSTATE YY_START
+
+/* Action number for EOF rule of a given start state. */
+#define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
+
+/* Special action meaning "start processing a new file". */
+#define YY_NEW_FILE yyrestart(yyin  )
+
+#define YY_END_OF_BUFFER_CHAR 0
+
+/* Size of default input buffer. */
+#ifndef YY_BUF_SIZE
+#define YY_BUF_SIZE 16384
+#endif
+
+/* The state buf must be large enough to hold one state per character in the main buffer.
+ */
+#define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
+
+#ifndef YY_TYPEDEF_YY_BUFFER_STATE
+#define YY_TYPEDEF_YY_BUFFER_STATE
+typedef struct yy_buffer_state *YY_BUFFER_STATE;
+#endif
+
+extern int yyleng;
+
+extern FILE *yyin, *yyout;
+
+#define EOB_ACT_CONTINUE_SCAN 0
+#define EOB_ACT_END_OF_FILE 1
+#define EOB_ACT_LAST_MATCH 2
+
+    /* Note: We specifically omit the test for yy_rule_can_match_eol because it requires
+     *       access to the local variable yy_act. Since yyless() is a macro, it would break
+     *       existing scanners that call yyless() from OUTSIDE yylex. 
+     *       One obvious solution it to make yy_act a global. I tried that, and saw
+     *       a 5% performance hit in a non-yylineno scanner, because yy_act is
+     *       normally declared as a register variable-- so it is not worth it.
+     */
+    #define  YY_LESS_LINENO(n) \
+            do { \
+                int yyl;\
+                for ( yyl = n; yyl < yyleng; ++yyl )\
+                    if ( yytext[yyl] == '\n' )\
+                        --yylineno;\
+            }while(0)
+    
+/* Return all but the first "n" matched characters back to the input stream. */
+#define yyless(n) \
+        do \
+                { \
+                /* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+                *yy_cp = (yy_hold_char); \
+                YY_RESTORE_YY_MORE_OFFSET \
+                (yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
+                YY_DO_BEFORE_ACTION; /* set up yytext again */ \
+                } \
+        while ( 0 )
+
+#define unput(c) yyunput( c, (yytext_ptr)  )
+
+/* The following is because we cannot portably get our hands on size_t
+ * (without autoconf's help, which isn't available because we want
+ * flex-generated scanners to compile on their own).
+ */
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef unsigned int yy_size_t;
+#endif
+
+#ifndef YY_STRUCT_YY_BUFFER_STATE
+#define YY_STRUCT_YY_BUFFER_STATE
+struct yy_buffer_state
+        {
+        FILE *yy_input_file;
+
+        char *yy_ch_buf;                /* input buffer */
+        char *yy_buf_pos;               /* current position in input buffer */
+
+        /* Size of input buffer in bytes, not including room for EOB
+         * characters.
+         */
+        yy_size_t yy_buf_size;
+
+        /* Number of characters read into yy_ch_buf, not including EOB
+         * characters.
+         */
+        int yy_n_chars;
+
+        /* Whether we "own" the buffer - i.e., we know we created it,
+         * and can realloc() it to grow it, and should free() it to
+         * delete it.
+         */
+        int yy_is_our_buffer;
+
+        /* Whether this is an "interactive" input source; if so, and
+         * if we're using stdio for input, then we want to use getc()
+         * instead of fread(), to make sure we stop fetching input after
+         * each newline.
+         */
+        int yy_is_interactive;
+
+        /* Whether we're considered to be at the beginning of a line.
+         * If so, '^' rules will be active on the next match, otherwise
+         * not.
+         */
+        int yy_at_bol;
+
+    int yy_bs_lineno; /**< The line count. */
+    int yy_bs_column; /**< The column count. */
+    
+        /* Whether to try to fill the input buffer when we reach the
+         * end of it.
+         */
+        int yy_fill_buffer;
+
+        int yy_buffer_status;
+
+#define YY_BUFFER_NEW 0
+#define YY_BUFFER_NORMAL 1
+        /* When an EOF's been seen but there's still some text to process
+         * then we mark the buffer as YY_EOF_PENDING, to indicate that we
+         * shouldn't try reading from the input source any more.  We might
+         * still have a bunch of tokens to match, though, because of
+         * possible backing-up.
+         *
+         * When we actually see the EOF, we change the status to "new"
+         * (via yyrestart()), so that the user can continue scanning by
+         * just pointing yyin at a new input file.
+         */
+#define YY_BUFFER_EOF_PENDING 2
+
+        };
+#endif /* !YY_STRUCT_YY_BUFFER_STATE */
+
+/* Stack of input buffers. */
+static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
+static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
+static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+
+/* We provide macros for accessing buffer states in case in the
+ * future we want to put the buffer states in a more general
+ * "scanner state".
+ *
+ * Returns the top of the stack, or NULL.
+ */
+#define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
+                          ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
+                          : NULL)
+
+/* Same as previous macro, but useful when we know that the buffer stack is not
+ * NULL or when we need an lvalue. For internal use only.
+ */
+#define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
+
+/* yy_hold_char holds the character lost when yytext is formed. */
+static char yy_hold_char;
+static int yy_n_chars;          /* number of characters read into yy_ch_buf */
+int yyleng;
+
+/* Points to current character in buffer. */
+static char *yy_c_buf_p = (char *) 0;
+static int yy_init = 0;         /* whether we need to initialize */
+static int yy_start = 0;        /* start state number */
+
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
+ */
+static int yy_did_buffer_switch_on_eof;
+
+void yyrestart (FILE *input_file  );
+void yy_switch_to_buffer (YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer (FILE *file,int size  );
+void yy_delete_buffer (YY_BUFFER_STATE b  );
+void yy_flush_buffer (YY_BUFFER_STATE b  );
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state (void );
+
+static void yyensure_buffer_stack (void );
+static void yy_load_buffer_state (void );
+static void yy_init_buffer (YY_BUFFER_STATE b,FILE *file  );
+
+#define YY_FLUSH_BUFFER yy_flush_buffer(YY_CURRENT_BUFFER )
+
+YY_BUFFER_STATE yy_scan_buffer (char *base,yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string (yyconst char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes (yyconst char *bytes,int len  );
+
+void *yyalloc (yy_size_t  );
+void *yyrealloc (void *,yy_size_t  );
+void yyfree (void *  );
+
+#define yy_new_buffer yy_create_buffer
+
+#define yy_set_interactive(is_interactive) \
+        { \
+        if ( ! YY_CURRENT_BUFFER ){ \
+        yyensure_buffer_stack (); \
+                YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+        } \
+        YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
+        }
+
+#define yy_set_bol(at_bol) \
+        { \
+        if ( ! YY_CURRENT_BUFFER ){\
+        yyensure_buffer_stack (); \
+                YY_CURRENT_BUFFER_LVALUE =    \
+            yy_create_buffer(yyin,YY_BUF_SIZE ); \
+        } \
+        YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
+        }
+
+#define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
+
+/* Begin user sect3 */
+
+#define yywrap() 1
+#define YY_SKIP_YYWRAP
+
+typedef unsigned char YY_CHAR;
+
+FILE *yyin = (FILE *) 0, *yyout = (FILE *) 0;
+
+typedef int yy_state_type;
+
+extern int yylineno;
+
+int yylineno = 1;
+
+extern char *yytext;
+#define yytext_ptr yytext
+
+static yy_state_type yy_get_previous_state (void );
+static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
+static int yy_get_next_buffer (void );
+static void yy_fatal_error (yyconst char msg[]  );
+
+/* Done after the current pattern has been matched and before the
+ * corresponding action - sets up yytext.
+ */
+#define YY_DO_BEFORE_ACTION \
+        (yytext_ptr) = yy_bp; \
+        yyleng = (size_t) (yy_cp - yy_bp); \
+        (yy_hold_char) = *yy_cp; \
+        *yy_cp = '\0'; \
+        (yy_c_buf_p) = yy_cp;
+
+#define YY_NUM_RULES 20
+#define YY_END_OF_BUFFER 21
+/* This struct is not used in this scanner,
+   but its presence is necessary. */
+struct yy_trans_info
+        {
+        flex_int32_t yy_verify;
+        flex_int32_t yy_nxt;
+        };
+static yyconst flex_int16_t yy_accept[94] =
+    {   0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+       21,   19,   16,   16,   19,   19,   19,    8,    8,   19,
+        8,   19,   19,   19,   19,   14,   15,   15,   19,    9,
+        9,   16,    0,    3,    0,    0,   10,    0,    0,    0,
+        0,    0,    0,    8,    8,    6,    0,    7,    0,    2,
+        0,   13,   13,   15,   15,    9,    0,   12,   10,    0,
+        0,    0,    0,   18,    0,    0,    0,    2,    9,    0,
+       17,    0,    0,    0,   11,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    4,    0,    0,    1,    0,    0,
+        0,    5,    0
+
+    } ;
+
+static yyconst flex_int32_t yy_ec[256] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
+        2,    2,    2,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    2,    1,    4,    5,    1,    1,    6,    1,    1,
+        1,    7,    8,    8,    9,    8,   10,   11,   12,   13,
+       13,   13,   13,   13,   13,   13,   13,   14,    1,    1,
+        1,    1,    8,    8,   15,   15,   15,   15,   15,   15,
+       16,   16,   16,   16,   16,   16,   16,   16,   16,   16,
+       16,   16,   16,   16,   16,   16,   16,   17,   16,   16,
+        1,   18,   19,    1,   16,    1,   15,   20,   21,   22,
+
+       23,   15,   16,   24,   25,   16,   16,   26,   27,   28,
+       24,   16,   16,   29,   30,   31,   32,   33,   16,   17,
+       16,   16,   34,    1,   35,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1
+    } ;
+
+static yyconst flex_int32_t yy_meta[36] =
+    {   0,
+        1,    1,    1,    1,    2,    1,    2,    2,    2,    3,
+        4,    4,    4,    5,    6,    7,    7,    1,    1,    6,
+        6,    6,    6,    7,    7,    7,    7,    7,    7,    7,
+        7,    7,    7,    8,    1
+    } ;
+
+static yyconst flex_int16_t yy_base[107] =
+    {   0,
+        0,    0,   32,    0,   53,    0,   76,    0,  108,  111,
+      280,  288,   37,   39,   33,   36,  106,    0,  123,  146,
+      255,  251,   45,    0,  159,  288,    0,   53,  108,  172,
+      114,  127,  158,  288,  245,    0,    0,  234,  235,  236,
+      197,  195,  199,    0,    0,  288,    0,  288,  160,  288,
+      183,  288,    0,    0,  183,  182,    0,    0,    0,    0,
+      204,  189,  207,  288,  179,  187,  180,  194,    0,  171,
+      288,  196,  178,  174,  288,  169,  169,  177,  165,  153,
+      143,  155,  137,  118,  288,  122,   42,  288,   36,   36,
+       40,  288,  288,  212,  218,  223,  229,  234,  239,  245,
+
+      251,  255,  262,  270,  275,  280
+    } ;
+
+static yyconst flex_int16_t yy_def[107] =
+    {   0,
+       93,    1,    1,    3,    3,    5,   93,    7,    3,    3,
+       93,   93,   93,   93,   94,   95,   93,   96,   93,   19,
+       19,   20,   97,   98,   20,   93,   99,  100,   95,   93,
+       93,   93,   94,   93,   94,  101,  102,   93,  103,  104,
+       93,   93,   93,   96,   19,   93,   20,   93,   97,   93,
+       97,   93,   20,   99,  100,   93,  105,  101,  102,  106,
+      103,  103,  104,   93,   93,   93,   93,   94,  105,  106,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+       93,   93,    0,   93,   93,   93,   93,   93,   93,   93,
+
+       93,   93,   93,   93,   93,   93
+    } ;
+
+static yyconst flex_int16_t yy_nxt[324] =
+    {   0,
+       12,   13,   14,   15,   12,   16,   12,   12,   12,   17,
+       18,   18,   18,   12,   19,   20,   20,   12,   12,   21,
+       19,   21,   19,   22,   20,   20,   20,   20,   20,   20,
+       20,   20,   20,   12,   12,   23,   34,   12,   32,   32,
+       32,   32,   12,   12,   12,   36,   20,   33,   50,   92,
+       35,   20,   20,   20,   20,   20,   15,   54,   91,   54,
+       54,   54,   51,   24,   24,   24,   46,   25,   90,   38,
+       89,   26,   25,   25,   25,   25,   12,   13,   14,   15,
+       27,   12,   27,   27,   27,   17,   27,   27,   27,   12,
+       28,   28,   28,   12,   12,   28,   28,   28,   28,   28,
+
+       28,   28,   28,   28,   28,   28,   28,   28,   28,   12,
+       12,   15,   39,   29,   15,   40,   29,   93,   30,   31,
+       31,   30,   31,   31,   56,   56,   56,   41,   32,   32,
+       42,   88,   43,   45,   45,   45,   46,   45,   47,   47,
+       87,   38,   45,   45,   45,   45,   47,   47,   47,   47,
+       47,   47,   47,   47,   47,   47,   47,   47,   47,   86,
+       47,   34,   33,   50,   85,   47,   47,   47,   47,   53,
+       53,   53,   84,   53,   83,   35,   82,   51,   53,   53,
+       53,   53,   56,   56,   56,   93,   68,   54,   57,   54,
+       54,   54,   56,   56,   56,   62,   46,   34,   71,   81,
+
+       80,   79,   78,   77,   76,   75,   74,   73,   72,   64,
+       62,   35,   33,   33,   33,   33,   33,   33,   33,   33,
+       37,   67,   66,   37,   37,   37,   44,   65,   44,   49,
+       49,   49,   49,   49,   49,   49,   49,   52,   64,   52,
+       54,   62,   54,   60,   54,   54,   55,   93,   55,   55,
+       55,   55,   58,   58,   58,   48,   58,   58,   59,   48,
+       59,   59,   61,   61,   61,   61,   61,   61,   61,   61,
+       63,   63,   63,   63,   63,   63,   63,   63,   69,   93,
+       69,   70,   70,   70,   93,   70,   70,   11,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+       93,   93,   93
+    } ;
+
+static yyconst flex_int16_t yy_chk[324] =
+    {   0,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    3,   15,    3,   13,   13,
+       14,   14,    3,    3,    3,   16,    3,   23,   23,   91,
+       15,    3,    3,    3,    3,    3,    5,   28,   90,   28,
+       28,   28,   23,    5,    5,    5,   28,    5,   89,   16,
+       87,    5,    5,    5,    5,    5,    7,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+
+        7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
+        7,    9,   17,    9,   10,   17,   10,   29,    9,    9,
+        9,   10,   10,   10,   31,   31,   31,   17,   32,   32,
+       17,   86,   17,   19,   19,   19,   19,   19,   19,   19,
+       84,   29,   19,   19,   19,   19,   19,   19,   19,   19,
+       19,   19,   19,   19,   19,   19,   20,   20,   20,   83,
+       20,   33,   49,   49,   82,   20,   20,   20,   20,   25,
+       25,   25,   81,   25,   80,   33,   79,   49,   25,   25,
+       25,   25,   30,   30,   30,   51,   51,   55,   30,   55,
+       55,   55,   56,   56,   56,   62,   55,   68,   62,   78,
+
+       77,   76,   74,   73,   72,   70,   67,   66,   65,   63,
+       61,   68,   94,   94,   94,   94,   94,   94,   94,   94,
+       95,   43,   42,   95,   95,   95,   96,   41,   96,   97,
+       97,   97,   97,   97,   97,   97,   97,   98,   40,   98,
+       99,   39,   99,   38,   99,   99,  100,   35,  100,  100,
+      100,  100,  101,  101,  101,   22,  101,  101,  102,   21,
+      102,  102,  103,  103,  103,  103,  103,  103,  103,  103,
+      104,  104,  104,  104,  104,  104,  104,  104,  105,   11,
+      105,  106,  106,  106,    0,  106,  106,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+       93,   93,   93,   93,   93,   93,   93,   93,   93,   93,
+       93,   93,   93
+    } ;
+
+/* Table of booleans, true if rule could match eol. */
+static yyconst flex_int32_t yy_rule_can_match_eol[21] =
+    {   0,
+0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 0, 
+    0,     };
+
+static yy_state_type yy_last_accepting_state;
+static char *yy_last_accepting_cpos;
+
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
+
+/* The intent behind this definition is that it'll catch
+ * any uses of REJECT which flex missed.
+ */
+#define REJECT reject_used_but_not_detected
+#define yymore() yymore_used_but_not_detected
+#define YY_MORE_ADJ 0
+#define YY_RESTORE_YY_MORE_OFFSET
+char *yytext;
+#line 1 "dtc-lexer.l"
+/*
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+
+
+
+#line 33 "dtc-lexer.l"
+#include "dtc.h"
+#include "srcpos.h"
+#include "dtc-parser.tab.h"
+
+
+/*#define LEXDEBUG      1*/
+
+#ifdef LEXDEBUG
+#define DPRINT(fmt, ...)        fprintf(stderr, fmt, ##__VA_ARGS__)
+#else
+#define DPRINT(fmt, ...)        do { } while (0)
+#endif
+
+static int dts_version; /* = 0 */
+
+#define BEGIN_DEFAULT() if (dts_version == 0) { \
+                                DPRINT("<INITIAL>\n"); \
+                                BEGIN(INITIAL); \
+                        } else { \
+                                DPRINT("<V1>\n"); \
+                                BEGIN(V1); \
+                        }
+#line 627 "dtc-lexer.lex.c"
+
+#define INITIAL 0
+#define INCLUDE 1
+#define BYTESTRING 2
+#define PROPNODENAME 3
+#define V1 4
+
+#ifndef YY_NO_UNISTD_H
+/* Special case for "unistd.h", since it is non-ANSI. We include it way
+ * down here because we want the user's section 1 to have been scanned first.
+ * The user has a chance to override it with an option.
+ */
+#include <unistd.h>
+#endif
+
+#ifndef YY_EXTRA_TYPE
+#define YY_EXTRA_TYPE void *
+#endif
+
+static int yy_init_globals (void );
+
+/* Macros after this point can all be overridden by user definitions in
+ * section 1.
+ */
+
+#ifndef YY_SKIP_YYWRAP
+#ifdef __cplusplus
+extern "C" int yywrap (void );
+#else
+extern int yywrap (void );
+#endif
+#endif
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char *,yyconst char *,int );
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * );
+#endif
+
+#ifndef YY_NO_INPUT
+
+#ifdef __cplusplus
+static int yyinput (void );
+#else
+static int input (void );
+#endif
+
+#endif
+
+/* Amount of stuff to slurp up with each read. */
+#ifndef YY_READ_BUF_SIZE
+#define YY_READ_BUF_SIZE 8192
+#endif
+
+/* Copy whatever the last rule matched to the standard output. */
+#ifndef ECHO
+/* This used to be an fputs(), but since the string might contain NUL's,
+ * we now use fwrite().
+ */
+#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
+#endif
+
+/* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
+ * is returned in "result".
+ */
+#ifndef YY_INPUT
+#define YY_INPUT(buf,result,max_size) \
+        if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
+                { \
+                int c = '*'; \
+                size_t n; \
+                for ( n = 0; n < max_size && \
+                             (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
+                        buf[n] = (char) c; \
+                if ( c == '\n' ) \
+                        buf[n++] = (char) c; \
+                if ( c == EOF && ferror( yyin ) ) \
+                        YY_FATAL_ERROR( "input in flex scanner failed" ); \
+                result = n; \
+                } \
+        else \
+                { \
+                errno=0; \
+                while ( (result = fread(buf, 1, max_size, yyin))==0 && ferror(yyin)) \
+                        { \
+                        if( errno != EINTR) \
+                                { \
+                                YY_FATAL_ERROR( "input in flex scanner failed" ); \
+                                break; \
+                                } \
+                        errno=0; \
+                        clearerr(yyin); \
+                        } \
+                }\
+\
+
+#endif
+
+/* No semi-colon after return; correct usage is to write "yyterminate();" -
+ * we don't want an extra ';' after the "return" because that will cause
+ * some compilers to complain about unreachable statements.
+ */
+#ifndef yyterminate
+#define yyterminate() return YY_NULL
+#endif
+
+/* Number of entries by which start-condition stack grows. */
+#ifndef YY_START_STACK_INCR
+#define YY_START_STACK_INCR 25
+#endif
+
+/* Report a fatal error. */
+#ifndef YY_FATAL_ERROR
+#define YY_FATAL_ERROR(msg) yy_fatal_error( msg )
+#endif
+
+/* end tables serialization structures and prototypes */
+
+/* Default declaration of generated scanner - a define so the user can
+ * easily add parameters.
+ */
+#ifndef YY_DECL
+#define YY_DECL_IS_OURS 1
+
+extern int yylex (void);
+
+#define YY_DECL int yylex (void)
+#endif /* !YY_DECL */
+
+/* Code executed at the beginning of each rule, after yytext and yyleng
+ * have been set up.
+ */
+#ifndef YY_USER_ACTION
+#define YY_USER_ACTION
+#endif
+
+/* Code executed at the end of each rule. */
+#ifndef YY_BREAK
+#define YY_BREAK break;
+#endif
+
+#define YY_RULE_SETUP \
+        YY_USER_ACTION
+
+/** The main scanner function which does all the work.
+ */
+YY_DECL
+{
+        register yy_state_type yy_current_state;
+        register char *yy_cp, *yy_bp;
+        register int yy_act;
+    
+#line 57 "dtc-lexer.l"
+
+#line 784 "dtc-lexer.lex.c"
+
+        if ( !(yy_init) )
+                {
+                (yy_init) = 1;
+
+#ifdef YY_USER_INIT
+                YY_USER_INIT;
+#endif
+
+                if ( ! (yy_start) )
+                        (yy_start) = 1; /* first start state */
+
+                if ( ! yyin )
+                        yyin = stdin;
+
+                if ( ! yyout )
+                        yyout = stdout;
+
+                if ( ! YY_CURRENT_BUFFER ) {
+                        yyensure_buffer_stack ();
+                        YY_CURRENT_BUFFER_LVALUE =
+                                yy_create_buffer(yyin,YY_BUF_SIZE );
+                }
+
+                yy_load_buffer_state( );
+                }
+
+        while ( 1 )             /* loops until end-of-file is reached */
+                {
+                yy_cp = (yy_c_buf_p);
+
+                /* Support of yytext. */
+                *yy_cp = (yy_hold_char);
+
+                /* yy_bp points to the position in yy_ch_buf of the start of
+                 * the current run.
+                 */
+                yy_bp = yy_cp;
+
+                yy_current_state = (yy_start);
+yy_match:
+                do
+                        {
+                        register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+                        if ( yy_accept[yy_current_state] )
+                                {
+                                (yy_last_accepting_state) = yy_current_state;
+                                (yy_last_accepting_cpos) = yy_cp;
+                                }
+                        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+                                {
+                                yy_current_state = (int) yy_def[yy_current_state];
+                                if ( yy_current_state >= 94 )
+                                        yy_c = yy_meta[(unsigned int) yy_c];
+                                }
+                        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+                        ++yy_cp;
+                        }
+                while ( yy_base[yy_current_state] != 288 );
+
+yy_find_action:
+                yy_act = yy_accept[yy_current_state];
+                if ( yy_act == 0 )
+                        { /* have to back up */
+                        yy_cp = (yy_last_accepting_cpos);
+                        yy_current_state = (yy_last_accepting_state);
+                        yy_act = yy_accept[yy_current_state];
+                        }
+
+                YY_DO_BEFORE_ACTION;
+
+                if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
+                        {
+                        int yyl;
+                        for ( yyl = 0; yyl < yyleng; ++yyl )
+                                if ( yytext[yyl] == '\n' )
+                                           
+    yylineno++;
+;
+                        }
+
+do_action:      /* This label is used only to access EOF actions. */
+
+                switch ( yy_act )
+        { /* beginning of action switch */
+                        case 0: /* must back up */
+                        /* undo the effects of YY_DO_BEFORE_ACTION */
+                        *yy_cp = (yy_hold_char);
+                        yy_cp = (yy_last_accepting_cpos);
+                        yy_current_state = (yy_last_accepting_state);
+                        goto yy_find_action;
+
+case 1:
+YY_RULE_SETUP
+#line 58 "dtc-lexer.l"
+BEGIN(INCLUDE);
+        YY_BREAK
+case 2:
+YY_RULE_SETUP
+#line 60 "dtc-lexer.l"
+{
+                        yytext[strlen(yytext) - 1] = 0;
+                        if (!push_input_file(yytext + 1)) {
+                                /* Some unrecoverable error.*/
+                                exit(1);
+                        }
+                        BEGIN_DEFAULT();
+                }
+        YY_BREAK
+case YY_STATE_EOF(INITIAL):
+case YY_STATE_EOF(INCLUDE):
+case YY_STATE_EOF(BYTESTRING):
+case YY_STATE_EOF(PROPNODENAME):
+case YY_STATE_EOF(V1):
+#line 70 "dtc-lexer.l"
+{
+                        if (!pop_input_file()) {
+                                yyterminate();
+                        }
+                }
+        YY_BREAK
+case 3:
+/* rule 3 can match eol */
+YY_RULE_SETUP
+#line 76 "dtc-lexer.l"
+{
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("String: %s\n", yytext);
+                        yylval.data = data_copy_escape_string(yytext+1,
+                                        yyleng-2);
+                        yylloc.first_line = yylineno;
+                        return DT_STRING;
+                }
+        YY_BREAK
+case 4:
+YY_RULE_SETUP
+#line 86 "dtc-lexer.l"
+{
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Keyword: /dts-v1/\n");
+                        dts_version = 1;
+                        BEGIN_DEFAULT();
+                        return DT_V1;
+                }
+        YY_BREAK
+case 5:
+YY_RULE_SETUP
+#line 95 "dtc-lexer.l"
+{
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Keyword: /memreserve/\n");
+                        BEGIN_DEFAULT();
+                        return DT_MEMRESERVE;
+                }
+        YY_BREAK
+case 6:
+YY_RULE_SETUP
+#line 103 "dtc-lexer.l"
+{
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Label: %s\n", yytext);
+                        yylval.labelref = strdup(yytext);
+                        yylval.labelref[yyleng-1] = '\0';
+                        return DT_LABEL;
+                }
+        YY_BREAK
+case 7:
+YY_RULE_SETUP
+#line 112 "dtc-lexer.l"
+{
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        if (*yytext == 'b')
+                                yylval.cbase = 2;
+                        else if (*yytext == 'o')
+                                yylval.cbase = 8;
+                        else if (*yytext == 'd')
+                                yylval.cbase = 10;
+                        else
+                                yylval.cbase = 16;
+                        DPRINT("Base: %d\n", yylval.cbase);
+                        return DT_BASE;
+                }
+        YY_BREAK
+case 8:
+YY_RULE_SETUP
+#line 127 "dtc-lexer.l"
+{
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        yylval.literal = strdup(yytext);
+                        DPRINT("Literal: '%s'\n", yylval.literal);
+                        return DT_LEGACYLITERAL;
+                }
+        YY_BREAK
+case 9:
+YY_RULE_SETUP
+#line 135 "dtc-lexer.l"
+{
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        yylval.literal = strdup(yytext);
+                        DPRINT("Literal: '%s'\n", yylval.literal);
+                        return DT_LITERAL;
+                }
+        YY_BREAK
+case 10:
+YY_RULE_SETUP
+#line 143 "dtc-lexer.l"
+{       /* label reference */
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Ref: %s\n", yytext+1);
+                        yylval.labelref = strdup(yytext+1);
+                        return DT_REF;
+                }
+        YY_BREAK
+case 11:
+YY_RULE_SETUP
+#line 151 "dtc-lexer.l"
+{       /* new-style path reference */
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        yytext[yyleng-1] = '\0';
+                        DPRINT("Ref: %s\n", yytext+2);
+                        yylval.labelref = strdup(yytext+2);
+                        return DT_REF;
+                }
+        YY_BREAK
+case 12:
+YY_RULE_SETUP
+#line 160 "dtc-lexer.l"
+{       /* old-style path reference */
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Ref: %s\n", yytext+1);
+                        yylval.labelref = strdup(yytext+1);
+                        return DT_REF;
+                }
+        YY_BREAK
+case 13:
+YY_RULE_SETUP
+#line 168 "dtc-lexer.l"
+{
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        yylval.byte = strtol(yytext, NULL, 16);
+                        DPRINT("Byte: %02x\n", (int)yylval.byte);
+                        return DT_BYTE;
+                }
+        YY_BREAK
+case 14:
+YY_RULE_SETUP
+#line 176 "dtc-lexer.l"
+{
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("/BYTESTRING\n");
+                        BEGIN_DEFAULT();
+                        return ']';
+                }
+        YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 184 "dtc-lexer.l"
+{
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("PropNodeName: %s\n", yytext);
+                        yylval.propnodename = strdup(yytext);
+                        BEGIN_DEFAULT();
+                        return DT_PROPNODENAME;
+                }
+        YY_BREAK
+case 16:
+/* rule 16 can match eol */
+YY_RULE_SETUP
+#line 194 "dtc-lexer.l"
+/* eat whitespace */
+        YY_BREAK
+case 17:
+/* rule 17 can match eol */
+YY_RULE_SETUP
+#line 196 "dtc-lexer.l"
+{
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Comment: %s\n", yytext);
+                        /* eat comments */
+                }
+        YY_BREAK
+case 18:
+/* rule 18 can match eol */
+YY_RULE_SETUP
+#line 203 "dtc-lexer.l"
+/* eat line comments */
+        YY_BREAK
+case 19:
+YY_RULE_SETUP
+#line 205 "dtc-lexer.l"
+{
+                        yylloc.filenum = srcpos_filenum;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Char: %c (\\x%02x)\n", yytext[0],
+                                (unsigned)yytext[0]);
+                        if (yytext[0] == '[') {
+                                DPRINT("<BYTESTRING>\n");
+                                BEGIN(BYTESTRING);
+                        }
+                        if ((yytext[0] == '{')
+                            || (yytext[0] == ';')) {
+                                DPRINT("<PROPNODENAME>\n");
+                                BEGIN(PROPNODENAME);
+                        }
+                        return yytext[0];
+                }
+        YY_BREAK
+case 20:
+YY_RULE_SETUP
+#line 222 "dtc-lexer.l"
+ECHO;
+        YY_BREAK
+#line 1111 "dtc-lexer.lex.c"
+
+        case YY_END_OF_BUFFER:
+                {
+                /* Amount of text matched not including the EOB char. */
+                int yy_amount_of_matched_text = (int) (yy_cp - (yytext_ptr)) - 1;
+
+                /* Undo the effects of YY_DO_BEFORE_ACTION. */
+                *yy_cp = (yy_hold_char);
+                YY_RESTORE_YY_MORE_OFFSET
+
+                if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_NEW )
+                        {
+                        /* We're scanning a new file or input source.  It's
+                         * possible that this happened because the user
+                         * just pointed yyin at a new source and called
+                         * yylex().  If so, then we have to assure
+                         * consistency between YY_CURRENT_BUFFER and our
+                         * globals.  Here is the right place to do so, because
+                         * this is the first action (other than possibly a
+                         * back-up) that will match for the new input source.
+                         */
+                        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+                        YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
+                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
+                        }
+
+                /* Note that here we test for yy_c_buf_p "<=" to the position
+                 * of the first EOB in the buffer, since yy_c_buf_p will
+                 * already have been incremented past the NUL character
+                 * (since all states make transitions on EOB to the
+                 * end-of-buffer state).  Contrast this with the test
+                 * in input().
+                 */
+                if ( (yy_c_buf_p) <= &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+                        { /* This was really a NUL. */
+                        yy_state_type yy_next_state;
+
+                        (yy_c_buf_p) = (yytext_ptr) + yy_amount_of_matched_text;
+
+                        yy_current_state = yy_get_previous_state(  );
+
+                        /* Okay, we're now positioned to make the NUL
+                         * transition.  We couldn't have
+                         * yy_get_previous_state() go ahead and do it
+                         * for us because it doesn't know how to deal
+                         * with the possibility of jamming (and we don't
+                         * want to build jamming into it because then it
+                         * will run more slowly).
+                         */
+
+                        yy_next_state = yy_try_NUL_trans( yy_current_state );
+
+                        yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+
+                        if ( yy_next_state )
+                                {
+                                /* Consume the NUL. */
+                                yy_cp = ++(yy_c_buf_p);
+                                yy_current_state = yy_next_state;
+                                goto yy_match;
+                                }
+
+                        else
+                                {
+                                yy_cp = (yy_c_buf_p);
+                                goto yy_find_action;
+                                }
+                        }
+
+                else switch ( yy_get_next_buffer(  ) )
+                        {
+                        case EOB_ACT_END_OF_FILE:
+                                {
+                                (yy_did_buffer_switch_on_eof) = 0;
+
+                                if ( yywrap( ) )
+                                        {
+                                        /* Note: because we've taken care in
+                                         * yy_get_next_buffer() to have set up
+                                         * yytext, we can now set up
+                                         * yy_c_buf_p so that if some total
+                                         * hoser (like flex itself) wants to
+                                         * call the scanner after we return the
+                                         * YY_NULL, it'll still work - another
+                                         * YY_NULL will get returned.
+                                         */
+                                        (yy_c_buf_p) = (yytext_ptr) + YY_MORE_ADJ;
+
+                                        yy_act = YY_STATE_EOF(YY_START);
+                                        goto do_action;
+                                        }
+
+                                else
+                                        {
+                                        if ( ! (yy_did_buffer_switch_on_eof) )
+                                                YY_NEW_FILE;
+                                        }
+                                break;
+                                }
+
+                        case EOB_ACT_CONTINUE_SCAN:
+                                (yy_c_buf_p) =
+                                        (yytext_ptr) + yy_amount_of_matched_text;
+
+                                yy_current_state = yy_get_previous_state(  );
+
+                                yy_cp = (yy_c_buf_p);
+                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+                                goto yy_match;
+
+                        case EOB_ACT_LAST_MATCH:
+                                (yy_c_buf_p) =
+                                &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)];
+
+                                yy_current_state = yy_get_previous_state(  );
+
+                                yy_cp = (yy_c_buf_p);
+                                yy_bp = (yytext_ptr) + YY_MORE_ADJ;
+                                goto yy_find_action;
+                        }
+                break;
+                }
+
+        default:
+                YY_FATAL_ERROR(
+                        "fatal flex scanner internal error--no action found" );
+        } /* end of action switch */
+                } /* end of scanning one token */
+} /* end of yylex */
+
+/* yy_get_next_buffer - try to read in a new buffer
+ *
+ * Returns a code representing an action:
+ *      EOB_ACT_LAST_MATCH -
+ *      EOB_ACT_CONTINUE_SCAN - continue scanning from current position
+ *      EOB_ACT_END_OF_FILE - end of file
+ */
+static int yy_get_next_buffer (void)
+{
+        register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+        register char *source = (yytext_ptr);
+        register int number_to_move, i;
+        int ret_val;
+
+        if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
+                YY_FATAL_ERROR(
+                "fatal flex scanner internal error--end of buffer missed" );
+
+        if ( YY_CURRENT_BUFFER_LVALUE->yy_fill_buffer == 0 )
+                { /* Don't try to fill the buffer, so this is an EOF. */
+                if ( (yy_c_buf_p) - (yytext_ptr) - YY_MORE_ADJ == 1 )
+                        {
+                        /* We matched a single character, the EOB, so
+                         * treat this as a final EOF.
+                         */
+                        return EOB_ACT_END_OF_FILE;
+                        }
+
+                else
+                        {
+                        /* We matched some text prior to the EOB, first
+                         * process it.
+                         */
+                        return EOB_ACT_LAST_MATCH;
+                        }
+                }
+
+        /* Try to read more data. */
+
+        /* First move last chars to start of buffer. */
+        number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+
+        for ( i = 0; i < number_to_move; ++i )
+                *(dest++) = *(source++);
+
+        if ( YY_CURRENT_BUFFER_LVALUE->yy_buffer_status == YY_BUFFER_EOF_PENDING )
+                /* don't do the read, it's not guaranteed to return an EOF,
+                 * just force an EOF
+                 */
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars) = 0;
+
+        else
+                {
+                        int num_to_read =
+                        YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
+
+                while ( num_to_read <= 0 )
+                        { /* Not enough room in the buffer - grow it. */
+
+                        /* just a shorter name for the current buffer */
+                        YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+
+                        int yy_c_buf_p_offset =
+                                (int) ((yy_c_buf_p) - b->yy_ch_buf);
+
+                        if ( b->yy_is_our_buffer )
+                                {
+                                int new_size = b->yy_buf_size * 2;
+
+                                if ( new_size <= 0 )
+                                        b->yy_buf_size += b->yy_buf_size / 8;
+                                else
+                                        b->yy_buf_size *= 2;
+
+                                b->yy_ch_buf = (char *)
+                                        /* Include room in for 2 EOB chars. */
+                                        yyrealloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+                                }
+                        else
+                                /* Can't grow it, we don't own it. */
+                                b->yy_ch_buf = 0;
+
+                        if ( ! b->yy_ch_buf )
+                                YY_FATAL_ERROR(
+                                "fatal error - scanner input buffer overflow" );
+
+                        (yy_c_buf_p) = &b->yy_ch_buf[yy_c_buf_p_offset];
+
+                        num_to_read = YY_CURRENT_BUFFER_LVALUE->yy_buf_size -
+                                                number_to_move - 1;
+
+                        }
+
+                if ( num_to_read > YY_READ_BUF_SIZE )
+                        num_to_read = YY_READ_BUF_SIZE;
+
+                /* Read in more data. */
+                YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
+                        (yy_n_chars), (size_t) num_to_read );
+
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+                }
+
+        if ( (yy_n_chars) == 0 )
+                {
+                if ( number_to_move == YY_MORE_ADJ )
+                        {
+                        ret_val = EOB_ACT_END_OF_FILE;
+                        yyrestart(yyin  );
+                        }
+
+                else
+                        {
+                        ret_val = EOB_ACT_LAST_MATCH;
+                        YY_CURRENT_BUFFER_LVALUE->yy_buffer_status =
+                                YY_BUFFER_EOF_PENDING;
+                        }
+                }
+
+        else
+                ret_val = EOB_ACT_CONTINUE_SCAN;
+
+        (yy_n_chars) += number_to_move;
+        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
+        YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
+
+        (yytext_ptr) = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[0];
+
+        return ret_val;
+}
+
+/* yy_get_previous_state - get the state just before the EOB char was reached */
+
+    static yy_state_type yy_get_previous_state (void)
+{
+        register yy_state_type yy_current_state;
+        register char *yy_cp;
+    
+        yy_current_state = (yy_start);
+
+        for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
+                {
+                register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+                if ( yy_accept[yy_current_state] )
+                        {
+                        (yy_last_accepting_state) = yy_current_state;
+                        (yy_last_accepting_cpos) = yy_cp;
+                        }
+                while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+                        {
+                        yy_current_state = (int) yy_def[yy_current_state];
+                        if ( yy_current_state >= 94 )
+                                yy_c = yy_meta[(unsigned int) yy_c];
+                        }
+                yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+                }
+
+        return yy_current_state;
+}
+
+/* yy_try_NUL_trans - try to make a transition on the NUL character
+ *
+ * synopsis
+ *      next_state = yy_try_NUL_trans( current_state );
+ */
+    static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
+{
+        register int yy_is_jam;
+        register char *yy_cp = (yy_c_buf_p);
+
+        register YY_CHAR yy_c = 1;
+        if ( yy_accept[yy_current_state] )
+                {
+                (yy_last_accepting_state) = yy_current_state;
+                (yy_last_accepting_cpos) = yy_cp;
+                }
+        while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
+                {
+                yy_current_state = (int) yy_def[yy_current_state];
+                if ( yy_current_state >= 94 )
+                        yy_c = yy_meta[(unsigned int) yy_c];
+                }
+        yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+        yy_is_jam = (yy_current_state == 93);
+
+        return yy_is_jam ? 0 : yy_current_state;
+}
+
+#ifndef YY_NO_INPUT
+#ifdef __cplusplus
+    static int yyinput (void)
+#else
+    static int input  (void)
+#endif
+
+{
+        int c;
+    
+        *(yy_c_buf_p) = (yy_hold_char);
+
+        if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR )
+                {
+                /* yy_c_buf_p now points to the character we want to return.
+                 * If this occurs *before* the EOB characters, then it's a
+                 * valid NUL; if not, then we've hit the end of the buffer.
+                 */
+                if ( (yy_c_buf_p) < &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] )
+                        /* This was really a NUL. */
+                        *(yy_c_buf_p) = '\0';
+
+                else
+                        { /* need more input */
+                        int offset = (yy_c_buf_p) - (yytext_ptr);
+                        ++(yy_c_buf_p);
+
+                        switch ( yy_get_next_buffer(  ) )
+                                {
+                                case EOB_ACT_LAST_MATCH:
+                                        /* This happens because yy_g_n_b()
+                                         * sees that we've accumulated a
+                                         * token and flags that we need to
+                                         * try matching the token before
+                                         * proceeding.  But for input(),
+                                         * there's no matching to consider.
+                                         * So convert the EOB_ACT_LAST_MATCH
+                                         * to EOB_ACT_END_OF_FILE.
+                                         */
+
+                                        /* Reset buffer status. */
+                                        yyrestart(yyin );
+
+                                        /*FALLTHROUGH*/
+
+                                case EOB_ACT_END_OF_FILE:
+                                        {
+                                        if ( yywrap( ) )
+                                                return EOF;
+
+                                        if ( ! (yy_did_buffer_switch_on_eof) )
+                                                YY_NEW_FILE;
+#ifdef __cplusplus
+                                        return yyinput();
+#else
+                                        return input();
+#endif
+                                        }
+
+                                case EOB_ACT_CONTINUE_SCAN:
+                                        (yy_c_buf_p) = (yytext_ptr) + offset;
+                                        break;
+                                }
+                        }
+                }
+
+        c = *(unsigned char *) (yy_c_buf_p);    /* cast for 8-bit char's */
+        *(yy_c_buf_p) = '\0';   /* preserve yytext */
+        (yy_hold_char) = *++(yy_c_buf_p);
+
+        if ( c == '\n' )
+                   
+    yylineno++;
+;
+
+        return c;
+}
+#endif  /* ifndef YY_NO_INPUT */
+
+/** Immediately switch to a different input stream.
+ * @param input_file A readable stream.
+ * 
+ * @note This function does not reset the start condition to @c INITIAL .
+ */
+    void yyrestart  (FILE * input_file )
+{
+    
+        if ( ! YY_CURRENT_BUFFER ){
+        yyensure_buffer_stack ();
+                YY_CURRENT_BUFFER_LVALUE =
+            yy_create_buffer(yyin,YY_BUF_SIZE );
+        }
+
+        yy_init_buffer(YY_CURRENT_BUFFER,input_file );
+        yy_load_buffer_state( );
+}
+
+/** Switch to a different input buffer.
+ * @param new_buffer The new input buffer.
+ * 
+ */
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+{
+    
+        /* TODO. We should be able to replace this entire function body
+         * with
+         *              yypop_buffer_state();
+         *              yypush_buffer_state(new_buffer);
+     */
+        yyensure_buffer_stack ();
+        if ( YY_CURRENT_BUFFER == new_buffer )
+                return;
+
+        if ( YY_CURRENT_BUFFER )
+                {
+                /* Flush out information for old buffer. */
+                *(yy_c_buf_p) = (yy_hold_char);
+                YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+                }
+
+        YY_CURRENT_BUFFER_LVALUE = new_buffer;
+        yy_load_buffer_state( );
+
+        /* We don't actually know whether we did this switch during
+         * EOF (yywrap()) processing, but the only time this flag
+         * is looked at is after yywrap() is called, so it's safe
+         * to go ahead and always set it.
+         */
+        (yy_did_buffer_switch_on_eof) = 1;
+}
+
+static void yy_load_buffer_state  (void)
+{
+        (yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
+        (yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
+        yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+        (yy_hold_char) = *(yy_c_buf_p);
+}
+
+/** Allocate and initialize an input buffer state.
+ * @param file A readable stream.
+ * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE.
+ * 
+ * @return the allocated buffer state.
+ */
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
+{
+        YY_BUFFER_STATE b;
+    
+        b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+        if ( ! b )
+                YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+        b->yy_buf_size = size;
+
+        /* yy_ch_buf has to be 2 characters longer than the size given because
+         * we need to put in 2 end-of-buffer characters.
+         */
+        b->yy_ch_buf = (char *) yyalloc(b->yy_buf_size + 2  );
+        if ( ! b->yy_ch_buf )
+                YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
+
+        b->yy_is_our_buffer = 1;
+
+        yy_init_buffer(b,file );
+
+        return b;
+}
+
+/** Destroy the buffer.
+ * @param b a buffer created with yy_create_buffer()
+ * 
+ */
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
+{
+    
+        if ( ! b )
+                return;
+
+        if ( b == YY_CURRENT_BUFFER ) /* Not sure if we should pop here. */
+                YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
+
+        if ( b->yy_is_our_buffer )
+                yyfree((void *) b->yy_ch_buf  );
+
+        yyfree((void *) b  );
+}
+
+#ifndef __cplusplus
+extern int isatty (int );
+#endif /* __cplusplus */
+    
+/* Initializes or reinitializes a buffer.
+ * This function is sometimes called more than once on the same buffer,
+ * such as during a yyrestart() or at EOF.
+ */
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+
+{
+        int oerrno = errno;
+    
+        yy_flush_buffer(b );
+
+        b->yy_input_file = file;
+        b->yy_fill_buffer = 1;
+
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
+     * In that case, we don't want to reset the lineno or column.
+     */
+    if (b != YY_CURRENT_BUFFER){
+        b->yy_bs_lineno = 1;
+        b->yy_bs_column = 0;
+    }
+
+        b->yy_is_interactive = file ? (isatty( fileno(file) ) > 0) : 0;
+    
+        errno = oerrno;
+}
+
+/** Discard all buffered characters. On the next scan, YY_INPUT will be called.
+ * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
+ * 
+ */
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
+{
+        if ( ! b )
+                return;
+
+        b->yy_n_chars = 0;
+
+        /* We always need two end-of-buffer characters.  The first causes
+         * a transition to the end-of-buffer state.  The second causes
+         * a jam in that state.
+         */
+        b->yy_ch_buf[0] = YY_END_OF_BUFFER_CHAR;
+        b->yy_ch_buf[1] = YY_END_OF_BUFFER_CHAR;
+
+        b->yy_buf_pos = &b->yy_ch_buf[0];
+
+        b->yy_at_bol = 1;
+        b->yy_buffer_status = YY_BUFFER_NEW;
+
+        if ( b == YY_CURRENT_BUFFER )
+                yy_load_buffer_state( );
+}
+
+/** Pushes the new state onto the stack. The new state becomes
+ *  the current state. This function will allocate the stack
+ *  if necessary.
+ *  @param new_buffer The new state.
+ *  
+ */
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
+{
+        if (new_buffer == NULL)
+                return;
+
+        yyensure_buffer_stack();
+
+        /* This block is copied from yy_switch_to_buffer. */
+        if ( YY_CURRENT_BUFFER )
+                {
+                /* Flush out information for old buffer. */
+                *(yy_c_buf_p) = (yy_hold_char);
+                YY_CURRENT_BUFFER_LVALUE->yy_buf_pos = (yy_c_buf_p);
+                YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
+                }
+
+        /* Only push if top exists. Otherwise, replace top. */
+        if (YY_CURRENT_BUFFER)
+                (yy_buffer_stack_top)++;
+        YY_CURRENT_BUFFER_LVALUE = new_buffer;
+
+        /* copied from yy_switch_to_buffer. */
+        yy_load_buffer_state( );
+        (yy_did_buffer_switch_on_eof) = 1;
+}
+
+/** Removes and deletes the top of the stack, if present.
+ *  The next element becomes the new top.
+ *  
+ */
+void yypop_buffer_state (void)
+{
+        if (!YY_CURRENT_BUFFER)
+                return;
+
+        yy_delete_buffer(YY_CURRENT_BUFFER );
+        YY_CURRENT_BUFFER_LVALUE = NULL;
+        if ((yy_buffer_stack_top) > 0)
+                --(yy_buffer_stack_top);
+
+        if (YY_CURRENT_BUFFER) {
+                yy_load_buffer_state( );
+                (yy_did_buffer_switch_on_eof) = 1;
+        }
+}
+
+/* Allocates the stack if it does not exist.
+ *  Guarantees space for at least one push.
+ */
+static void yyensure_buffer_stack (void)
+{
+        int num_to_alloc;
+    
+        if (!(yy_buffer_stack)) {
+
+                /* First allocation is just for 2 elements, since we don't know if this
+                 * scanner will even need a stack. We use 2 instead of 1 to avoid an
+                 * immediate realloc on the next call.
+         */
+                num_to_alloc = 1;
+                (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
+                                                                (num_to_alloc * sizeof(struct yy_buffer_state*)
+                                                                );
+                
+                memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
+                                
+                (yy_buffer_stack_max) = num_to_alloc;
+                (yy_buffer_stack_top) = 0;
+                return;
+        }
+
+        if ((yy_buffer_stack_top) >= ((yy_buffer_stack_max)) - 1){
+
+                /* Increase the buffer to prepare for a possible push. */
+                int grow_size = 8 /* arbitrary grow size */;
+
+                num_to_alloc = (yy_buffer_stack_max) + grow_size;
+                (yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
+                                                                ((yy_buffer_stack),
+                                                                num_to_alloc * sizeof(struct yy_buffer_state*)
+                                                                );
+
+                /* zero only the new slots.*/
+                memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
+                (yy_buffer_stack_max) = num_to_alloc;
+        }
+}
+
+/** Setup the input buffer state to scan directly from a user-specified character buffer.
+ * @param base the character buffer
+ * @param size the size in bytes of the character buffer
+ * 
+ * @return the newly allocated buffer state object. 
+ */
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
+{
+        YY_BUFFER_STATE b;
+    
+        if ( size < 2 ||
+             base[size-2] != YY_END_OF_BUFFER_CHAR ||
+             base[size-1] != YY_END_OF_BUFFER_CHAR )
+                /* They forgot to leave room for the EOB's. */
+                return 0;
+
+        b = (YY_BUFFER_STATE) yyalloc(sizeof( struct yy_buffer_state )  );
+        if ( ! b )
+                YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
+
+        b->yy_buf_size = size - 2;      /* "- 2" to take care of EOB's */
+        b->yy_buf_pos = b->yy_ch_buf = base;
+        b->yy_is_our_buffer = 0;
+        b->yy_input_file = 0;
+        b->yy_n_chars = b->yy_buf_size;
+        b->yy_is_interactive = 0;
+        b->yy_at_bol = 1;
+        b->yy_fill_buffer = 0;
+        b->yy_buffer_status = YY_BUFFER_NEW;
+
+        yy_switch_to_buffer(b  );
+
+        return b;
+}
+
+/** Setup the input buffer state to scan a string. The next call to yylex() will
+ * scan from a @e copy of @a str.
+ * @param yystr a NUL-terminated string to scan
+ * 
+ * @return the newly allocated buffer state object.
+ * @note If you want to scan bytes that may contain NUL values, then use
+ *       yy_scan_bytes() instead.
+ */
+YY_BUFFER_STATE yy_scan_string (yyconst char * yystr )
+{
+    
+        return yy_scan_bytes(yystr,strlen(yystr) );
+}
+
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
+ * scan from a @e copy of @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * 
+ * @return the newly allocated buffer state object.
+ */
+YY_BUFFER_STATE yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+{
+        YY_BUFFER_STATE b;
+        char *buf;
+        yy_size_t n;
+        int i;
+    
+        /* Get memory for full buffer, including space for trailing EOB's. */
+        n = _yybytes_len + 2;
+        buf = (char *) yyalloc(n  );
+        if ( ! buf )
+                YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
+
+        for ( i = 0; i < _yybytes_len; ++i )
+                buf[i] = yybytes[i];
+
+        buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
+
+        b = yy_scan_buffer(buf,n );
+        if ( ! b )
+                YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
+
+        /* It's okay to grow etc. this buffer, and we should throw it
+         * away when we're done.
+         */
+        b->yy_is_our_buffer = 1;
+
+        return b;
+}
+
+#ifndef YY_EXIT_FAILURE
+#define YY_EXIT_FAILURE 2
+#endif
+
+static void yy_fatal_error (yyconst char* msg )
+{
+        (void) fprintf( stderr, "%s\n", msg );
+        exit( YY_EXIT_FAILURE );
+}
+
+/* Redefine yyless() so it works in section 3 code. */
+
+#undef yyless
+#define yyless(n) \
+        do \
+                { \
+                /* Undo effects of setting up yytext. */ \
+        int yyless_macro_arg = (n); \
+        YY_LESS_LINENO(yyless_macro_arg);\
+                yytext[yyleng] = (yy_hold_char); \
+                (yy_c_buf_p) = yytext + yyless_macro_arg; \
+                (yy_hold_char) = *(yy_c_buf_p); \
+                *(yy_c_buf_p) = '\0'; \
+                yyleng = yyless_macro_arg; \
+                } \
+        while ( 0 )
+
+/* Accessor  methods (get/set functions) to struct members. */
+
+/** Get the current line number.
+ * 
+ */
+int yyget_lineno  (void)
+{
+        
+    return yylineno;
+}
+
+/** Get the input stream.
+ * 
+ */
+FILE *yyget_in  (void)
+{
+        return yyin;
+}
+
+/** Get the output stream.
+ * 
+ */
+FILE *yyget_out  (void)
+{
+        return yyout;
+}
+
+/** Get the length of the current token.
+ * 
+ */
+int yyget_leng  (void)
+{
+        return yyleng;
+}
+
+/** Get the current token.
+ * 
+ */
+
+char *yyget_text  (void)
+{
+        return yytext;
+}
+
+/** Set the current line number.
+ * @param line_number
+ * 
+ */
+void yyset_lineno (int  line_number )
+{
+    
+    yylineno = line_number;
+}
+
+/** Set the input stream. This does not discard the current
+ * input buffer.
+ * @param in_str A readable stream.
+ * 
+ * @see yy_switch_to_buffer
+ */
+void yyset_in (FILE *  in_str )
+{
+        yyin = in_str ;
+}
+
+void yyset_out (FILE *  out_str )
+{
+        yyout = out_str ;
+}
+
+int yyget_debug  (void)
+{
+        return yy_flex_debug;
+}
+
+void yyset_debug (int  bdebug )
+{
+        yy_flex_debug = bdebug ;
+}
+
+static int yy_init_globals (void)
+{
+        /* Initialization is the same as for the non-reentrant scanner.
+     * This function is called from yylex_destroy(), so don't allocate here.
+     */
+
+    /* We do not touch yylineno unless the option is enabled. */
+    yylineno =  1;
+    
+    (yy_buffer_stack) = 0;
+    (yy_buffer_stack_top) = 0;
+    (yy_buffer_stack_max) = 0;
+    (yy_c_buf_p) = (char *) 0;
+    (yy_init) = 0;
+    (yy_start) = 0;
+
+/* Defined in main.c */
+#ifdef YY_STDINIT
+    yyin = stdin;
+    yyout = stdout;
+#else
+    yyin = (FILE *) 0;
+    yyout = (FILE *) 0;
+#endif
+
+    /* For future reference: Set errno on error, since we are called by
+     * yylex_init()
+     */
+    return 0;
+}
+
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
+{
+    
+    /* Pop the buffer stack, destroying each element. */
+        while(YY_CURRENT_BUFFER){
+                yy_delete_buffer(YY_CURRENT_BUFFER  );
+                YY_CURRENT_BUFFER_LVALUE = NULL;
+                yypop_buffer_state();
+        }
+
+        /* Destroy the stack itself. */
+        yyfree((yy_buffer_stack) );
+        (yy_buffer_stack) = NULL;
+
+    /* Reset the globals. This is important in a non-reentrant scanner so the next time
+     * yylex() is called, initialization will occur. */
+    yy_init_globals( );
+
+    return 0;
+}
+
+/*
+ * Internal utility routines.
+ */
+
+#ifndef yytext_ptr
+static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+{
+        register int i;
+        for ( i = 0; i < n; ++i )
+                s1[i] = s2[i];
+}
+#endif
+
+#ifdef YY_NEED_STRLEN
+static int yy_flex_strlen (yyconst char * s )
+{
+        register int n;
+        for ( n = 0; s[n]; ++n )
+                ;
+
+        return n;
+}
+#endif
+
+void *yyalloc (yy_size_t  size )
+{
+        return (void *) malloc( size );
+}
+
+void *yyrealloc  (void * ptr, yy_size_t  size )
+{
+        /* The cast to (char *) in the following accommodates both
+         * implementations that use char* generic pointers, and those
+         * that use void* generic pointers.  It works with the latter
+         * because both ANSI C and C++ allow castless assignment from
+         * any pointer type to void*, and deal with argument conversions
+         * as though doing an assignment.
+         */
+        return (void *) realloc( (char *) ptr, size );
+}
+
+void yyfree (void * ptr )
+{
+        free( (char *) ptr );   /* see yyrealloc() for (char *) cast */
+}
+
+#define YYTABLES_NAME "yytables"
+
+#line 222 "dtc-lexer.l"
+
+
+
+
+/*
+ * Stack of nested include file contexts.
+ */
+
+struct incl_file {
+        int filenum;
+        FILE *file;
+        YY_BUFFER_STATE yy_prev_buf;
+        int yy_prev_lineno;
+        struct incl_file *prev;
+};
+
+struct incl_file *incl_file_stack;
+
+
+/*
+ * Detect infinite include recursion.
+ */
+#define MAX_INCLUDE_DEPTH       (100)
+
+static int incl_depth = 0;
+
+
+int push_input_file(const char *filename)
+{
+        FILE *f;
+        struct incl_file *incl_file;
+
+        if (!filename) {
+                yyerror("No include file name given.");
+                return 0;
+        }
+
+        if (incl_depth++ >= MAX_INCLUDE_DEPTH) {
+                yyerror("Includes nested too deeply");
+                return 0;
+        }
+
+        f = dtc_open_file(filename);
+
+        incl_file = malloc(sizeof(struct incl_file));
+        if (!incl_file) {
+                yyerror("Can not allocate include file space.");
+                return 0;
+        }
+
+        /*
+         * Save current context.
+         */
+        incl_file->yy_prev_buf = YY_CURRENT_BUFFER;
+        incl_file->yy_prev_lineno = yylineno;
+        incl_file->filenum = srcpos_filenum;
+        incl_file->file = yyin;
+        incl_file->prev = incl_file_stack;
+
+        incl_file_stack = incl_file;
+
+        /*
+         * Establish new context.
+         */
+        srcpos_filenum = lookup_file_name(filename, 0);
+        yylineno = 1;
+        yyin = f;
+        yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE));
+
+        return 1;
+}
+
+
+int pop_input_file(void)
+{
+        struct incl_file *incl_file;
+
+        if (incl_file_stack == 0)
+                return 0;
+
+        fclose(yyin);
+
+        /*
+         * Pop.
+         */
+        --incl_depth;
+        incl_file = incl_file_stack;
+        incl_file_stack = incl_file->prev;
+
+        /*
+         * Recover old context.
+         */
+        yy_delete_buffer(YY_CURRENT_BUFFER);
+        yy_switch_to_buffer(incl_file->yy_prev_buf);
+        yylineno = incl_file->yy_prev_lineno;
+        srcpos_filenum = incl_file->filenum;
+        yyin = incl_file->file;
+
+        /*
+         * Free old state.
+         */
+        free(incl_file);
+
+        if (YY_CURRENT_BUFFER == 0)
+                return 0;
+
+        return 1;
+}
+
diff --git a/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped b/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped
new file mode 100644
index 000000000000..28e6ec0296a1
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped
@@ -0,0 +1,1983 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 1
+
+
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     DT_V1 = 258,
+     DT_MEMRESERVE = 259,
+     DT_PROPNODENAME = 260,
+     DT_LITERAL = 261,
+     DT_LEGACYLITERAL = 262,
+     DT_BASE = 263,
+     DT_BYTE = 264,
+     DT_STRING = 265,
+     DT_LABEL = 266,
+     DT_REF = 267
+   };
+#endif
+/* Tokens.  */
+#define DT_V1 258
+#define DT_MEMRESERVE 259
+#define DT_PROPNODENAME 260
+#define DT_LITERAL 261
+#define DT_LEGACYLITERAL 262
+#define DT_BASE 263
+#define DT_BYTE 264
+#define DT_STRING 265
+#define DT_LABEL 266
+#define DT_REF 267
+
+
+
+
+/* Copy the first part of user declarations.  */
+#line 23 "dtc-parser.y"
+
+#include "dtc.h"
+#include "srcpos.h"
+
+int yylex(void);
+unsigned long long eval_literal(const char *s, int base, int bits);
+
+extern struct boot_info *the_boot_info;
+
+
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+# undef YYERROR_VERBOSE
+# define YYERROR_VERBOSE 1
+#else
+# define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+# define YYTOKEN_TABLE 0
+#endif
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 34 "dtc-parser.y"
+{
+        char *propnodename;
+        char *literal;
+        char *labelref;
+        unsigned int cbase;
+        u8 byte;
+        struct data data;
+
+        u64 addr;
+        cell_t cell;
+        struct property *prop;
+        struct property *proplist;
+        struct node *node;
+        struct node *nodelist;
+        struct reserve_info *re;
+}
+/* Line 187 of yacc.c.  */
+#line 148 "dtc-parser.tab.c"
+        YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
+typedef struct YYLTYPE
+{
+  int first_line;
+  int first_column;
+  int last_line;
+  int last_column;
+} YYLTYPE;
+# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
+# define YYLTYPE_IS_DECLARED 1
+# define YYLTYPE_IS_TRIVIAL 1
+#endif
+
+
+/* Copy the second part of user declarations.  */
+
+
+/* Line 216 of yacc.c.  */
+#line 173 "dtc-parser.tab.c"
+
+#ifdef short
+# undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+# ifdef __SIZE_TYPE__
+#  define YYSIZE_T __SIZE_TYPE__
+# elif defined size_t
+#  define YYSIZE_T size_t
+# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYSIZE_T size_t
+# else
+#  define YYSIZE_T unsigned int
+# endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
+
+#ifndef YY_
+# if YYENABLE_NLS
+#  if ENABLE_NLS
+#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#  endif
+# endif
+# ifndef YY_
+#  define YY_(msgid) msgid
+# endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if ! defined lint || defined __GNUC__
+# define YYUSE(e) ((void) (e))
+#else
+# define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+# define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static int
+YYID (int i)
+#else
+static int
+YYID (i)
+    int i;
+#endif
+{
+  return i;
+}
+#endif
+
+#if ! defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+# ifdef YYSTACK_USE_ALLOCA
+#  if YYSTACK_USE_ALLOCA
+#   ifdef __GNUC__
+#    define YYSTACK_ALLOC __builtin_alloca
+#   elif defined __BUILTIN_VA_ARG_INCR
+#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#    define alloca _alloca
+#   else
+#    define YYSTACK_ALLOC alloca
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
+#     endif
+#    endif
+#   endif
+#  endif
+# endif
+
+# ifdef YYSTACK_ALLOC
+   /* Pacify GCC's `empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+    /* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#  endif
+# else
+#  define YYSTACK_ALLOC YYMALLOC
+#  define YYSTACK_FREE YYFREE
+#  ifndef YYSTACK_ALLOC_MAXIMUM
+#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#  endif
+#  if (defined __cplusplus && ! defined _STDLIB_H \
+       && ! ((defined YYMALLOC || defined malloc) \
+             && (defined YYFREE || defined free)))
+#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
+#   endif
+#  endif
+#  ifndef YYMALLOC
+#   define YYMALLOC malloc
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+#  ifndef YYFREE
+#   define YYFREE free
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+void free (void *); /* INFRINGES ON USER NAME SPACE */
+#   endif
+#  endif
+# endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+
+#if (! defined yyoverflow \
+     && (! defined __cplusplus \
+         || (defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL \
+             && defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc
+{
+  yytype_int16 yyss;
+  YYSTYPE yyvs;
+    YYLTYPE yyls;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+# define YYSTACK_BYTES(N) \
+     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE) + sizeof (YYLTYPE)) \
+      + 2 * YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (To)[yyi] = (From)[yyi];            \
+        }                                       \
+      while (YYID (0))
+#  endif
+# endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+# define YYSTACK_RELOCATE(Stack)                                        \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack, Stack, yysize);                          \
+        Stack = &yyptr->Stack;                                          \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (YYID (0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL  9
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST   60
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS  24
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS  20
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES  43
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES  67
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK  2
+#define YYMAXUTOK   267
+
+#define YYTRANSLATE(YYX)                                                \
+  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] =
+{
+       0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,    23,    14,     2,    15,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,    13,
+      19,    18,    20,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,    21,     2,    22,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,    16,     2,    17,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     1,     2,     3,     4,
+       5,     6,     7,     8,     9,    10,    11,    12
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint8 yyprhs[] =
+{
+       0,     0,     3,     8,    11,    12,    15,    21,    22,    25,
+      27,    34,    36,    38,    41,    47,    48,    51,    57,    61,
+      64,    69,    74,    77,    80,    81,    84,    87,    88,    91,
+      94,    97,    98,   100,   102,   105,   106,   109,   112,   113,
+     116,   119,   123,   124
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] =
+{
+      25,     0,    -1,     3,    13,    26,    31,    -1,    28,    31,
+      -1,    -1,    27,    26,    -1,    43,     4,    30,    30,    13,
+      -1,    -1,    29,    28,    -1,    27,    -1,    43,     4,    30,
+      14,    30,    13,    -1,     6,    -1,     7,    -1,    15,    32,
+      -1,    16,    33,    41,    17,    13,    -1,    -1,    33,    34,
+      -1,    43,     5,    18,    35,    13,    -1,    43,     5,    13,
+      -1,    36,    10,    -1,    36,    19,    37,    20,    -1,    36,
+      21,    40,    22,    -1,    36,    12,    -1,    35,    11,    -1,
+      -1,    35,    23,    -1,    36,    11,    -1,    -1,    37,    39,
+      -1,    37,    12,    -1,    37,    11,    -1,    -1,     8,    -1,
+       6,    -1,    38,     7,    -1,    -1,    40,     9,    -1,    40,
+      11,    -1,    -1,    42,    41,    -1,    42,    34,    -1,    43,
+       5,    32,    -1,    -1,    11,    -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint16 yyrline[] =
+{
+       0,    85,    85,    89,    97,   100,   107,   115,   118,   125,
+     129,   136,   140,   147,   154,   162,   165,   172,   176,   183,
+     187,   191,   195,   199,   207,   210,   214,   222,   225,   229,
+     234,   242,   245,   249,   253,   261,   264,   268,   276,   279,
+     283,   291,   299,   302
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char *const yytname[] =
+{
+  "$end", "error", "$undefined", "DT_V1", "DT_MEMRESERVE",
+  "DT_PROPNODENAME", "DT_LITERAL", "DT_LEGACYLITERAL", "DT_BASE",
+  "DT_BYTE", "DT_STRING", "DT_LABEL", "DT_REF", "';'", "'-'", "'/'", "'{'",
+  "'}'", "'='", "'<'", "'>'", "'['", "']'", "','", "$accept", "sourcefile",
+  "memreserves", "memreserve", "v0_memreserves", "v0_memreserve", "addr",
+  "devicetree", "nodedef", "proplist", "propdef", "propdata",
+  "propdataprefix", "celllist", "cellbase", "cellval", "bytestring",
+  "subnodes", "subnode", "label", 0
+};
+#endif
+
+# ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,    59,    45,    47,   123,   125,    61,    60,
+      62,    91,    93,    44
+};
+# endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    24,    25,    25,    26,    26,    27,    28,    28,    29,
+      29,    30,    30,    31,    32,    33,    33,    34,    34,    35,
+      35,    35,    35,    35,    36,    36,    36,    37,    37,    37,
+      37,    38,    38,    39,    39,    40,    40,    40,    41,    41,
+      41,    42,    43,    43
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     4,     2,     0,     2,     5,     0,     2,     1,
+       6,     1,     1,     2,     5,     0,     2,     5,     3,     2,
+       4,     4,     2,     2,     0,     2,     2,     0,     2,     2,
+       2,     0,     1,     1,     2,     0,     2,     2,     0,     2,
+       2,     3,     0,     1
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] =
+{
+       7,     0,    43,     0,     9,     0,     7,     0,     4,     1,
+       0,     3,     8,     0,     0,     4,     0,    15,    13,    11,
+      12,     0,     2,     5,     0,    38,     0,     0,     0,    16,
+       0,    38,     0,     0,     6,     0,    40,    39,     0,    10,
+      14,    18,    24,    41,     0,     0,    23,    17,    25,    19,
+      26,    22,    27,    35,    31,     0,    33,    32,    30,    29,
+      20,     0,    28,    36,    37,    21,    34
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] =
+{
+      -1,     3,    14,     4,     5,     6,    27,    11,    18,    25,
+      29,    44,    45,    54,    61,    62,    55,    30,    31,     7
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -13
+static const yytype_int8 yypact[] =
+{
+      23,    11,   -13,    37,   -13,    -4,    18,    39,    18,   -13,
+      28,   -13,   -13,    34,    -4,    18,    41,   -13,   -13,   -13,
+     -13,    25,   -13,   -13,    34,    -3,    34,    33,    34,   -13,
+      30,    -3,    43,    36,   -13,    38,   -13,   -13,    20,   -13,
+     -13,   -13,   -13,   -13,     2,     9,   -13,   -13,   -13,   -13,
+     -13,   -13,   -13,   -13,    -2,    -6,   -13,   -13,   -13,   -13,
+     -13,    45,   -13,   -13,   -13,   -13,   -13
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] =
+{
+     -13,   -13,    35,    27,    47,   -13,   -12,    40,    17,   -13,
+      26,   -13,   -13,   -13,   -13,   -13,   -13,    29,   -13,    -8
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -43
+static const yytype_int8 yytable[] =
+{
+      16,    21,   -42,    63,    56,    64,    57,    16,     2,    58,
+      59,    10,    28,    46,    33,    47,    65,    32,    60,    49,
+      50,    51,   -42,    32,     8,    48,     1,   -42,    52,     2,
+      53,    19,    20,    41,     2,    15,    17,     9,    42,    26,
+      19,    20,    15,    13,    17,    24,    34,    35,    38,    39,
+      23,    40,    66,    12,    22,    43,     0,    36,     0,     0,
+      37
+};
+
+static const yytype_int8 yycheck[] =
+{
+       8,    13,     5,     9,     6,    11,     8,    15,    11,    11,
+      12,    15,    24,    11,    26,    13,    22,    25,    20,    10,
+      11,    12,     4,    31,    13,    23,     3,     4,    19,    11,
+      21,     6,     7,    13,    11,     8,    16,     0,    18,    14,
+       6,     7,    15,     4,    16,     4,    13,    17,     5,    13,
+      15,    13,     7,     6,    14,    38,    -1,    31,    -1,    -1,
+      31
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] =
+{
+       0,     3,    11,    25,    27,    28,    29,    43,    13,     0,
+      15,    31,    28,     4,    26,    27,    43,    16,    32,     6,
+       7,    30,    31,    26,     4,    33,    14,    30,    30,    34,
+      41,    42,    43,    30,    13,    17,    34,    41,     5,    13,
+      13,    13,    18,    32,    35,    36,    11,    13,    23,    10,
+      11,    12,    19,    21,    37,    40,     6,     8,    11,    12,
+      20,    38,    39,     9,    11,    22,     7
+};
+
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
+
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
+
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL          goto yyerrlab
+
+#define YYRECOVERING()  (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY && yylen == 1)                          \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      yytoken = YYTRANSLATE (yychar);                           \
+      YYPOPSTACK (1);                                           \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
+      yyerror (YY_("syntax error: cannot back up")); \
+      YYERROR;                                                  \
+    }                                                           \
+while (YYID (0))
+
+
+#define YYTERROR        1
+#define YYERRCODE       256
+
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+# define YYLLOC_DEFAULT(Current, Rhs, N)                                \
+    do                                                                  \
+      if (YYID (N))                                                    \
+        {                                                               \
+          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
+          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
+          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
+          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).first_line   = (Current).last_line   =              \
+            YYRHSLOC (Rhs, 0).last_line;                                \
+          (Current).first_column = (Current).last_column =              \
+            YYRHSLOC (Rhs, 0).last_column;                              \
+        }                                                               \
+    while (YYID (0))
+#endif
+
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)                  \
+     fprintf (File, "%d.%d-%d.%d",                      \
+              (Loc).first_line, (Loc).first_column,     \
+              (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
+#endif
+
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+# define YYLEX yylex (YYLEX_PARAM)
+#else
+# define YYLEX yylex ()
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+# ifndef YYFPRINTF
+#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#  define YYFPRINTF fprintf
+# endif
+
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (YYID (0))
+
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value, Location); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (YYID (0))
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
+#else
+static void
+yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+    YYLTYPE const * const yylocationp;
+#endif
+{
+  if (!yyvaluep)
+    return;
+  YYUSE (yylocationp);
+# ifdef YYPRINT
+  if (yytype < YYNTOKENS)
+    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+# else
+  YYUSE (yyoutput);
+# endif
+  switch (yytype)
+    {
+      default:
+        break;
+    }
+}
+
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
+#else
+static void
+yy_symbol_print (yyoutput, yytype, yyvaluep, yylocationp)
+    FILE *yyoutput;
+    int yytype;
+    YYSTYPE const * const yyvaluep;
+    YYLTYPE const * const yylocationp;
+#endif
+{
+  if (yytype < YYNTOKENS)
+    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
+  else
+    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+
+  YY_LOCATION_PRINT (yyoutput, *yylocationp);
+  YYFPRINTF (yyoutput, ": ");
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp);
+  YYFPRINTF (yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print (yytype_int16 *bottom, yytype_int16 *top)
+#else
+static void
+yy_stack_print (bottom, top)
+    yytype_int16 *bottom;
+    yytype_int16 *top;
+#endif
+{
+  YYFPRINTF (stderr, "Stack now");
+  for (; bottom <= top; ++bottom)
+    YYFPRINTF (stderr, " %d", *bottom);
+  YYFPRINTF (stderr, "\n");
+}
+
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (YYID (0))
+
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print (YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
+#else
+static void
+yy_reduce_print (yyvsp, yylsp, yyrule)
+    YYSTYPE *yyvsp;
+    YYLTYPE *yylsp;
+    int yyrule;
+#endif
+{
+  int yynrhs = yyr2[yyrule];
+  int yyi;
+  unsigned long int yylno = yyrline[yyrule];
+  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
+             yyrule - 1, yylno);
+  /* The symbols being reduced.  */
+  for (yyi = 0; yyi < yynrhs; yyi++)
+    {
+      fprintf (stderr, "   $%d = ", yyi + 1);
+      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                       , &(yylsp[(yyi + 1) - (yynrhs)])                );
+      fprintf (stderr, "\n");
+    }
+}
+
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyvsp, yylsp, Rule); \
+} while (YYID (0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+# define YYDPRINTF(Args)
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+# define YY_STACK_PRINT(Bottom, Top)
+# define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+# define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+# define YYMAXDEPTH 10000
+#endif
+
+
+
+#if YYERROR_VERBOSE
+
+# ifndef yystrlen
+#  if defined __GLIBC__ && defined _STRING_H
+#   define yystrlen strlen
+#  else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen (const char *yystr)
+#else
+static YYSIZE_T
+yystrlen (yystr)
+    const char *yystr;
+#endif
+{
+  YYSIZE_T yylen;
+  for (yylen = 0; yystr[yylen]; yylen++)
+    continue;
+  return yylen;
+}
+#  endif
+# endif
+
+# ifndef yystpcpy
+#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#   define yystpcpy stpcpy
+#  else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static char *
+yystpcpy (char *yydest, const char *yysrc)
+#else
+static char *
+yystpcpy (yydest, yysrc)
+    char *yydest;
+    const char *yysrc;
+#endif
+{
+  char *yyd = yydest;
+  const char *yys = yysrc;
+
+  while ((*yyd++ = *yys++) != '\0')
+    continue;
+
+  return yyd - 1;
+}
+#  endif
+# endif
+
+# ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr (char *yyres, const char *yystr)
+{
+  if (*yystr == '"')
+    {
+      YYSIZE_T yyn = 0;
+      char const *yyp = yystr;
+
+      for (;;)
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
+    do_not_strip_quotes: ;
+    }
+
+  if (! yyres)
+    return yystrlen (yystr);
+
+  return yystpcpy (yyres, yystr) - yyres;
+}
+# endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
+{
+  int yyn = yypact[yystate];
+
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+         constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+                    + sizeof yyexpecting - 1
+                    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+                       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+         YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+        if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+          {
+            if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+              {
+                yycount = 1;
+                yysize = yysize0;
+                yyformat[sizeof yyunexpected - 1] = '\0';
+                break;
+              }
+            yyarg[yycount++] = yytname[yyx];
+            yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+            yysize_overflow |= (yysize1 < yysize);
+            yysize = yysize1;
+            yyfmt = yystpcpy (yyfmt, yyprefix);
+            yyprefix = yyor;
+          }
+
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
+
+      if (yysize_overflow)
+        return YYSIZE_MAXIMUM;
+
+      if (yyresult)
+        {
+          /* Avoid sprintf, as that infringes on the user's name space.
+             Don't have undefined behavior even if the translation
+             produced a string with the wrong number of "%s"s.  */
+          char *yyp = yyresult;
+          int yyi = 0;
+          while ((*yyp = *yyf) != '\0')
+            {
+              if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+                {
+                  yyp += yytnamerr (yyp, yyarg[yyi++]);
+                  yyf += 2;
+                }
+              else
+                {
+                  yyp++;
+                  yyf++;
+                }
+            }
+        }
+      return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, YYLTYPE *yylocationp)
+#else
+static void
+yydestruct (yymsg, yytype, yyvaluep, yylocationp)
+    const char *yymsg;
+    int yytype;
+    YYSTYPE *yyvaluep;
+    YYLTYPE *yylocationp;
+#endif
+{
+  YYUSE (yyvaluep);
+  YYUSE (yylocationp);
+
+  if (!yymsg)
+    yymsg = "Deleting";
+  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
+
+  switch (yytype)
+    {
+
+      default:
+        break;
+    }
+}
+
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void *YYPARSE_PARAM);
+#else
+int yyparse ();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse (void);
+#else
+int yyparse ();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+
+
+/* The look-ahead symbol.  */
+int yychar;
+
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+/* Location data for the look-ahead symbol.  */
+YYLTYPE yylloc;
+
+
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void *YYPARSE_PARAM)
+#else
+int
+yyparse (YYPARSE_PARAM)
+    void *YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+     || defined __cplusplus || defined _MSC_VER)
+int
+yyparse (void)
+#else
+int
+yyparse ()
+
+#endif
+#endif
+{
+  
+  int yystate;
+  int yyn;
+  int yyresult;
+  /* Number of tokens to shift before error messages enabled.  */
+  int yyerrstatus;
+  /* Look-ahead token as an internal (translated) token number.  */
+  int yytoken = 0;
+#if YYERROR_VERBOSE
+  /* Buffer for error messages, and its allocated size.  */
+  char yymsgbuf[128];
+  char *yymsg = yymsgbuf;
+  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+  /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+  /* The state stack.  */
+  yytype_int16 yyssa[YYINITDEPTH];
+  yytype_int16 *yyss = yyssa;
+  yytype_int16 *yyssp;
+
+  /* The semantic value stack.  */
+  YYSTYPE yyvsa[YYINITDEPTH];
+  YYSTYPE *yyvs = yyvsa;
+  YYSTYPE *yyvsp;
+
+  /* The location stack.  */
+  YYLTYPE yylsa[YYINITDEPTH];
+  YYLTYPE *yyls = yylsa;
+  YYLTYPE *yylsp;
+  /* The locations where the error started and ended.  */
+  YYLTYPE yyerror_range[2];
+
+#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N), yylsp -= (N))
+
+  YYSIZE_T yystacksize = YYINITDEPTH;
+
+  /* The variables used to return semantic value and location from the
+     action routines.  */
+  YYSTYPE yyval;
+  YYLTYPE yyloc;
+
+  /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+  int yylen = 0;
+
+  YYDPRINTF ((stderr, "Starting parse\n"));
+
+  yystate = 0;
+  yyerrstatus = 0;
+  yynerrs = 0;
+  yychar = YYEMPTY;             /* Cause a token to be read.  */
+
+  /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+  yyssp = yyss;
+  yyvsp = yyvs;
+  yylsp = yyls;
+#if YYLTYPE_IS_TRIVIAL
+  /* Initialize the default location before parsing starts.  */
+  yylloc.first_line   = yylloc.last_line   = 1;
+  yylloc.first_column = yylloc.last_column = 0;
+#endif
+
+  goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+ yynewstate:
+  /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+  yyssp++;
+
+ yysetstate:
+  *yyssp = yystate;
+
+  if (yyss + yystacksize - 1 <= yyssp)
+    {
+      /* Get the current used size of the three stacks, in elements.  */
+      YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+      {
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+        YYLTYPE *yyls1 = yyls;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yyls1, yysize * sizeof (*yylsp),
+                    &yystacksize);
+        yyls = yyls1;
+        yyss = yyss1;
+        yyvs = yyvs1;
+      }
+#else /* no yyoverflow */
+# ifndef YYSTACK_RELOCATE
+      goto yyexhaustedlab;
+# else
+      /* Extend the stack our own way.  */
+      if (YYMAXDEPTH <= yystacksize)
+        goto yyexhaustedlab;
+      yystacksize *= 2;
+      if (YYMAXDEPTH < yystacksize)
+        yystacksize = YYMAXDEPTH;
+
+      {
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss);
+        YYSTACK_RELOCATE (yyvs);
+        YYSTACK_RELOCATE (yyls);
+#  undef YYSTACK_RELOCATE
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
+      }
+# endif
+#endif /* no yyoverflow */
+
+      yyssp = yyss + yysize - 1;
+      yyvsp = yyvs + yysize - 1;
+      yylsp = yyls + yysize - 1;
+
+      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
+                  (unsigned long int) yystacksize));
+
+      if (yyss + yystacksize - 1 <= yyssp)
+        YYABORT;
+    }
+
+  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
+
+  goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+  /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
+
+  /* First try to decide what to do without reference to look-ahead token.  */
+  yyn = yypact[yystate];
+  if (yyn == YYPACT_NINF)
+    goto yydefault;
+
+  /* Not known => get a look-ahead token if don't already have one.  */
+
+  /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+  if (yychar == YYEMPTY)
+    {
+      YYDPRINTF ((stderr, "Reading a token: "));
+      yychar = YYLEX;
+    }
+
+  if (yychar <= YYEOF)
+    {
+      yychar = yytoken = YYEOF;
+      YYDPRINTF ((stderr, "Now at end of input.\n"));
+    }
+  else
+    {
+      yytoken = YYTRANSLATE (yychar);
+      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+  /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+  yyn += yytoken;
+  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+    goto yydefault;
+  yyn = yytable[yyn];
+  if (yyn <= 0)
+    {
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+        goto yyerrlab;
+      yyn = -yyn;
+      goto yyreduce;
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  /* Count tokens shifted since error; after three, turn off error
+     status.  */
+  if (yyerrstatus)
+    yyerrstatus--;
+
+  /* Shift the look-ahead token.  */
+  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
+
+  /* Discard the shifted token unless it is eof.  */
+  if (yychar != YYEOF)
+    yychar = YYEMPTY;
+
+  yystate = yyn;
+  *++yyvsp = yylval;
+  *++yylsp = yylloc;
+  goto yynewstate;
+
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+  yyn = yydefact[yystate];
+  if (yyn == 0)
+    goto yyerrlab;
+  goto yyreduce;
+
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+  /* yyn is the number of a rule to reduce with.  */
+  yylen = yyr2[yyn];
+
+  /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+  yyval = yyvsp[1-yylen];
+
+  /* Default location.  */
+  YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+  YY_REDUCE_PRINT (yyn);
+  switch (yyn)
+    {
+        case 2:
+#line 86 "dtc-parser.y"
+    {
+                        the_boot_info = build_boot_info((yyvsp[(3) - (4)].re), (yyvsp[(4) - (4)].node));
+                ;}
+    break;
+
+  case 3:
+#line 90 "dtc-parser.y"
+    {
+                        the_boot_info = build_boot_info((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].node));
+                ;}
+    break;
+
+  case 4:
+#line 97 "dtc-parser.y"
+    {
+                        (yyval.re) = NULL;
+                ;}
+    break;
+
+  case 5:
+#line 101 "dtc-parser.y"
+    {
+                        (yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re));
+                ;}
+    break;
+
+  case 6:
+#line 108 "dtc-parser.y"
+    {
+                        (yyval.re) = build_reserve_entry((yyvsp[(3) - (5)].addr), (yyvsp[(4) - (5)].addr), (yyvsp[(1) - (5)].labelref));
+                ;}
+    break;
+
+  case 7:
+#line 115 "dtc-parser.y"
+    {
+                        (yyval.re) = NULL;
+                ;}
+    break;
+
+  case 8:
+#line 119 "dtc-parser.y"
+    {
+                        (yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re));
+                ;}
+    break;
+
+  case 9:
+#line 126 "dtc-parser.y"
+    {
+                        (yyval.re) = (yyvsp[(1) - (1)].re);
+                ;}
+    break;
+
+  case 10:
+#line 130 "dtc-parser.y"
+    {
+                        (yyval.re) = build_reserve_entry((yyvsp[(3) - (6)].addr), (yyvsp[(5) - (6)].addr) - (yyvsp[(3) - (6)].addr) + 1, (yyvsp[(1) - (6)].labelref));
+                ;}
+    break;
+
+  case 11:
+#line 137 "dtc-parser.y"
+    {
+                        (yyval.addr) = eval_literal((yyvsp[(1) - (1)].literal), 0, 64);
+                ;}
+    break;
+
+  case 12:
+#line 141 "dtc-parser.y"
+    {
+                        (yyval.addr) = eval_literal((yyvsp[(1) - (1)].literal), 16, 64);
+                ;}
+    break;
+
+  case 13:
+#line 148 "dtc-parser.y"
+    {
+                        (yyval.node) = name_node((yyvsp[(2) - (2)].node), "", NULL);
+                ;}
+    break;
+
+  case 14:
+#line 155 "dtc-parser.y"
+    {
+                        (yyval.node) = build_node((yyvsp[(2) - (5)].proplist), (yyvsp[(3) - (5)].nodelist));
+                ;}
+    break;
+
+  case 15:
+#line 162 "dtc-parser.y"
+    {
+                        (yyval.proplist) = NULL;
+                ;}
+    break;
+
+  case 16:
+#line 166 "dtc-parser.y"
+    {
+                        (yyval.proplist) = chain_property((yyvsp[(2) - (2)].prop), (yyvsp[(1) - (2)].proplist));
+                ;}
+    break;
+
+  case 17:
+#line 173 "dtc-parser.y"
+    {
+                        (yyval.prop) = build_property((yyvsp[(2) - (5)].propnodename), (yyvsp[(4) - (5)].data), (yyvsp[(1) - (5)].labelref));
+                ;}
+    break;
+
+  case 18:
+#line 177 "dtc-parser.y"
+    {
+                        (yyval.prop) = build_property((yyvsp[(2) - (3)].propnodename), empty_data, (yyvsp[(1) - (3)].labelref));
+                ;}
+    break;
+
+  case 19:
+#line 184 "dtc-parser.y"
+    {
+                        (yyval.data) = data_merge((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].data));
+                ;}
+    break;
+
+  case 20:
+#line 188 "dtc-parser.y"
+    {
+                        (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data));
+                ;}
+    break;
+
+  case 21:
+#line 192 "dtc-parser.y"
+    {
+                        (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data));
+                ;}
+    break;
+
+  case 22:
+#line 196 "dtc-parser.y"
+    {
+                        (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), REF_PATH, (yyvsp[(2) - (2)].labelref));
+                ;}
+    break;
+
+  case 23:
+#line 200 "dtc-parser.y"
+    {
+                        (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
+                ;}
+    break;
+
+  case 24:
+#line 207 "dtc-parser.y"
+    {
+                        (yyval.data) = empty_data;
+                ;}
+    break;
+
+  case 25:
+#line 211 "dtc-parser.y"
+    {
+                        (yyval.data) = (yyvsp[(1) - (2)].data);
+                ;}
+    break;
+
+  case 26:
+#line 215 "dtc-parser.y"
+    {
+                        (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
+                ;}
+    break;
+
+  case 27:
+#line 222 "dtc-parser.y"
+    {
+                        (yyval.data) = empty_data;
+                ;}
+    break;
+
+  case 28:
+#line 226 "dtc-parser.y"
+    {
+                        (yyval.data) = data_append_cell((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].cell));
+                ;}
+    break;
+
+  case 29:
+#line 230 "dtc-parser.y"
+    {
+                        (yyval.data) = data_append_cell(data_add_marker((yyvsp[(1) - (2)].data), REF_PHANDLE,
+                                                              (yyvsp[(2) - (2)].labelref)), -1);
+                ;}
+    break;
+
+  case 30:
+#line 235 "dtc-parser.y"
+    {
+                        (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
+                ;}
+    break;
+
+  case 31:
+#line 242 "dtc-parser.y"
+    {
+                        (yyval.cbase) = 16;
+                ;}
+    break;
+
+  case 33:
+#line 250 "dtc-parser.y"
+    {
+                        (yyval.cell) = eval_literal((yyvsp[(1) - (1)].literal), 0, 32);
+                ;}
+    break;
+
+  case 34:
+#line 254 "dtc-parser.y"
+    {
+                        (yyval.cell) = eval_literal((yyvsp[(2) - (2)].literal), (yyvsp[(1) - (2)].cbase), 32);
+                ;}
+    break;
+
+  case 35:
+#line 261 "dtc-parser.y"
+    {
+                        (yyval.data) = empty_data;
+                ;}
+    break;
+
+  case 36:
+#line 265 "dtc-parser.y"
+    {
+                        (yyval.data) = data_append_byte((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].byte));
+                ;}
+    break;
+
+  case 37:
+#line 269 "dtc-parser.y"
+    {
+                        (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
+                ;}
+    break;
+
+  case 38:
+#line 276 "dtc-parser.y"
+    {
+                        (yyval.nodelist) = NULL;
+                ;}
+    break;
+
+  case 39:
+#line 280 "dtc-parser.y"
+    {
+                        (yyval.nodelist) = chain_node((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].nodelist));
+                ;}
+    break;
+
+  case 40:
+#line 284 "dtc-parser.y"
+    {
+                        yyerror("syntax error: properties must precede subnodes\n");
+                        YYERROR;
+                ;}
+    break;
+
+  case 41:
+#line 292 "dtc-parser.y"
+    {
+                        (yyval.node) = name_node((yyvsp[(3) - (3)].node), (yyvsp[(2) - (3)].propnodename), (yyvsp[(1) - (3)].labelref));
+                ;}
+    break;
+
+  case 42:
+#line 299 "dtc-parser.y"
+    {
+                        (yyval.labelref) = NULL;
+                ;}
+    break;
+
+  case 43:
+#line 303 "dtc-parser.y"
+    {
+                        (yyval.labelref) = (yyvsp[(1) - (1)].labelref);
+                ;}
+    break;
+
+
+/* Line 1267 of yacc.c.  */
+#line 1734 "dtc-parser.tab.c"
+      default: break;
+    }
+  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+
+  *++yyvsp = yyval;
+  *++yylsp = yyloc;
+
+  /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+  yyn = yyr1[yyn];
+
+  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+    yystate = yytable[yystate];
+  else
+    yystate = yydefgoto[yyn - YYNTOKENS];
+
+  goto yynewstate;
+
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+  /* If not already recovering from an error, report this error.  */
+  if (!yyerrstatus)
+    {
+      ++yynerrs;
+#if ! YYERROR_VERBOSE
+      yyerror (YY_("syntax error"));
+#else
+      {
+        YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+        if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+          {
+            YYSIZE_T yyalloc = 2 * yysize;
+            if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+              yyalloc = YYSTACK_ALLOC_MAXIMUM;
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+            if (yymsg)
+              yymsg_alloc = yyalloc;
+            else
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+              }
+          }
+
+        if (0 < yysize && yysize <= yymsg_alloc)
+          {
+            (void) yysyntax_error (yymsg, yystate, yychar);
+            yyerror (yymsg);
+          }
+        else
+          {
+            yyerror (YY_("syntax error"));
+            if (yysize != 0)
+              goto yyexhaustedlab;
+          }
+      }
+#endif
+    }
+
+  yyerror_range[0] = yylloc;
+
+  if (yyerrstatus == 3)
+    {
+      /* If just tried and failed to reuse look-ahead token after an
+         error, discard it.  */
+
+      if (yychar <= YYEOF)
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
+      else
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval, &yylloc);
+          yychar = YYEMPTY;
+        }
+    }
+
+  /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+  goto yyerrlab1;
+
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+  /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+  if (/*CONSTCOND*/ 0)
+     goto yyerrorlab;
+
+  yyerror_range[0] = yylsp[1-yylen];
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+  YYPOPSTACK (yylen);
+  yylen = 0;
+  YY_STACK_PRINT (yyss, yyssp);
+  yystate = *yyssp;
+  goto yyerrlab1;
+
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
+
+  for (;;)
+    {
+      yyn = yypact[yystate];
+      if (yyn != YYPACT_NINF)
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
+
+      /* Pop the current state because it cannot handle the error token.  */
+      if (yyssp == yyss)
+        YYABORT;
+
+      yyerror_range[0] = *yylsp;
+      yydestruct ("Error: popping",
+                  yystos[yystate], yyvsp, yylsp);
+      YYPOPSTACK (1);
+      yystate = *yyssp;
+      YY_STACK_PRINT (yyss, yyssp);
+    }
+
+  if (yyn == YYFINAL)
+    YYACCEPT;
+
+  *++yyvsp = yylval;
+
+  yyerror_range[1] = yylloc;
+  /* Using YYLLOC is tempting, but would change the location of
+     the look-ahead.  YYLOC is available though.  */
+  YYLLOC_DEFAULT (yyloc, (yyerror_range - 1), 2);
+  *++yylsp = yyloc;
+
+  /* Shift the error token.  */
+  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
+
+  yystate = yyn;
+  goto yynewstate;
+
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+  yyresult = 0;
+  goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+  yyresult = 1;
+  goto yyreturn;
+
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+  yyerror (YY_("memory exhausted"));
+  yyresult = 2;
+  /* Fall through.  */
+#endif
+
+yyreturn:
+  if (yychar != YYEOF && yychar != YYEMPTY)
+     yydestruct ("Cleanup: discarding lookahead",
+                 yytoken, &yylval, &yylloc);
+  /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+  YYPOPSTACK (yylen);
+  YY_STACK_PRINT (yyss, yyssp);
+  while (yyssp != yyss)
+    {
+      yydestruct ("Cleanup: popping",
+                  yystos[*yyssp], yyvsp, yylsp);
+      YYPOPSTACK (1);
+    }
+#ifndef yyoverflow
+  if (yyss != yyssa)
+    YYSTACK_FREE (yyss);
+#endif
+#if YYERROR_VERBOSE
+  if (yymsg != yymsgbuf)
+    YYSTACK_FREE (yymsg);
+#endif
+  /* Make sure YYID is used.  */
+  return YYID (yyresult);
+}
+
+
+#line 308 "dtc-parser.y"
+
+
+void yyerror (char const *s)
+{
+        const char *fname = srcpos_filename_for_num(yylloc.filenum);
+
+        if (strcmp(fname, "-") == 0)
+                fname = "stdin";
+
+        fprintf(stderr, "%s:%d %s\n",
+                fname, yylloc.first_line, s);
+}
+
+unsigned long long eval_literal(const char *s, int base, int bits)
+{
+        unsigned long long val;
+        char *e;
+
+        errno = 0;
+        val = strtoull(s, &e, base);
+        if (*e)
+                yyerror("bad characters in literal");
+        else if ((errno == ERANGE)
+                 || ((bits < 64) && (val >= (1ULL << bits))))
+                yyerror("literal out of range");
+        else if (errno != 0)
+                yyerror("bad literal");
+        return val;
+}
+
diff --git a/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped b/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped
new file mode 100644
index 000000000000..4707b029ed25
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped
@@ -0,0 +1,111 @@
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+# define YYTOKENTYPE
+   /* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+   enum yytokentype {
+     DT_V1 = 258,
+     DT_MEMRESERVE = 259,
+     DT_PROPNODENAME = 260,
+     DT_LITERAL = 261,
+     DT_LEGACYLITERAL = 262,
+     DT_BASE = 263,
+     DT_BYTE = 264,
+     DT_STRING = 265,
+     DT_LABEL = 266,
+     DT_REF = 267
+   };
+#endif
+/* Tokens.  */
+#define DT_V1 258
+#define DT_MEMRESERVE 259
+#define DT_PROPNODENAME 260
+#define DT_LITERAL 261
+#define DT_LEGACYLITERAL 262
+#define DT_BASE 263
+#define DT_BYTE 264
+#define DT_STRING 265
+#define DT_LABEL 266
+#define DT_REF 267
+
+
+
+
+#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 34 "dtc-parser.y"
+{
+        char *propnodename;
+        char *literal;
+        char *labelref;
+        unsigned int cbase;
+        u8 byte;
+        struct data data;
+
+        u64 addr;
+        cell_t cell;
+        struct property *prop;
+        struct property *proplist;
+        struct node *node;
+        struct node *nodelist;
+        struct reserve_info *re;
+}
+/* Line 1489 of yacc.c.  */
+#line 90 "dtc-parser.tab.h"
+        YYSTYPE;
+# define yystype YYSTYPE /* obsolescent; will be withdrawn */
+# define YYSTYPE_IS_DECLARED 1
+# define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+extern YYSTYPE yylval;
+
+#if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
+typedef struct YYLTYPE
+{
+  int first_line;
+  int first_column;
+  int last_line;
+  int last_column;
+} YYLTYPE;
+# define yyltype YYLTYPE /* obsolescent; will be withdrawn */
+# define YYLTYPE_IS_DECLARED 1
+# define YYLTYPE_IS_TRIVIAL 1
+#endif
+
+extern YYLTYPE yylloc;
diff --git a/arch/powerpc/boot/dtc-src/dtc-parser.y b/arch/powerpc/boot/dtc-src/dtc-parser.y
new file mode 100644
index 000000000000..002ea7fef184
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/dtc-parser.y
@@ -0,0 +1,336 @@
+/*
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+%locations
+
+%{
+#include "dtc.h"
+#include "srcpos.h"
+
+int yylex(void);
+unsigned long long eval_literal(const char *s, int base, int bits);
+
+extern struct boot_info *the_boot_info;
+
+%}
+
+%union {
+        char *propnodename;
+        char *literal;
+        char *labelref;
+        unsigned int cbase;
+        u8 byte;
+        struct data data;
+
+        u64 addr;
+        cell_t cell;
+        struct property *prop;
+        struct property *proplist;
+        struct node *node;
+        struct node *nodelist;
+        struct reserve_info *re;
+}
+
+%token DT_V1
+%token DT_MEMRESERVE
+%token <propnodename> DT_PROPNODENAME
+%token <literal> DT_LITERAL
+%token <literal> DT_LEGACYLITERAL
+%token <cbase> DT_BASE
+%token <byte> DT_BYTE
+%token <data> DT_STRING
+%token <labelref> DT_LABEL
+%token <labelref> DT_REF
+
+%type <data> propdata
+%type <data> propdataprefix
+%type <re> memreserve
+%type <re> memreserves
+%type <re> v0_memreserve
+%type <re> v0_memreserves
+%type <addr> addr
+%type <data> celllist
+%type <cbase> cellbase
+%type <cell> cellval
+%type <data> bytestring
+%type <prop> propdef
+%type <proplist> proplist
+
+%type <node> devicetree
+%type <node> nodedef
+%type <node> subnode
+%type <nodelist> subnodes
+%type <labelref> label
+
+%%
+
+sourcefile:
+          DT_V1 ';' memreserves devicetree
+                {
+                        the_boot_info = build_boot_info($3, $4);
+                }
+        | v0_memreserves devicetree
+                {
+                        the_boot_info = build_boot_info($1, $2);
+                }
+        ;
+
+memreserves:
+          /* empty */
+                {
+                        $$ = NULL;
+                }
+        | memreserve memreserves
+                {
+                        $$ = chain_reserve_entry($1, $2);
+                }
+        ;
+
+memreserve:
+          label DT_MEMRESERVE addr addr ';'
+                {
+                        $$ = build_reserve_entry($3, $4, $1);
+                }
+        ;
+
+v0_memreserves:
+          /* empty */
+                {
+                        $$ = NULL;
+                }
+        | v0_memreserve v0_memreserves
+                {
+                        $$ = chain_reserve_entry($1, $2);
+                };
+        ;
+
+v0_memreserve:
+          memreserve
+                {
+                        $$ = $1;
+                }
+        | label DT_MEMRESERVE addr '-' addr ';'
+                {
+                        $$ = build_reserve_entry($3, $5 - $3 + 1, $1);
+                }
+        ;
+
+addr:
+          DT_LITERAL
+                {
+                        $$ = eval_literal($1, 0, 64);
+                }
+        | DT_LEGACYLITERAL
+                {
+                        $$ = eval_literal($1, 16, 64);
+                }
+          ;
+
+devicetree:
+          '/' nodedef
+                {
+                        $$ = name_node($2, "", NULL);
+                }
+        ;
+
+nodedef:
+          '{' proplist subnodes '}' ';'
+                {
+                        $$ = build_node($2, $3);
+                }
+        ;
+
+proplist:
+          /* empty */
+                {
+                        $$ = NULL;
+                }
+        | proplist propdef
+                {
+                        $$ = chain_property($2, $1);
+                }
+        ;
+
+propdef:
+          label DT_PROPNODENAME '=' propdata ';'
+                {
+                        $$ = build_property($2, $4, $1);
+                }
+        | label DT_PROPNODENAME ';'
+                {
+                        $$ = build_property($2, empty_data, $1);
+                }
+        ;
+
+propdata:
+          propdataprefix DT_STRING
+                {
+                        $$ = data_merge($1, $2);
+                }
+        | propdataprefix '<' celllist '>'
+                {
+                        $$ = data_merge($1, $3);
+                }
+        | propdataprefix '[' bytestring ']'
+                {
+                        $$ = data_merge($1, $3);
+                }
+        | propdataprefix DT_REF
+                {
+                        $$ = data_add_marker($1, REF_PATH, $2);
+                }
+        | propdata DT_LABEL
+                {
+                        $$ = data_add_marker($1, LABEL, $2);
+                }
+        ;
+
+propdataprefix:
+          /* empty */
+                {
+                        $$ = empty_data;
+                }
+        | propdata ','
+                {
+                        $$ = $1;
+                }
+        | propdataprefix DT_LABEL
+                {
+                        $$ = data_add_marker($1, LABEL, $2);
+                }
+        ;
+
+celllist:
+          /* empty */
+                {
+                        $$ = empty_data;
+                }
+        | celllist cellval
+                {
+                        $$ = data_append_cell($1, $2);
+                }
+        | celllist DT_REF
+                {
+                        $$ = data_append_cell(data_add_marker($1, REF_PHANDLE,
+                                                              $2), -1);
+                }
+        | celllist DT_LABEL
+                {
+                        $$ = data_add_marker($1, LABEL, $2);
+                }
+        ;
+
+cellbase:
+          /* empty */
+                {
+                        $$ = 16;
+                }
+        | DT_BASE
+        ;
+
+cellval:
+          DT_LITERAL
+                {
+                        $$ = eval_literal($1, 0, 32);
+                }
+        | cellbase DT_LEGACYLITERAL
+                {
+                        $$ = eval_literal($2, $1, 32);
+                }
+        ;
+
+bytestring:
+          /* empty */
+                {
+                        $$ = empty_data;
+                }
+        | bytestring DT_BYTE
+                {
+                        $$ = data_append_byte($1, $2);
+                }
+        | bytestring DT_LABEL
+                {
+                        $$ = data_add_marker($1, LABEL, $2);
+                }
+        ;
+
+subnodes:
+          /* empty */
+                {
+                        $$ = NULL;
+                }
+        |  subnode subnodes
+                {
+                        $$ = chain_node($1, $2);
+                }
+        | subnode propdef
+                {
+                        yyerror("syntax error: properties must precede subnodes\n");
+                        YYERROR;
+                }
+        ;
+
+subnode:
+          label DT_PROPNODENAME nodedef
+                {
+                        $$ = name_node($3, $2, $1);
+                }
+        ;
+
+label:
+          /* empty */
+                {
+                        $$ = NULL;
+                }
+        | DT_LABEL
+                {
+                        $$ = $1;
+                }
+        ;
+
+%%
+
+void yyerror (char const *s)
+{
+        const char *fname = srcpos_filename_for_num(yylloc.filenum);
+
+        if (strcmp(fname, "-") == 0)
+                fname = "stdin";
+
+        fprintf(stderr, "%s:%d %s\n",
+                fname, yylloc.first_line, s);
+}
+
+unsigned long long eval_literal(const char *s, int base, int bits)
+{
+        unsigned long long val;
+        char *e;
+
+        errno = 0;
+        val = strtoull(s, &e, base);
+        if (*e)
+                yyerror("bad characters in literal");
+        else if ((errno == ERANGE)
+                 || ((bits < 64) && (val >= (1ULL << bits))))
+                yyerror("literal out of range");
+        else if (errno != 0)
+                yyerror("bad literal");
+        return val;
+}
diff --git a/arch/powerpc/boot/dtc-src/dtc.c b/arch/powerpc/boot/dtc-src/dtc.c
new file mode 100644
index 000000000000..01131d7c2d5e
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/dtc.c
@@ -0,0 +1,231 @@
+/*
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+#include "dtc.h"
+#include "srcpos.h"
+
+#include "version_gen.h"
+
+/*
+ * Command line options
+ */
+int quiet;              /* Level of quietness */
+int reservenum;         /* Number of memory reservation slots */
+int minsize;            /* Minimum blob size */
+int padsize;            /* Additional padding to blob */
+
+char *join_path(const char *path, const char *name)
+{
+        int lenp = strlen(path);
+        int lenn = strlen(name);
+        int len;
+        int needslash = 1;
+        char *str;
+
+        len = lenp + lenn + 2;
+        if ((lenp > 0) && (path[lenp-1] == '/')) {
+                needslash = 0;
+                len--;
+        }
+
+        str = xmalloc(len);
+        memcpy(str, path, lenp);
+        if (needslash) {
+                str[lenp] = '/';
+                lenp++;
+        }
+        memcpy(str+lenp, name, lenn+1);
+        return str;
+}
+
+void fill_fullpaths(struct node *tree, const char *prefix)
+{
+        struct node *child;
+        const char *unit;
+
+        tree->fullpath = join_path(prefix, tree->name);
+
+        unit = strchr(tree->name, '@');
+        if (unit)
+                tree->basenamelen = unit - tree->name;
+        else
+                tree->basenamelen = strlen(tree->name);
+
+        for_each_child(tree, child)
+                fill_fullpaths(child, tree->fullpath);
+}
+
+static void  __attribute__ ((noreturn)) usage(void)
+{
+        fprintf(stderr, "Usage:\n");
+        fprintf(stderr, "\tdtc [options] <input file>\n");
+        fprintf(stderr, "\nOptions:\n");
+        fprintf(stderr, "\t-h\n");
+        fprintf(stderr, "\t\tThis help text\n");
+        fprintf(stderr, "\t-q\n");
+        fprintf(stderr, "\t\tQuiet: -q suppress warnings, -qq errors, -qqq all\n");
+        fprintf(stderr, "\t-I <input format>\n");
+        fprintf(stderr, "\t\tInput formats are:\n");
+        fprintf(stderr, "\t\t\tdts - device tree source text\n");
+        fprintf(stderr, "\t\t\tdtb - device tree blob\n");
+        fprintf(stderr, "\t\t\tfs - /proc/device-tree style directory\n");
+        fprintf(stderr, "\t-o <output file>\n");
+        fprintf(stderr, "\t-O <output format>\n");
+        fprintf(stderr, "\t\tOutput formats are:\n");
+        fprintf(stderr, "\t\t\tdts - device tree source text\n");
+        fprintf(stderr, "\t\t\tdtb - device tree blob\n");
+        fprintf(stderr, "\t\t\tasm - assembler source\n");
+        fprintf(stderr, "\t-V <output version>\n");
+        fprintf(stderr, "\t\tBlob version to produce, defaults to %d (relevant for dtb\n\t\tand asm output only)\n", DEFAULT_FDT_VERSION);
+        fprintf(stderr, "\t-R <number>\n");
+        fprintf(stderr, "\t\tMake space for <number> reserve map entries (relevant for \n\t\tdtb and asm output only)\n");
+        fprintf(stderr, "\t-S <bytes>\n");
+        fprintf(stderr, "\t\tMake the blob at least <bytes> long (extra space)\n");
+        fprintf(stderr, "\t-p <bytes>\n");
+        fprintf(stderr, "\t\tAdd padding to the blob of <bytes> long (extra space)\n");
+        fprintf(stderr, "\t-b <number>\n");
+        fprintf(stderr, "\t\tSet the physical boot cpu\n");
+        fprintf(stderr, "\t-f\n");
+        fprintf(stderr, "\t\tForce - try to produce output even if the input tree has errors\n");
+        fprintf(stderr, "\t-v\n");
+        fprintf(stderr, "\t\tPrint DTC version and exit\n");
+        exit(2);
+}
+
+int main(int argc, char *argv[])
+{
+        struct boot_info *bi;
+        const char *inform = "dts";
+        const char *outform = "dts";
+        const char *outname = "-";
+        int force = 0, check = 0;
+        const char *arg;
+        int opt;
+        FILE *inf = NULL;
+        FILE *outf = NULL;
+        int outversion = DEFAULT_FDT_VERSION;
+        int boot_cpuid_phys = 0xfeedbeef;
+
+        quiet      = 0;
+        reservenum = 0;
+        minsize    = 0;
+        padsize    = 0;
+
+        while ((opt = getopt(argc, argv, "hI:O:o:V:R:S:p:fcqb:v")) != EOF) {
+                switch (opt) {
+                case 'I':
+                        inform = optarg;
+                        break;
+                case 'O':
+                        outform = optarg;
+                        break;
+                case 'o':
+                        outname = optarg;
+                        break;
+                case 'V':
+                        outversion = strtol(optarg, NULL, 0);
+                        break;
+                case 'R':
+                        reservenum = strtol(optarg, NULL, 0);
+                        break;
+                case 'S':
+                        minsize = strtol(optarg, NULL, 0);
+                        break;
+                case 'p':
+                        padsize = strtol(optarg, NULL, 0);
+                        break;
+                case 'f':
+                        force = 1;
+                        break;
+                case 'c':
+                        check = 1;
+                        break;
+                case 'q':
+                        quiet++;
+                        break;
+                case 'b':
+                        boot_cpuid_phys = strtol(optarg, NULL, 0);
+                        break;
+                case 'v':
+                    printf("Version: %s\n", DTC_VERSION);
+                    exit(0);
+                case 'h':
+                default:
+                        usage();
+                }
+        }
+
+        if (argc > (optind+1))
+                usage();
+        else if (argc < (optind+1))
+                arg = "-";
+        else
+                arg = argv[optind];
+
+        /* minsize and padsize are mutually exclusive */
+        if ((minsize) && (padsize)) {
+                die("Can't set both -p and -S\n");
+        }
+
+        fprintf(stderr, "DTC: %s->%s  on file \"%s\"\n",
+                inform, outform, arg);
+
+        if (streq(inform, "dts")) {
+                bi = dt_from_source(arg);
+        } else if (streq(inform, "fs")) {
+                bi = dt_from_fs(arg);
+        } else if(streq(inform, "dtb")) {
+                inf = dtc_open_file(arg);
+                bi = dt_from_blob(inf);
+        } else {
+                die("Unknown input format \"%s\"\n", inform);
+        }
+
+        if (inf && (inf != stdin))
+                fclose(inf);
+
+        if (! bi || ! bi->dt)
+                die("Couldn't read input tree\n");
+
+        process_checks(force, bi, check, outversion, boot_cpuid_phys);
+
+        if (streq(outname, "-")) {
+                outf = stdout;
+        } else {
+                outf = fopen(outname, "w");
+                if (! outf)
+                        die("Couldn't open output file %s: %s\n",
+                            outname, strerror(errno));
+        }
+
+        if (streq(outform, "dts")) {
+                dt_to_source(outf, bi);
+        } else if (streq(outform, "dtb")) {
+                dt_to_blob(outf, bi, outversion, boot_cpuid_phys);
+        } else if (streq(outform, "asm")) {
+                dt_to_asm(outf, bi, outversion, boot_cpuid_phys);
+        } else if (streq(outform, "null")) {
+                /* do nothing */
+        } else {
+                die("Unknown output format \"%s\"\n", outform);
+        }
+
+        exit(0);
+}
diff --git a/arch/powerpc/boot/dtc-src/dtc.h b/arch/powerpc/boot/dtc-src/dtc.h
new file mode 100644
index 000000000000..65281777a167
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/dtc.h
@@ -0,0 +1,269 @@
+#ifndef _DTC_H
+#define _DTC_H
+
+/*
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <ctype.h>
+#include <errno.h>
+#include <unistd.h>
+#include <netinet/in.h>
+#include <endian.h>
+#include <byteswap.h>
+
+#include <fdt.h>
+
+#define DEFAULT_FDT_VERSION     17
+/*
+ * Command line options
+ */
+extern int quiet;               /* Level of quietness */
+extern int reservenum;          /* Number of memory reservation slots */
+extern int minsize;             /* Minimum blob size */
+extern int padsize;             /* Additional padding to blob */
+
+static inline void __attribute__((noreturn)) die(char * str, ...)
+{
+        va_list ap;
+
+        va_start(ap, str);
+        fprintf(stderr, "FATAL ERROR: ");
+        vfprintf(stderr, str, ap);
+        exit(1);
+}
+
+static inline void *xmalloc(size_t len)
+{
+        void *new = malloc(len);
+
+        if (! new)
+                die("malloc() failed\n");
+
+        return new;
+}
+
+static inline void *xrealloc(void *p, size_t len)
+{
+        void *new = realloc(p, len);
+
+        if (! new)
+                die("realloc() failed (len=%d)\n", len);
+
+        return new;
+}
+
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
+typedef u32 cell_t;
+
+#define cpu_to_be16(x)  htons(x)
+#define be16_to_cpu(x)  ntohs(x)
+
+#define cpu_to_be32(x)  htonl(x)
+#define be32_to_cpu(x)  ntohl(x)
+
+#if __BYTE_ORDER == __BIG_ENDIAN
+#define cpu_to_be64(x)  (x)
+#define be64_to_cpu(x)  (x)
+#else
+#define cpu_to_be64(x)  bswap_64(x)
+#define be64_to_cpu(x)  bswap_64(x)
+#endif
+
+#define streq(a, b)     (strcmp((a), (b)) == 0)
+#define strneq(a, b, n) (strncmp((a), (b), (n)) == 0)
+
+#define ALIGN(x, a)     (((x) + (a) - 1) & ~((a) - 1))
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+/* Data blobs */
+enum markertype {
+        REF_PHANDLE,
+        REF_PATH,
+        LABEL,
+};
+
+struct  marker {
+        enum markertype type;
+        int offset;
+        char *ref;
+        struct marker *next;
+};
+
+struct data {
+        int len;
+        char *val;
+        int asize;
+        struct marker *markers;
+};
+
+
+#define empty_data ((struct data){ /* all .members = 0 or NULL */ })
+
+#define for_each_marker(m) \
+        for (; (m); (m) = (m)->next)
+#define for_each_marker_of_type(m, t) \
+        for_each_marker(m) \
+                if ((m)->type == (t))
+
+void data_free(struct data d);
+
+struct data data_grow_for(struct data d, int xlen);
+
+struct data data_copy_mem(const char *mem, int len);
+struct data data_copy_escape_string(const char *s, int len);
+struct data data_copy_file(FILE *f, size_t len);
+
+struct data data_append_data(struct data d, const void *p, int len);
+struct data data_insert_at_marker(struct data d, struct marker *m,
+                                  const void *p, int len);
+struct data data_merge(struct data d1, struct data d2);
+struct data data_append_cell(struct data d, cell_t word);
+struct data data_append_re(struct data d, const struct fdt_reserve_entry *re);
+struct data data_append_addr(struct data d, u64 addr);
+struct data data_append_byte(struct data d, uint8_t byte);
+struct data data_append_zeroes(struct data d, int len);
+struct data data_append_align(struct data d, int align);
+
+struct data data_add_marker(struct data d, enum markertype type, char *ref);
+
+int data_is_one_string(struct data d);
+
+/* DT constraints */
+
+#define MAX_PROPNAME_LEN        31
+#define MAX_NODENAME_LEN        31
+
+/* Live trees */
+struct property {
+        char *name;
+        struct data val;
+
+        struct property *next;
+
+        char *label;
+};
+
+struct node {
+        char *name;
+        struct property *proplist;
+        struct node *children;
+
+        struct node *parent;
+        struct node *next_sibling;
+
+        char *fullpath;
+        int basenamelen;
+
+        cell_t phandle;
+        int addr_cells, size_cells;
+
+        char *label;
+};
+
+#define for_each_property(n, p) \
+        for ((p) = (n)->proplist; (p); (p) = (p)->next)
+
+#define for_each_child(n, c)    \
+        for ((c) = (n)->children; (c); (c) = (c)->next_sibling)
+
+struct property *build_property(char *name, struct data val, char *label);
+struct property *chain_property(struct property *first, struct property *list);
+struct property *reverse_properties(struct property *first);
+
+struct node *build_node(struct property *proplist, struct node *children);
+struct node *name_node(struct node *node, char *name, char *label);
+struct node *chain_node(struct node *first, struct node *list);
+
+void add_property(struct node *node, struct property *prop);
+void add_child(struct node *parent, struct node *child);
+
+const char *get_unitname(struct node *node);
+struct property *get_property(struct node *node, const char *propname);
+cell_t propval_cell(struct property *prop);
+struct node *get_subnode(struct node *node, const char *nodename);
+struct node *get_node_by_path(struct node *tree, const char *path);
+struct node *get_node_by_label(struct node *tree, const char *label);
+struct node *get_node_by_phandle(struct node *tree, cell_t phandle);
+struct node *get_node_by_ref(struct node *tree, const char *ref);
+cell_t get_node_phandle(struct node *root, struct node *node);
+
+/* Boot info (tree plus memreserve information */
+
+struct reserve_info {
+        struct fdt_reserve_entry re;
+
+        struct reserve_info *next;
+
+        char *label;
+};
+
+struct reserve_info *build_reserve_entry(u64 start, u64 len, char *label);
+struct reserve_info *chain_reserve_entry(struct reserve_info *first,
+                                         struct reserve_info *list);
+struct reserve_info *add_reserve_entry(struct reserve_info *list,
+                                       struct reserve_info *new);
+
+
+struct boot_info {
+        struct reserve_info *reservelist;
+        struct node *dt;                /* the device tree */
+};
+
+struct boot_info *build_boot_info(struct reserve_info *reservelist,
+                                  struct node *tree);
+
+/* Checks */
+
+void process_checks(int force, struct boot_info *bi,
+                    int checkflag, int outversion, int boot_cpuid_phys);
+
+/* Flattened trees */
+
+void dt_to_blob(FILE *f, struct boot_info *bi, int version,
+                int boot_cpuid_phys);
+void dt_to_asm(FILE *f, struct boot_info *bi, int version,
+               int boot_cpuid_phys);
+
+struct boot_info *dt_from_blob(FILE *f);
+
+/* Tree source */
+
+void dt_to_source(FILE *f, struct boot_info *bi);
+struct boot_info *dt_from_source(const char *f);
+
+/* FS trees */
+
+struct boot_info *dt_from_fs(const char *dirname);
+
+/* misc */
+
+char *join_path(const char *path, const char *name);
+void fill_fullpaths(struct node *tree, const char *prefix);
+
+#endif /* _DTC_H */
diff --git a/arch/powerpc/boot/dtc-src/flattree.c b/arch/powerpc/boot/dtc-src/flattree.c
new file mode 100644
index 000000000000..a7cfb843d334
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/flattree.c
@@ -0,0 +1,968 @@
+/*
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+#include "dtc.h"
+
+#define FTF_FULLPATH    0x1
+#define FTF_VARALIGN    0x2
+#define FTF_NAMEPROPS   0x4
+#define FTF_BOOTCPUID   0x8
+#define FTF_STRTABSIZE  0x10
+#define FTF_STRUCTSIZE  0x20
+#define FTF_NOPS        0x40
+
+static struct version_info {
+        int version;
+        int last_comp_version;
+        int hdr_size;
+        int flags;
+} version_table[] = {
+        {1, 1, FDT_V1_SIZE,
+         FTF_FULLPATH|FTF_VARALIGN|FTF_NAMEPROPS},
+        {2, 1, FDT_V2_SIZE,
+         FTF_FULLPATH|FTF_VARALIGN|FTF_NAMEPROPS|FTF_BOOTCPUID},
+        {3, 1, FDT_V3_SIZE,
+         FTF_FULLPATH|FTF_VARALIGN|FTF_NAMEPROPS|FTF_BOOTCPUID|FTF_STRTABSIZE},
+        {16, 16, FDT_V3_SIZE,
+         FTF_BOOTCPUID|FTF_STRTABSIZE|FTF_NOPS},
+        {17, 16, FDT_V17_SIZE,
+         FTF_BOOTCPUID|FTF_STRTABSIZE|FTF_STRUCTSIZE|FTF_NOPS},
+};
+
+struct emitter {
+        void (*cell)(void *, cell_t);
+        void (*string)(void *, char *, int);
+        void (*align)(void *, int);
+        void (*data)(void *, struct data);
+        void (*beginnode)(void *, const char *);
+        void (*endnode)(void *, const char *);
+        void (*property)(void *, const char *);
+};
+
+static void bin_emit_cell(void *e, cell_t val)
+{
+        struct data *dtbuf = e;
+
+        *dtbuf = data_append_cell(*dtbuf, val);
+}
+
+static void bin_emit_string(void *e, char *str, int len)
+{
+        struct data *dtbuf = e;
+
+        if (len == 0)
+                len = strlen(str);
+
+        *dtbuf = data_append_data(*dtbuf, str, len);
+        *dtbuf = data_append_byte(*dtbuf, '\0');
+}
+
+static void bin_emit_align(void *e, int a)
+{
+        struct data *dtbuf = e;
+
+        *dtbuf = data_append_align(*dtbuf, a);
+}
+
+static void bin_emit_data(void *e, struct data d)
+{
+        struct data *dtbuf = e;
+
+        *dtbuf = data_append_data(*dtbuf, d.val, d.len);
+}
+
+static void bin_emit_beginnode(void *e, const char *label)
+{
+        bin_emit_cell(e, FDT_BEGIN_NODE);
+}
+
+static void bin_emit_endnode(void *e, const char *label)
+{
+        bin_emit_cell(e, FDT_END_NODE);
+}
+
+static void bin_emit_property(void *e, const char *label)
+{
+        bin_emit_cell(e, FDT_PROP);
+}
+
+static struct emitter bin_emitter = {
+        .cell = bin_emit_cell,
+        .string = bin_emit_string,
+        .align = bin_emit_align,
+        .data = bin_emit_data,
+        .beginnode = bin_emit_beginnode,
+        .endnode = bin_emit_endnode,
+        .property = bin_emit_property,
+};
+
+static void emit_label(FILE *f, const char *prefix, const char *label)
+{
+        fprintf(f, "\t.globl\t%s_%s\n", prefix, label);
+        fprintf(f, "%s_%s:\n", prefix, label);
+        fprintf(f, "_%s_%s:\n", prefix, label);
+}
+
+static void emit_offset_label(FILE *f, const char *label, int offset)
+{
+        fprintf(f, "\t.globl\t%s\n", label);
+        fprintf(f, "%s\t= . + %d\n", label, offset);
+}
+
+static void asm_emit_cell(void *e, cell_t val)
+{
+        FILE *f = e;
+
+        fprintf(f, "\t.long\t0x%x\n", val);
+}
+
+static void asm_emit_string(void *e, char *str, int len)
+{
+        FILE *f = e;
+        char c = 0;
+
+        if (len != 0) {
+                /* XXX: ewww */
+                c = str[len];
+                str[len] = '\0';
+        }
+
+        fprintf(f, "\t.string\t\"%s\"\n", str);
+
+        if (len != 0) {
+                str[len] = c;
+        }
+}
+
+static void asm_emit_align(void *e, int a)
+{
+        FILE *f = e;
+
+        fprintf(f, "\t.balign\t%d\n", a);
+}
+
+static void asm_emit_data(void *e, struct data d)
+{
+        FILE *f = e;
+        int off = 0;
+        struct marker *m;
+
+        m = d.markers;
+        while (m) {
+                if (m->type == LABEL)
+                        emit_offset_label(f, m->ref, m->offset);
+                m = m->next;
+        }
+
+        while ((d.len - off) >= sizeof(u32)) {
+                fprintf(f, "\t.long\t0x%x\n",
+                        be32_to_cpu(*((u32 *)(d.val+off))));
+                off += sizeof(u32);
+        }
+
+        if ((d.len - off) >= sizeof(u16)) {
+                fprintf(f, "\t.short\t0x%hx\n",
+                        be16_to_cpu(*((u16 *)(d.val+off))));
+                off += sizeof(u16);
+        }
+
+        if ((d.len - off) >= 1) {
+                fprintf(f, "\t.byte\t0x%hhx\n", d.val[off]);
+                off += 1;
+        }
+
+        assert(off == d.len);
+}
+
+static void asm_emit_beginnode(void *e, const char *label)
+{
+        FILE *f = e;
+
+        if (label) {
+                fprintf(f, "\t.globl\t%s\n", label);
+                fprintf(f, "%s:\n", label);
+        }
+        fprintf(f, "\t.long\tFDT_BEGIN_NODE\n");
+}
+
+static void asm_emit_endnode(void *e, const char *label)
+{
+        FILE *f = e;
+
+        fprintf(f, "\t.long\tFDT_END_NODE\n");
+        if (label) {
+                fprintf(f, "\t.globl\t%s_end\n", label);
+                fprintf(f, "%s_end:\n", label);
+        }
+}
+
+static void asm_emit_property(void *e, const char *label)
+{
+        FILE *f = e;
+
+        if (label) {
+                fprintf(f, "\t.globl\t%s\n", label);
+                fprintf(f, "%s:\n", label);
+        }
+        fprintf(f, "\t.long\tFDT_PROP\n");
+}
+
+static struct emitter asm_emitter = {
+        .cell = asm_emit_cell,
+        .string = asm_emit_string,
+        .align = asm_emit_align,
+        .data = asm_emit_data,
+        .beginnode = asm_emit_beginnode,
+        .endnode = asm_emit_endnode,
+        .property = asm_emit_property,
+};
+
+static int stringtable_insert(struct data *d, const char *str)
+{
+        int i;
+
+        /* FIXME: do this more efficiently? */
+
+        for (i = 0; i < d->len; i++) {
+                if (streq(str, d->val + i))
+                        return i;
+        }
+
+        *d = data_append_data(*d, str, strlen(str)+1);
+        return i;
+}
+
+static void flatten_tree(struct node *tree, struct emitter *emit,
+                         void *etarget, struct data *strbuf,
+                         struct version_info *vi)
+{
+        struct property *prop;
+        struct node *child;
+        int seen_name_prop = 0;
+
+        emit->beginnode(etarget, tree->label);
+
+        if (vi->flags & FTF_FULLPATH)
+                emit->string(etarget, tree->fullpath, 0);
+        else
+                emit->string(etarget, tree->name, 0);
+
+        emit->align(etarget, sizeof(cell_t));
+
+        for_each_property(tree, prop) {
+                int nameoff;
+
+                if (streq(prop->name, "name"))
+                        seen_name_prop = 1;
+
+                nameoff = stringtable_insert(strbuf, prop->name);
+
+                emit->property(etarget, prop->label);
+                emit->cell(etarget, prop->val.len);
+                emit->cell(etarget, nameoff);
+
+                if ((vi->flags & FTF_VARALIGN) && (prop->val.len >= 8))
+                        emit->align(etarget, 8);
+
+                emit->data(etarget, prop->val);
+                emit->align(etarget, sizeof(cell_t));
+        }
+
+        if ((vi->flags & FTF_NAMEPROPS) && !seen_name_prop) {
+                emit->property(etarget, NULL);
+                emit->cell(etarget, tree->basenamelen+1);
+                emit->cell(etarget, stringtable_insert(strbuf, "name"));
+
+                if ((vi->flags & FTF_VARALIGN) && ((tree->basenamelen+1) >= 8))
+                        emit->align(etarget, 8);
+
+                emit->string(etarget, tree->name, tree->basenamelen);
+                emit->align(etarget, sizeof(cell_t));
+        }
+
+        for_each_child(tree, child) {
+                flatten_tree(child, emit, etarget, strbuf, vi);
+        }
+
+        emit->endnode(etarget, tree->label);
+}
+
+static struct data flatten_reserve_list(struct reserve_info *reservelist,
+                                 struct version_info *vi)
+{
+        struct reserve_info *re;
+        struct data d = empty_data;
+        static struct fdt_reserve_entry null_re = {0,0};
+        int    j;
+
+        for (re = reservelist; re; re = re->next) {
+                d = data_append_re(d, &re->re);
+        }
+        /*
+         * Add additional reserved slots if the user asked for them.
+         */
+        for (j = 0; j < reservenum; j++) {
+                d = data_append_re(d, &null_re);
+        }
+
+        return d;
+}
+
+static void make_fdt_header(struct fdt_header *fdt,
+                            struct version_info *vi,
+                            int reservesize, int dtsize, int strsize,
+                            int boot_cpuid_phys)
+{
+        int reserve_off;
+
+        reservesize += sizeof(struct fdt_reserve_entry);
+
+        memset(fdt, 0xff, sizeof(*fdt));
+
+        fdt->magic = cpu_to_be32(FDT_MAGIC);
+        fdt->version = cpu_to_be32(vi->version);
+        fdt->last_comp_version = cpu_to_be32(vi->last_comp_version);
+
+        /* Reserve map should be doubleword aligned */
+        reserve_off = ALIGN(vi->hdr_size, 8);
+
+        fdt->off_mem_rsvmap = cpu_to_be32(reserve_off);
+        fdt->off_dt_struct = cpu_to_be32(reserve_off + reservesize);
+        fdt->off_dt_strings = cpu_to_be32(reserve_off + reservesize
+                                          + dtsize);
+        fdt->totalsize = cpu_to_be32(reserve_off + reservesize + dtsize + strsize);
+
+        if (vi->flags & FTF_BOOTCPUID)
+                fdt->boot_cpuid_phys = cpu_to_be32(boot_cpuid_phys);
+        if (vi->flags & FTF_STRTABSIZE)
+                fdt->size_dt_strings = cpu_to_be32(strsize);
+        if (vi->flags & FTF_STRUCTSIZE)
+                fdt->size_dt_struct = cpu_to_be32(dtsize);
+}
+
+void dt_to_blob(FILE *f, struct boot_info *bi, int version,
+                int boot_cpuid_phys)
+{
+        struct version_info *vi = NULL;
+        int i;
+        struct data blob       = empty_data;
+        struct data reservebuf = empty_data;
+        struct data dtbuf      = empty_data;
+        struct data strbuf     = empty_data;
+        struct fdt_header fdt;
+        int padlen = 0;
+
+        for (i = 0; i < ARRAY_SIZE(version_table); i++) {
+                if (version_table[i].version == version)
+                        vi = &version_table[i];
+        }
+        if (!vi)
+                die("Unknown device tree blob version %d\n", version);
+
+        flatten_tree(bi->dt, &bin_emitter, &dtbuf, &strbuf, vi);
+        bin_emit_cell(&dtbuf, FDT_END);
+
+        reservebuf = flatten_reserve_list(bi->reservelist, vi);
+
+        /* Make header */
+        make_fdt_header(&fdt, vi, reservebuf.len, dtbuf.len, strbuf.len,
+                        boot_cpuid_phys);
+
+        /*
+         * If the user asked for more space than is used, adjust the totalsize.
+         */
+        if (minsize > 0) {
+                padlen = minsize - be32_to_cpu(fdt.totalsize);
+                if ((padlen < 0) && (quiet < 1))
+                        fprintf(stderr,
+                                "Warning: blob size %d >= minimum size %d\n",
+                                be32_to_cpu(fdt.totalsize), minsize);
+        }
+
+        if (padsize > 0)
+                padlen = padsize;
+
+        if (padlen > 0) {
+                int tsize = be32_to_cpu(fdt.totalsize);
+                tsize += padlen;
+                fdt.totalsize = cpu_to_be32(tsize);
+        }
+
+        /*
+         * Assemble the blob: start with the header, add with alignment
+         * the reserve buffer, add the reserve map terminating zeroes,
+         * the device tree itself, and finally the strings.
+         */
+        blob = data_append_data(blob, &fdt, sizeof(fdt));
+        blob = data_append_align(blob, 8);
+        blob = data_merge(blob, reservebuf);
+        blob = data_append_zeroes(blob, sizeof(struct fdt_reserve_entry));
+        blob = data_merge(blob, dtbuf);
+        blob = data_merge(blob, strbuf);
+
+        /*
+         * If the user asked for more space than is used, pad out the blob.
+         */
+        if (padlen > 0)
+                blob = data_append_zeroes(blob, padlen);
+
+        fwrite(blob.val, blob.len, 1, f);
+
+        if (ferror(f))
+                die("Error writing device tree blob: %s\n", strerror(errno));
+
+        /*
+         * data_merge() frees the right-hand element so only the blob
+         * remains to be freed.
+         */
+        data_free(blob);
+}
+
+static void dump_stringtable_asm(FILE *f, struct data strbuf)
+{
+        const char *p;
+        int len;
+
+        p = strbuf.val;
+
+        while (p < (strbuf.val + strbuf.len)) {
+                len = strlen(p);
+                fprintf(f, "\t.string \"%s\"\n", p);
+                p += len+1;
+        }
+}
+
+void dt_to_asm(FILE *f, struct boot_info *bi, int version, int boot_cpuid_phys)
+{
+        struct version_info *vi = NULL;
+        int i;
+        struct data strbuf = empty_data;
+        struct reserve_info *re;
+        const char *symprefix = "dt";
+
+        for (i = 0; i < ARRAY_SIZE(version_table); i++) {
+                if (version_table[i].version == version)
+                        vi = &version_table[i];
+        }
+        if (!vi)
+                die("Unknown device tree blob version %d\n", version);
+
+        fprintf(f, "/* autogenerated by dtc, do not edit */\n\n");
+        fprintf(f, "#define FDT_MAGIC 0x%x\n", FDT_MAGIC);
+        fprintf(f, "#define FDT_BEGIN_NODE 0x%x\n", FDT_BEGIN_NODE);
+        fprintf(f, "#define FDT_END_NODE 0x%x\n", FDT_END_NODE);
+        fprintf(f, "#define FDT_PROP 0x%x\n", FDT_PROP);
+        fprintf(f, "#define FDT_END 0x%x\n", FDT_END);
+        fprintf(f, "\n");
+
+        emit_label(f, symprefix, "blob_start");
+        emit_label(f, symprefix, "header");
+        fprintf(f, "\t.long\tFDT_MAGIC\t\t\t\t/* magic */\n");
+        fprintf(f, "\t.long\t_%s_blob_abs_end - _%s_blob_start\t/* totalsize */\n",
+                symprefix, symprefix);
+        fprintf(f, "\t.long\t_%s_struct_start - _%s_blob_start\t/* off_dt_struct */\n",
+                symprefix, symprefix);
+        fprintf(f, "\t.long\t_%s_strings_start - _%s_blob_start\t/* off_dt_strings */\n",
+                symprefix, symprefix);
+        fprintf(f, "\t.long\t_%s_reserve_map - _%s_blob_start\t/* off_dt_strings */\n",
+                symprefix, symprefix);
+        fprintf(f, "\t.long\t%d\t\t\t\t\t/* version */\n", vi->version);
+        fprintf(f, "\t.long\t%d\t\t\t\t\t/* last_comp_version */\n",
+                vi->last_comp_version);
+
+        if (vi->flags & FTF_BOOTCPUID)
+                fprintf(f, "\t.long\t%i\t\t\t\t\t/* boot_cpuid_phys */\n",
+                        boot_cpuid_phys);
+
+        if (vi->flags & FTF_STRTABSIZE)
+                fprintf(f, "\t.long\t_%s_strings_end - _%s_strings_start\t/* size_dt_strings */\n",
+                        symprefix, symprefix);
+
+        if (vi->flags & FTF_STRUCTSIZE)
+                fprintf(f, "\t.long\t_%s_struct_end - _%s_struct_start\t/* size_dt_struct */\n",
+                        symprefix, symprefix);
+
+        /*
+         * Reserve map entries.
+         * Align the reserve map to a doubleword boundary.
+         * Each entry is an (address, size) pair of u64 values.
+         * Always supply a zero-sized temination entry.
+         */
+        asm_emit_align(f, 8);
+        emit_label(f, symprefix, "reserve_map");
+
+        fprintf(f, "/* Memory reserve map from source file */\n");
+
+        /*
+         * Use .long on high and low halfs of u64s to avoid .quad
+         * as it appears .quad isn't available in some assemblers.
+         */
+        for (re = bi->reservelist; re; re = re->next) {
+                if (re->label) {
+                        fprintf(f, "\t.globl\t%s\n", re->label);
+                        fprintf(f, "%s:\n", re->label);
+                }
+                fprintf(f, "\t.long\t0x%08x, 0x%08x\n",
+                        (unsigned int)(re->re.address >> 32),
+                        (unsigned int)(re->re.address & 0xffffffff));
+                fprintf(f, "\t.long\t0x%08x, 0x%08x\n",
+                        (unsigned int)(re->re.size >> 32),
+                        (unsigned int)(re->re.size & 0xffffffff));
+        }
+        for (i = 0; i < reservenum; i++) {
+                fprintf(f, "\t.long\t0, 0\n\t.long\t0, 0\n");
+        }
+
+        fprintf(f, "\t.long\t0, 0\n\t.long\t0, 0\n");
+
+        emit_label(f, symprefix, "struct_start");
+        flatten_tree(bi->dt, &asm_emitter, f, &strbuf, vi);
+        fprintf(f, "\t.long\tFDT_END\n");
+        emit_label(f, symprefix, "struct_end");
+
+        emit_label(f, symprefix, "strings_start");
+        dump_stringtable_asm(f, strbuf);
+        emit_label(f, symprefix, "strings_end");
+
+        emit_label(f, symprefix, "blob_end");
+
+        /*
+         * If the user asked for more space than is used, pad it out.
+         */
+        if (minsize > 0) {
+                fprintf(f, "\t.space\t%d - (_%s_blob_end - _%s_blob_start), 0\n",
+                        minsize, symprefix, symprefix);
+        }
+        if (padsize > 0) {
+                fprintf(f, "\t.space\t%d, 0\n", padsize);
+        }
+        emit_label(f, symprefix, "blob_abs_end");
+
+        data_free(strbuf);
+}
+
+struct inbuf {
+        char *base, *limit, *ptr;
+};
+
+static void inbuf_init(struct inbuf *inb, void *base, void *limit)
+{
+        inb->base = base;
+        inb->limit = limit;
+        inb->ptr = inb->base;
+}
+
+static void flat_read_chunk(struct inbuf *inb, void *p, int len)
+{
+        if ((inb->ptr + len) > inb->limit)
+                die("Premature end of data parsing flat device tree\n");
+
+        memcpy(p, inb->ptr, len);
+
+        inb->ptr += len;
+}
+
+static u32 flat_read_word(struct inbuf *inb)
+{
+        u32 val;
+
+        assert(((inb->ptr - inb->base) % sizeof(val)) == 0);
+
+        flat_read_chunk(inb, &val, sizeof(val));
+
+        return be32_to_cpu(val);
+}
+
+static void flat_realign(struct inbuf *inb, int align)
+{
+        int off = inb->ptr - inb->base;
+
+        inb->ptr = inb->base + ALIGN(off, align);
+        if (inb->ptr > inb->limit)
+                die("Premature end of data parsing flat device tree\n");
+}
+
+static char *flat_read_string(struct inbuf *inb)
+{
+        int len = 0;
+        const char *p = inb->ptr;
+        char *str;
+
+        do {
+                if (p >= inb->limit)
+                        die("Premature end of data parsing flat device tree\n");
+                len++;
+        } while ((*p++) != '\0');
+
+        str = strdup(inb->ptr);
+
+        inb->ptr += len;
+
+        flat_realign(inb, sizeof(u32));
+
+        return str;
+}
+
+static struct data flat_read_data(struct inbuf *inb, int len)
+{
+        struct data d = empty_data;
+
+        if (len == 0)
+                return empty_data;
+
+        d = data_grow_for(d, len);
+        d.len = len;
+
+        flat_read_chunk(inb, d.val, len);
+
+        flat_realign(inb, sizeof(u32));
+
+        return d;
+}
+
+static char *flat_read_stringtable(struct inbuf *inb, int offset)
+{
+        const char *p;
+
+        p = inb->base + offset;
+        while (1) {
+                if (p >= inb->limit || p < inb->base)
+                        die("String offset %d overruns string table\n",
+                            offset);
+
+                if (*p == '\0')
+                        break;
+
+                p++;
+        }
+
+        return strdup(inb->base + offset);
+}
+
+static struct property *flat_read_property(struct inbuf *dtbuf,
+                                           struct inbuf *strbuf, int flags)
+{
+        u32 proplen, stroff;
+        char *name;
+        struct data val;
+
+        proplen = flat_read_word(dtbuf);
+        stroff = flat_read_word(dtbuf);
+
+        name = flat_read_stringtable(strbuf, stroff);
+
+        if ((flags & FTF_VARALIGN) && (proplen >= 8))
+                flat_realign(dtbuf, 8);
+
+        val = flat_read_data(dtbuf, proplen);
+
+        return build_property(name, val, NULL);
+}
+
+
+static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)
+{
+        struct reserve_info *reservelist = NULL;
+        struct reserve_info *new;
+        const char *p;
+        struct fdt_reserve_entry re;
+
+        /*
+         * Each entry is a pair of u64 (addr, size) values for 4 cell_t's.
+         * List terminates at an entry with size equal to zero.
+         *
+         * First pass, count entries.
+         */
+        p = inb->ptr;
+        while (1) {
+                flat_read_chunk(inb, &re, sizeof(re));
+                re.address  = be64_to_cpu(re.address);
+                re.size = be64_to_cpu(re.size);
+                if (re.size == 0)
+                        break;
+
+                new = build_reserve_entry(re.address, re.size, NULL);
+                reservelist = add_reserve_entry(reservelist, new);
+        }
+
+        return reservelist;
+}
+
+
+static char *nodename_from_path(const char *ppath, const char *cpath)
+{
+        const char *lslash;
+        int plen;
+
+        lslash = strrchr(cpath, '/');
+        if (! lslash)
+                return NULL;
+
+        plen = lslash - cpath;
+
+        if (streq(cpath, "/") && streq(ppath, ""))
+                return "";
+
+        if ((plen == 0) && streq(ppath, "/"))
+                return strdup(lslash+1);
+
+        if (! strneq(ppath, cpath, plen))
+                return NULL;
+
+        return strdup(lslash+1);
+}
+
+static const char PROPCHAR[] = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789,._+*#?-";
+static const char UNITCHAR[] = "0123456789abcdef,";
+
+static int check_node_name(const char *name)
+{
+        const char *atpos;
+        int basenamelen;
+
+        atpos = strrchr(name, '@');
+
+        if (atpos)
+                basenamelen = atpos - name;
+        else
+                basenamelen = strlen(name);
+
+        if (strspn(name, PROPCHAR) < basenamelen)
+                return -1;
+
+        if (atpos
+            && ((basenamelen + 1 + strspn(atpos+1, UNITCHAR)) < strlen(name)))
+                return -1;
+
+        return basenamelen;
+}
+
+static struct node *unflatten_tree(struct inbuf *dtbuf,
+                                   struct inbuf *strbuf,
+                                   const char *parent_path, int flags)
+{
+        struct node *node;
+        u32 val;
+
+        node = build_node(NULL, NULL);
+
+        if (flags & FTF_FULLPATH) {
+                node->fullpath = flat_read_string(dtbuf);
+                node->name = nodename_from_path(parent_path, node->fullpath);
+
+                if (! node->name)
+                        die("Path \"%s\" is not valid as a child of \"%s\"\n",
+                            node->fullpath, parent_path);
+        } else {
+                node->name = flat_read_string(dtbuf);
+                node->fullpath = join_path(parent_path, node->name);
+        }
+
+        node->basenamelen = check_node_name(node->name);
+        if (node->basenamelen < 0) {
+                fprintf(stderr, "Warning \"%s\" has incorrect format\n", node->name);
+        }
+
+        do {
+                struct property *prop;
+                struct node *child;
+
+                val = flat_read_word(dtbuf);
+                switch (val) {
+                case FDT_PROP:
+                        if (node->children)
+                                fprintf(stderr, "Warning: Flat tree input has "
+                                        "subnodes preceding a property.\n");
+                        prop = flat_read_property(dtbuf, strbuf, flags);
+                        add_property(node, prop);
+                        break;
+
+                case FDT_BEGIN_NODE:
+                        child = unflatten_tree(dtbuf,strbuf, node->fullpath,
+                                               flags);
+                        add_child(node, child);
+                        break;
+
+                case FDT_END_NODE:
+                        break;
+
+                case FDT_END:
+                        die("Premature FDT_END in device tree blob\n");
+                        break;
+
+                case FDT_NOP:
+                        if (!(flags & FTF_NOPS))
+                                fprintf(stderr, "Warning: NOP tag found in flat tree"
+                                        " version <16\n");
+
+                        /* Ignore */
+                        break;
+
+                default:
+                        die("Invalid opcode word %08x in device tree blob\n",
+                            val);
+                }
+        } while (val != FDT_END_NODE);
+
+        return node;
+}
+
+
+struct boot_info *dt_from_blob(FILE *f)
+{
+        u32 magic, totalsize, version, size_str, size_dt;
+        u32 off_dt, off_str, off_mem_rsvmap;
+        int rc;
+        char *blob;
+        struct fdt_header *fdt;
+        char *p;
+        struct inbuf dtbuf, strbuf;
+        struct inbuf memresvbuf;
+        int sizeleft;
+        struct reserve_info *reservelist;
+        struct node *tree;
+        u32 val;
+        int flags = 0;
+
+        rc = fread(&magic, sizeof(magic), 1, f);
+        if (ferror(f))
+                die("Error reading DT blob magic number: %s\n",
+                    strerror(errno));
+        if (rc < 1) {
+                if (feof(f))
+                        die("EOF reading DT blob magic number\n");
+                else
+                        die("Mysterious short read reading magic number\n");
+        }
+
+        magic = be32_to_cpu(magic);
+        if (magic != FDT_MAGIC)
+                die("Blob has incorrect magic number\n");
+
+        rc = fread(&totalsize, sizeof(totalsize), 1, f);
+        if (ferror(f))
+                die("Error reading DT blob size: %s\n", strerror(errno));
+        if (rc < 1) {
+                if (feof(f))
+                        die("EOF reading DT blob size\n");
+                else
+                        die("Mysterious short read reading blob size\n");
+        }
+
+        totalsize = be32_to_cpu(totalsize);
+        if (totalsize < FDT_V1_SIZE)
+                die("DT blob size (%d) is too small\n", totalsize);
+
+        blob = xmalloc(totalsize);
+
+        fdt = (struct fdt_header *)blob;
+        fdt->magic = cpu_to_be32(magic);
+        fdt->totalsize = cpu_to_be32(totalsize);
+
+        sizeleft = totalsize - sizeof(magic) - sizeof(totalsize);
+        p = blob + sizeof(magic)  + sizeof(totalsize);
+
+        while (sizeleft) {
+                if (feof(f))
+                        die("EOF before reading %d bytes of DT blob\n",
+                            totalsize);
+
+                rc = fread(p, 1, sizeleft, f);
+                if (ferror(f))
+                        die("Error reading DT blob: %s\n",
+                            strerror(errno));
+
+                sizeleft -= rc;
+                p += rc;
+        }
+
+        off_dt = be32_to_cpu(fdt->off_dt_struct);
+        off_str = be32_to_cpu(fdt->off_dt_strings);
+        off_mem_rsvmap = be32_to_cpu(fdt->off_mem_rsvmap);
+        version = be32_to_cpu(fdt->version);
+
+        fprintf(stderr, "\tmagic:\t\t\t0x%x\n", magic);
+        fprintf(stderr, "\ttotalsize:\t\t%d\n", totalsize);
+        fprintf(stderr, "\toff_dt_struct:\t\t0x%x\n", off_dt);
+        fprintf(stderr, "\toff_dt_strings:\t\t0x%x\n", off_str);
+        fprintf(stderr, "\toff_mem_rsvmap:\t\t0x%x\n", off_mem_rsvmap);
+        fprintf(stderr, "\tversion:\t\t0x%x\n", version );
+        fprintf(stderr, "\tlast_comp_version:\t0x%x\n",
+                be32_to_cpu(fdt->last_comp_version));
+
+        if (off_mem_rsvmap >= totalsize)
+                die("Mem Reserve structure offset exceeds total size\n");
+
+        if (off_dt >= totalsize)
+                die("DT structure offset exceeds total size\n");
+
+        if (off_str > totalsize)
+                die("String table offset exceeds total size\n");
+
+        if (version >= 2)
+                fprintf(stderr, "\tboot_cpuid_phys:\t0x%x\n",
+                        be32_to_cpu(fdt->boot_cpuid_phys));
+
+        size_str = -1;
+        if (version >= 3) {
+                size_str = be32_to_cpu(fdt->size_dt_strings);
+                fprintf(stderr, "\tsize_dt_strings:\t%d\n", size_str);
+                if (off_str+size_str > totalsize)
+                        die("String table extends past total size\n");
+        }
+
+        if (version >= 17) {
+                size_dt = be32_to_cpu(fdt->size_dt_struct);
+                fprintf(stderr, "\tsize_dt_struct:\t\t%d\n", size_dt);
+                if (off_dt+size_dt > totalsize)
+                        die("Structure block extends past total size\n");
+        }
+
+        if (version < 16) {
+                flags |= FTF_FULLPATH | FTF_NAMEPROPS | FTF_VARALIGN;
+        } else {
+                flags |= FTF_NOPS;
+        }
+
+        inbuf_init(&memresvbuf,
+                   blob + off_mem_rsvmap, blob + totalsize);
+        inbuf_init(&dtbuf, blob + off_dt, blob + totalsize);
+        if (size_str >= 0)
+                inbuf_init(&strbuf, blob + off_str, blob + off_str + size_str);
+        else
+                inbuf_init(&strbuf, blob + off_str, blob + totalsize);
+
+        reservelist = flat_read_mem_reserve(&memresvbuf);
+
+        val = flat_read_word(&dtbuf);
+
+        if (val != FDT_BEGIN_NODE)
+                die("Device tree blob doesn't begin with FDT_BEGIN_NODE (begins with 0x%08x)\n", val);
+
+        tree = unflatten_tree(&dtbuf, &strbuf, "", flags);
+
+        val = flat_read_word(&dtbuf);
+        if (val != FDT_END)
+                die("Device tree blob doesn't end with FDT_END\n");
+
+        free(blob);
+
+        return build_boot_info(reservelist, tree);
+}
diff --git a/arch/powerpc/boot/dtc-src/fstree.c b/arch/powerpc/boot/dtc-src/fstree.c
new file mode 100644
index 000000000000..2a160a46998e
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/fstree.c
@@ -0,0 +1,94 @@
+/*
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+#include "dtc.h"
+
+#include <dirent.h>
+#include <sys/stat.h>
+
+static struct node *read_fstree(const char *dirname)
+{
+        DIR *d;
+        struct dirent *de;
+        struct stat st;
+        struct node *tree;
+
+        d = opendir(dirname);
+        if (! d)
+                die("opendir(): %s\n", strerror(errno));
+
+        tree = build_node(NULL, NULL);
+
+        while ((de = readdir(d)) != NULL) {
+                char *tmpnam;
+
+                if (streq(de->d_name, ".")
+                    || streq(de->d_name, ".."))
+                        continue;
+
+                tmpnam = join_path(dirname, de->d_name);
+
+                if (lstat(tmpnam, &st) < 0)
+                        die("stat(%s): %s\n", tmpnam, strerror(errno));
+
+                if (S_ISREG(st.st_mode)) {
+                        struct property *prop;
+                        FILE *pfile;
+
+                        pfile = fopen(tmpnam, "r");
+                        if (! pfile) {
+                                fprintf(stderr,
+                                        "WARNING: Cannot open %s: %s\n",
+                                        tmpnam, strerror(errno));
+                        } else {
+                                prop = build_property(strdup(de->d_name),
+                                                      data_copy_file(pfile,
+                                                                     st.st_size),
+                                                      NULL);
+                                add_property(tree, prop);
+                                fclose(pfile);
+                        }
+                } else if (S_ISDIR(st.st_mode)) {
+                        struct node *newchild;
+
+                        newchild = read_fstree(tmpnam);
+                        newchild = name_node(newchild, strdup(de->d_name),
+                                             NULL);
+                        add_child(tree, newchild);
+                }
+
+                free(tmpnam);
+        }
+
+        return tree;
+}
+
+struct boot_info *dt_from_fs(const char *dirname)
+{
+        struct node *tree;
+
+        tree = read_fstree(dirname);
+        tree = name_node(tree, "", NULL);
+
+        fill_fullpaths(tree, "");
+
+        return build_boot_info(NULL, tree);
+}
+
diff --git a/arch/powerpc/boot/dtc-src/livetree.c b/arch/powerpc/boot/dtc-src/livetree.c
new file mode 100644
index 000000000000..6ba0846b4310
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/livetree.c
@@ -0,0 +1,305 @@
+/*
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+#include "dtc.h"
+
+/*
+ * Tree building functions
+ */
+
+struct property *build_property(char *name, struct data val, char *label)
+{
+        struct property *new = xmalloc(sizeof(*new));
+
+        new->name = name;
+        new->val = val;
+
+        new->next = NULL;
+
+        new->label = label;
+
+        return new;
+}
+
+struct property *chain_property(struct property *first, struct property *list)
+{
+        assert(first->next == NULL);
+
+        first->next = list;
+        return first;
+}
+
+struct property *reverse_properties(struct property *first)
+{
+        struct property *p = first;
+        struct property *head = NULL;
+        struct property *next;
+
+        while (p) {
+                next = p->next;
+                p->next = head;
+                head = p;
+                p = next;
+        }
+        return head;
+}
+
+struct node *build_node(struct property *proplist, struct node *children)
+{
+        struct node *new = xmalloc(sizeof(*new));
+        struct node *child;
+
+        memset(new, 0, sizeof(*new));
+
+        new->proplist = reverse_properties(proplist);
+        new->children = children;
+
+        for_each_child(new, child) {
+                child->parent = new;
+        }
+
+        return new;
+}
+
+struct node *name_node(struct node *node, char *name, char * label)
+{
+        assert(node->name == NULL);
+
+        node->name = name;
+
+        node->label = label;
+
+        return node;
+}
+
+struct node *chain_node(struct node *first, struct node *list)
+{
+        assert(first->next_sibling == NULL);
+
+        first->next_sibling = list;
+        return first;
+}
+
+void add_property(struct node *node, struct property *prop)
+{
+        struct property **p;
+
+        prop->next = NULL;
+
+        p = &node->proplist;
+        while (*p)
+                p = &((*p)->next);
+
+        *p = prop;
+}
+
+void add_child(struct node *parent, struct node *child)
+{
+        struct node **p;
+
+        child->next_sibling = NULL;
+
+        p = &parent->children;
+        while (*p)
+                p = &((*p)->next_sibling);
+
+        *p = child;
+}
+
+struct reserve_info *build_reserve_entry(u64 address, u64 size, char *label)
+{
+        struct reserve_info *new = xmalloc(sizeof(*new));
+
+        new->re.address = address;
+        new->re.size = size;
+
+        new->next = NULL;
+
+        new->label = label;
+
+        return new;
+}
+
+struct reserve_info *chain_reserve_entry(struct reserve_info *first,
+                                        struct reserve_info *list)
+{
+        assert(first->next == NULL);
+
+        first->next = list;
+        return first;
+}
+
+struct reserve_info *add_reserve_entry(struct reserve_info *list,
+                                      struct reserve_info *new)
+{
+        struct reserve_info *last;
+
+        new->next = NULL;
+
+        if (! list)
+                return new;
+
+        for (last = list; last->next; last = last->next)
+                ;
+
+        last->next = new;
+
+        return list;
+}
+
+struct boot_info *build_boot_info(struct reserve_info *reservelist,
+                                  struct node *tree)
+{
+        struct boot_info *bi;
+
+        bi = xmalloc(sizeof(*bi));
+        bi->reservelist = reservelist;
+        bi->dt = tree;
+
+        return bi;
+}
+
+/*
+ * Tree accessor functions
+ */
+
+const char *get_unitname(struct node *node)
+{
+        if (node->name[node->basenamelen] == '\0')
+                return "";
+        else
+                return node->name + node->basenamelen + 1;
+}
+
+struct property *get_property(struct node *node, const char *propname)
+{
+        struct property *prop;
+
+        for_each_property(node, prop)
+                if (streq(prop->name, propname))
+                        return prop;
+
+        return NULL;
+}
+
+cell_t propval_cell(struct property *prop)
+{
+        assert(prop->val.len == sizeof(cell_t));
+        return be32_to_cpu(*((cell_t *)prop->val.val));
+}
+
+struct node *get_subnode(struct node *node, const char *nodename)
+{
+        struct node *child;
+
+        for_each_child(node, child)
+                if (streq(child->name, nodename))
+                        return child;
+
+        return NULL;
+}
+
+struct node *get_node_by_path(struct node *tree, const char *path)
+{
+        const char *p;
+        struct node *child;
+
+        if (!path || ! (*path))
+                return tree;
+
+        while (path[0] == '/')
+                path++;
+
+        p = strchr(path, '/');
+
+        for_each_child(tree, child) {
+                if (p && strneq(path, child->name, p-path))
+                        return get_node_by_path(child, p+1);
+                else if (!p && streq(path, child->name))
+                        return child;
+        }
+
+        return NULL;
+}
+
+struct node *get_node_by_label(struct node *tree, const char *label)
+{
+        struct node *child, *node;
+
+        assert(label && (strlen(label) > 0));
+
+        if (tree->label && streq(tree->label, label))
+                return tree;
+
+        for_each_child(tree, child) {
+                node = get_node_by_label(child, label);
+                if (node)
+                        return node;
+        }
+
+        return NULL;
+}
+
+struct node *get_node_by_phandle(struct node *tree, cell_t phandle)
+{
+        struct node *child, *node;
+
+        assert((phandle != 0) && (phandle != -1));
+
+        if (tree->phandle == phandle)
+                return tree;
+
+        for_each_child(tree, child) {
+                node = get_node_by_phandle(child, phandle);
+                if (node)
+                        return node;
+        }
+
+        return NULL;
+}
+
+struct node *get_node_by_ref(struct node *tree, const char *ref)
+{
+        if (ref[0] == '/')
+                return get_node_by_path(tree, ref);
+        else
+                return get_node_by_label(tree, ref);
+}
+
+cell_t get_node_phandle(struct node *root, struct node *node)
+{
+        static cell_t phandle = 1; /* FIXME: ick, static local */
+
+        if ((node->phandle != 0) && (node->phandle != -1))
+                return node->phandle;
+
+        assert(! get_property(node, "linux,phandle"));
+
+        while (get_node_by_phandle(root, phandle))
+                phandle++;
+
+        node->phandle = phandle;
+        add_property(node,
+                     build_property("linux,phandle",
+                                    data_append_cell(empty_data, phandle),
+                                    NULL));
+
+        return node->phandle;
+}
diff --git a/arch/powerpc/boot/dtc-src/srcpos.c b/arch/powerpc/boot/dtc-src/srcpos.c
new file mode 100644
index 000000000000..352b0fe06fde
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/srcpos.c
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+#include "dtc.h"
+#include "srcpos.h"
+
+
+/*
+ * Record the complete unique set of opened file names.
+ * Primarily used to cache source position file names.
+ */
+#define MAX_N_FILE_NAMES        (100)
+
+const char *file_names[MAX_N_FILE_NAMES];
+static int n_file_names = 0;
+
+/*
+ * Like yylineno, this is the current open file pos.
+ */
+
+int srcpos_filenum = -1;
+
+
+
+FILE *dtc_open_file(const char *fname)
+{
+        FILE *f;
+
+        if (lookup_file_name(fname, 1) < 0)
+                die("Too many files opened\n");
+
+        if (streq(fname, "-"))
+                f = stdin;
+        else
+                f = fopen(fname, "r");
+
+        if (! f)
+                die("Couldn't open \"%s\": %s\n", fname, strerror(errno));
+
+        return f;
+}
+
+
+
+/*
+ * Locate and optionally add filename fname in the file_names[] array.
+ *
+ * If the filename is currently not in the array and the boolean
+ * add_it is non-zero, an attempt to add the filename will be made.
+ *
+ * Returns;
+ *    Index [0..MAX_N_FILE_NAMES) where the filename is kept
+ *    -1 if the name can not be recorded
+ */
+
+int lookup_file_name(const char *fname, int add_it)
+{
+        int i;
+
+        for (i = 0; i < n_file_names; i++) {
+                if (strcmp(file_names[i], fname) == 0)
+                        return i;
+        }
+
+        if (add_it) {
+                if (n_file_names < MAX_N_FILE_NAMES) {
+                        file_names[n_file_names] = strdup(fname);
+                        return n_file_names++;
+                }
+        }
+
+        return -1;
+}
+
+
+const char *srcpos_filename_for_num(int filenum)
+{
+        if (0 <= filenum && filenum < n_file_names) {
+                return file_names[filenum];
+        }
+
+        return 0;
+}
+
+
+const char *srcpos_get_filename(void)
+{
+        return srcpos_filename_for_num(srcpos_filenum);
+}
diff --git a/arch/powerpc/boot/dtc-src/srcpos.h b/arch/powerpc/boot/dtc-src/srcpos.h
new file mode 100644
index 000000000000..ce7ab5ba5b46
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/srcpos.h
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2007 Jon Loeliger, Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+/*
+ * Augment the standard YYLTYPE with a filenum index into an
+ * array of all opened filenames.
+ */
+
+#if ! defined(YYLTYPE) && ! defined(YYLTYPE_IS_DECLARED)
+typedef struct YYLTYPE {
+    int first_line;
+    int first_column;
+    int last_line;
+    int last_column;
+    int filenum;
+} YYLTYPE;
+
+#define YYLTYPE_IS_DECLARED     1
+#define YYLTYPE_IS_TRIVIAL      1
+#endif
+
+/* Cater to old parser templates. */
+#ifndef YYID
+#define YYID(n) (n)
+#endif
+
+#define YYLLOC_DEFAULT(Current, Rhs, N)                                 \
+    do                                                                  \
+      if (YYID (N))                                                     \
+        {                                                               \
+          (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;        \
+          (Current).first_column = YYRHSLOC (Rhs, 1).first_column;      \
+          (Current).last_line    = YYRHSLOC (Rhs, N).last_line;         \
+          (Current).last_column  = YYRHSLOC (Rhs, N).last_column;       \
+          (Current).filenum      = YYRHSLOC (Rhs, N).filenum;           \
+        }                                                               \
+      else                                                              \
+        {                                                               \
+          (Current).first_line   = (Current).last_line   =              \
+            YYRHSLOC (Rhs, 0).last_line;                                \
+          (Current).first_column = (Current).last_column =              \
+            YYRHSLOC (Rhs, 0).last_column;                              \
+          (Current).filenum      = YYRHSLOC (Rhs, 0).filenum;           \
+        }                                                               \
+    while (YYID (0))
+
+
+
+extern void yyerror(char const *);
+
+extern int srcpos_filenum;
+
+extern int push_input_file(const char *filename);
+extern int pop_input_file(void);
+
+extern FILE *dtc_open_file(const char *fname);
+extern int lookup_file_name(const char *fname, int add_it);
+extern const char *srcpos_filename_for_num(int filenum);
+const char *srcpos_get_filename(void);
diff --git a/arch/powerpc/boot/dtc-src/treesource.c b/arch/powerpc/boot/dtc-src/treesource.c
new file mode 100644
index 000000000000..a6a776797636
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/treesource.c
@@ -0,0 +1,275 @@
+/*
+ * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation.  2005.
+ *
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
+ *                                                                   USA
+ */
+
+#include "dtc.h"
+#include "srcpos.h"
+
+extern FILE *yyin;
+extern int yyparse(void);
+extern void yyerror(char const *);
+
+struct boot_info *the_boot_info;
+
+struct boot_info *dt_from_source(const char *fname)
+{
+        the_boot_info = NULL;
+
+        push_input_file(fname);
+
+        if (yyparse() != 0)
+                return NULL;
+
+        fill_fullpaths(the_boot_info->dt, "");
+
+        return the_boot_info;
+}
+
+static void write_prefix(FILE *f, int level)
+{
+        int i;
+
+        for (i = 0; i < level; i++)
+                fputc('\t', f);
+}
+
+int isstring(char c)
+{
+        return (isprint(c)
+                || (c == '\0')
+                || strchr("\a\b\t\n\v\f\r", c));
+}
+
+static void write_propval_string(FILE *f, struct data val)
+{
+        const char *str = val.val;
+        int i;
+        int newchunk = 1;
+        struct marker *m = val.markers;
+
+        assert(str[val.len-1] == '\0');
+
+        for (i = 0; i < (val.len-1); i++) {
+                char c = str[i];
+
+                if (newchunk) {
+                        while (m && (m->offset <= i)) {
+                                if (m->type == LABEL) {
+                                        assert(m->offset == i);
+                                        fprintf(f, "%s: ", m->ref);
+                                }
+                                m = m->next;
+                        }
+                        fprintf(f, "\"");
+                        newchunk = 0;
+                }
+
+                switch (c) {
+                case '\a':
+                        fprintf(f, "\\a");
+                        break;
+                case '\b':
+                        fprintf(f, "\\b");
+                        break;
+                case '\t':
+                        fprintf(f, "\\t");
+                        break;
+                case '\n':
+                        fprintf(f, "\\n");
+                        break;
+                case '\v':
+                        fprintf(f, "\\v");
+                        break;
+                case '\f':
+                        fprintf(f, "\\f");
+                        break;
+                case '\r':
+                        fprintf(f, "\\r");
+                        break;
+                case '\\':
+                        fprintf(f, "\\\\");
+                        break;
+                case '\"':
+                        fprintf(f, "\\\"");
+                        break;
+                case '\0':
+                        fprintf(f, "\", ");
+                        newchunk = 1;
+                        break;
+                default:
+                        if (isprint(c))
+                                fprintf(f, "%c", c);
+                        else
+                                fprintf(f, "\\x%02hhx", c);
+                }
+        }
+        fprintf(f, "\"");
+
+        /* Wrap up any labels at the end of the value */
+        for_each_marker_of_type(m, LABEL) {
+                assert (m->offset == val.len);
+                fprintf(f, " %s:", m->ref);
+        }
+}
+
+static void write_propval_cells(FILE *f, struct data val)
+{
+        void *propend = val.val + val.len;
+        cell_t *cp = (cell_t *)val.val;
+        struct marker *m = val.markers;
+
+        fprintf(f, "<");
+        for (;;) {
+                while (m && (m->offset <= ((char *)cp - val.val))) {
+                        if (m->type == LABEL) {
+                                assert(m->offset == ((char *)cp - val.val));
+                                fprintf(f, "%s: ", m->ref);
+                        }
+                        m = m->next;
+                }
+
+                fprintf(f, "0x%x", be32_to_cpu(*cp++));
+                if ((void *)cp >= propend)
+                        break;
+                fprintf(f, " ");
+        }
+
+        /* Wrap up any labels at the end of the value */
+        for_each_marker_of_type(m, LABEL) {
+                assert (m->offset == val.len);
+                fprintf(f, " %s:", m->ref);
+        }
+        fprintf(f, ">");
+}
+
+static void write_propval_bytes(FILE *f, struct data val)
+{
+        void *propend = val.val + val.len;
+        const char *bp = val.val;
+        struct marker *m = val.markers;
+
+        fprintf(f, "[");
+        for (;;) {
+                while (m && (m->offset == (bp-val.val))) {
+                        if (m->type == LABEL)
+                                fprintf(f, "%s: ", m->ref);
+                        m = m->next;
+                }
+
+                fprintf(f, "%02hhx", *bp++);
+                if ((void *)bp >= propend)
+                        break;
+                fprintf(f, " ");
+        }
+
+        /* Wrap up any labels at the end of the value */
+        for_each_marker_of_type(m, LABEL) {
+                assert (m->offset == val.len);
+                fprintf(f, " %s:", m->ref);
+        }
+        fprintf(f, "]");
+}
+
+static void write_propval(FILE *f, struct property *prop)
+{
+        int len = prop->val.len;
+        const char *p = prop->val.val;
+        struct marker *m = prop->val.markers;
+        int nnotstring = 0, nnul = 0;
+        int nnotstringlbl = 0, nnotcelllbl = 0;
+        int i;
+
+        if (len == 0) {
+                fprintf(f, ";\n");
+                return;
+        }
+
+        for (i = 0; i < len; i++) {
+                if (! isstring(p[i]))
+                        nnotstring++;
+                if (p[i] == '\0')
+                        nnul++;
+        }
+
+        for_each_marker_of_type(m, LABEL) {
+                if ((m->offset > 0) && (prop->val.val[m->offset - 1] != '\0'))
+                        nnotstringlbl++;
+                if ((m->offset % sizeof(cell_t)) != 0)
+                        nnotcelllbl++;
+        }
+
+        fprintf(f, " = ");
+        if ((p[len-1] == '\0') && (nnotstring == 0) && (nnul < (len-nnul))
+            && (nnotstringlbl == 0)) {
+                write_propval_string(f, prop->val);
+        } else if (((len % sizeof(cell_t)) == 0) && (nnotcelllbl == 0)) {
+                write_propval_cells(f, prop->val);
+        } else {
+                write_propval_bytes(f, prop->val);
+        }
+
+        fprintf(f, ";\n");
+}
+
+static void write_tree_source_node(FILE *f, struct node *tree, int level)
+{
+        struct property *prop;
+        struct node *child;
+
+        write_prefix(f, level);
+        if (tree->label)
+                fprintf(f, "%s: ", tree->label);
+        if (tree->name && (*tree->name))
+                fprintf(f, "%s {\n", tree->name);
+        else
+                fprintf(f, "/ {\n");
+
+        for_each_property(tree, prop) {
+                write_prefix(f, level+1);
+                if (prop->label)
+                        fprintf(f, "%s: ", prop->label);
+                fprintf(f, "%s", prop->name);
+                write_propval(f, prop);
+        }
+        for_each_child(tree, child) {
+                fprintf(f, "\n");
+                write_tree_source_node(f, child, level+1);
+        }
+        write_prefix(f, level);
+        fprintf(f, "};\n");
+}
+
+
+void dt_to_source(FILE *f, struct boot_info *bi)
+{
+        struct reserve_info *re;
+
+        fprintf(f, "/dts-v1/;\n\n");
+
+        for (re = bi->reservelist; re; re = re->next) {
+                if (re->label)
+                        fprintf(f, "%s: ", re->label);
+                fprintf(f, "/memreserve/\t0x%016llx 0x%016llx;\n",
+                        (unsigned long long)re->re.address,
+                        (unsigned long long)re->re.size);
+        }
+
+        write_tree_source_node(f, bi->dt, 0);
+}
+
diff --git a/arch/powerpc/boot/dtc-src/version_gen.h b/arch/powerpc/boot/dtc-src/version_gen.h
new file mode 100644
index 000000000000..6c343031538e
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/version_gen.h
@@ -0,0 +1 @@
+#define DTC_VERSION "DTC 1.0.0-gd6f9b62f"
diff --git a/arch/powerpc/boot/dts/adder875-redboot.dts b/arch/powerpc/boot/dts/adder875-redboot.dts
new file mode 100644
index 000000000000..930bfb3894eb
--- /dev/null
+++ b/arch/powerpc/boot/dts/adder875-redboot.dts
@@ -0,0 +1,184 @@
+/*
+ * Device Tree Source for MPC885 ADS running RedBoot
+ *
+ * Copyright 2006 MontaVista Software, Inc.
+ * Copyright 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 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 Adder MPC875";
+        compatible = "analogue-and-micro,adder875";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                console = &console;
+                ethernet0 = &eth0;
+                ethernet1 = &eth1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,875@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <16>;
+                        i-cache-line-size = <16>;
+                        d-cache-size = <8192>;
+                        i-cache-size = <8192>;
+                        timebase-frequency = <0>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                        interrupts = <15 2>;    // decrementer interrupt
+                        interrupt-parent = <&PIC>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0x01000000>;
+        };
+
+        localbus@fa200100 {
+                compatible = "fsl,mpc885-localbus", "fsl,pq1-localbus",
+                             "simple-bus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <0xfa200100 0x40>;
+
+                ranges = <
+                        0 0 0xfe000000 0x00800000
+                        2 0 0xfa100000 0x00008000
+                >;
+
+                flash@0,0 {
+                        compatible = "cfi-flash";
+                        reg = <0 0 0x800000>;
+                        bank-width = <2>;
+                        device-width = <2>;
+                };
+        };
+
+        soc@fa200000 {
+                compatible = "fsl,mpc875-immr", "fsl,pq1-soc", "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges = <0 0xfa200000 0x00004000>;
+
+                // Temporary until code stops depending on it.
+                device_type = "soc";
+
+                // Temporary until get_immrbase() is fixed.
+                reg = <0xfa200000 0x4000>;
+
+                mdio@e00 {
+                        compatible = "fsl,mpc875-fec-mdio", "fsl,pq1-fec-mdio";
+                        reg = <0xe00 0x188>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        PHY0: ethernet-phy@0 {
+                                reg = <0>;
+                                device_type = "ethernet-phy";
+                        };
+
+                        PHY1: ethernet-phy@1 {
+                                reg = <1>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                eth0: ethernet@e00 {
+                        device_type = "network";
+                        compatible = "fsl,mpc875-fec-enet",
+                                     "fsl,pq1-fec-enet";
+                        reg = <0xe00 0x188>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <3 1>;
+                        interrupt-parent = <&PIC>;
+                        phy-handle = <&PHY0>;
+                        linux,network-index = <0>;
+                };
+
+                eth1: ethernet@1e00 {
+                        device_type = "network";
+                        compatible = "fsl,mpc875-fec-enet",
+                                     "fsl,pq1-fec-enet";
+                        reg = <0x1e00 0x188>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <7 1>;
+                        interrupt-parent = <&PIC>;
+                        phy-handle = <&PHY1>;
+                        linux,network-index = <1>;
+                };
+
+                PIC: interrupt-controller@0 {
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                        reg = <0 0x24>;
+                        compatible = "fsl,mpc875-pic", "fsl,pq1-pic";
+                };
+
+                cpm@9c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc875-cpm", "fsl,cpm1", "simple-bus";
+                        interrupts = <0>;       // cpm error interrupt
+                        interrupt-parent = <&CPM_PIC>;
+                        reg = <0x9c0 0x40>;
+                        ranges;
+
+                        muram {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0x2000 0x2000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 0x1c00>;
+                                };
+                        };
+
+                        brg@9f0 {
+                                compatible = "fsl,mpc875-brg",
+                                             "fsl,cpm1-brg",
+                                             "fsl,cpm-brg";
+                                reg = <0x9f0 0x10>;
+                        };
+
+                        CPM_PIC: interrupt-controller@930 {
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                                interrupts = <5 2 0 2>;
+                                interrupt-parent = <&PIC>;
+                                reg = <0x930 0x20>;
+                                compatible = "fsl,mpc875-cpm-pic",
+                                             "fsl,cpm1-pic";
+                        };
+
+                        console: serial@a80 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc875-smc-uart",
+                                             "fsl,cpm1-smc-uart";
+                                reg = <0xa80 0x10 0x3e80 0x40>;
+                                interrupts = <4>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-brg = <1>;
+                                fsl,cpm-command = <0x0090>;
+                                current-speed = <115200>;
+                        };
+                };
+        };
+
+        chosen {
+                linux,stdout-path = &console;
+        };
+};
diff --git a/arch/powerpc/boot/dts/adder875-uboot.dts b/arch/powerpc/boot/dts/adder875-uboot.dts
new file mode 100644
index 000000000000..0197242dacfb
--- /dev/null
+++ b/arch/powerpc/boot/dts/adder875-uboot.dts
@@ -0,0 +1,183 @@
+/*
+ * Device Tree Source for MPC885 ADS running U-Boot
+ *
+ * Copyright 2006 MontaVista Software, Inc.
+ * Copyright 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 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 Adder MPC875";
+        compatible = "analogue-and-micro,adder875";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                console = &console;
+                ethernet0 = &eth0;
+                ethernet1 = &eth1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,875@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <16>;
+                        i-cache-line-size = <16>;
+                        d-cache-size = <8192>;
+                        i-cache-size = <8192>;
+                        timebase-frequency = <0>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                        interrupts = <15 2>;    // decrementer interrupt
+                        interrupt-parent = <&PIC>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0x01000000>;
+        };
+
+        localbus@ff000100 {
+                compatible = "fsl,mpc885-localbus", "fsl,pq1-localbus",
+                             "simple-bus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <0xff000100 0x40>;
+
+                ranges = <
+                        0 0 0xfe000000 0x01000000
+                >;
+
+                flash@0,0 {
+                        compatible = "cfi-flash";
+                        reg = <0 0 0x800000>;
+                        bank-width = <2>;
+                        device-width = <2>;
+                };
+        };
+
+        soc@ff000000 {
+                compatible = "fsl,mpc875-immr", "fsl,pq1-soc", "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges = <0 0xff000000 0x00004000>;
+
+                // Temporary until code stops depending on it.
+                device_type = "soc";
+
+                // Temporary until get_immrbase() is fixed.
+                reg = <0xff000000 0x4000>;
+
+                mdio@e00 {
+                        compatible = "fsl,mpc875-fec-mdio", "fsl,pq1-fec-mdio";
+                        reg = <0xe00 0x188>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        PHY0: ethernet-phy@0 {
+                                reg = <0>;
+                                device_type = "ethernet-phy";
+                        };
+
+                        PHY1: ethernet-phy@1 {
+                                reg = <1>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                eth0: ethernet@e00 {
+                        device_type = "network";
+                        compatible = "fsl,mpc875-fec-enet",
+                                     "fsl,pq1-fec-enet";
+                        reg = <0xe00 0x188>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <3 1>;
+                        interrupt-parent = <&PIC>;
+                        phy-handle = <&PHY0>;
+                        linux,network-index = <0>;
+                };
+
+                eth1: ethernet@1e00 {
+                        device_type = "network";
+                        compatible = "fsl,mpc875-fec-enet",
+                                     "fsl,pq1-fec-enet";
+                        reg = <0x1e00 0x188>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <7 1>;
+                        interrupt-parent = <&PIC>;
+                        phy-handle = <&PHY1>;
+                        linux,network-index = <1>;
+                };
+
+                PIC: interrupt-controller@0 {
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                        reg = <0 0x24>;
+                        compatible = "fsl,mpc875-pic", "fsl,pq1-pic";
+                };
+
+                cpm@9c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc875-cpm", "fsl,cpm1", "simple-bus";
+                        interrupts = <0>;       // cpm error interrupt
+                        interrupt-parent = <&CPM_PIC>;
+                        reg = <0x9c0 0x40>;
+                        ranges;
+
+                        muram {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0x2000 0x2000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 0x1c00>;
+                                };
+                        };
+
+                        brg@9f0 {
+                                compatible = "fsl,mpc875-brg",
+                                             "fsl,cpm1-brg",
+                                             "fsl,cpm-brg";
+                                reg = <0x9f0 0x10>;
+                        };
+
+                        CPM_PIC: interrupt-controller@930 {
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                                interrupts = <5 2 0 2>;
+                                interrupt-parent = <&PIC>;
+                                reg = <0x930 0x20>;
+                                compatible = "fsl,mpc875-cpm-pic",
+                                             "fsl,cpm1-pic";
+                        };
+
+                        console: serial@a80 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc875-smc-uart",
+                                             "fsl,cpm1-smc-uart";
+                                reg = <0xa80 0x10 0x3e80 0x40>;
+                                interrupts = <4>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-brg = <1>;
+                                fsl,cpm-command = <0x0090>;
+                                current-speed = <115200>;
+                        };
+                };
+        };
+
+        chosen {
+                linux,stdout-path = &console;
+        };
+};
diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts
index cb2fb50a281c..29f1a6f3e373 100644
--- a/arch/powerpc/boot/dts/bamboo.dts
+++ b/arch/powerpc/boot/dts/bamboo.dts
@@ -16,14 +16,24 @@
         #size-cells = <1>;
         model = "amcc,bamboo";
         compatible = "amcc,bamboo";
-        dcr-parent = <&/cpus/PowerPC,440EP@0>;
+        dcr-parent = <&/cpus/cpu@0>;
+
+        aliases {
+                ethernet0 = &EMAC0;
+                ethernet1 = &EMAC1;
+                serial0 = &UART0;
+                serial1 = &UART1;
+                serial2 = &UART2;
+                serial3 = &UART3;
+        };
 
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
-                PowerPC,440EP@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 */
@@ -126,7 +136,6 @@
                                 #address-cells = <2>;
                                 #size-cells = <1>;
                                 clock-frequency = <0>; /* Filled in by zImage */
-                                ranges;
                                 interrupts = <5 1>;
                                 interrupt-parent = <&UIC1>;
                         };
@@ -238,11 +247,56 @@
                                 zmii-device = <&ZMII0>;
                                 zmii-channel = <1>;
                         };
+
+                        usb@ef601000 {
+                                compatible = "ohci-be";
+                                reg = <ef601000 80>;
+                                interrupts = <8 1 9 1>;
+                                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 eec00000 8     /* Config space access */
+                               0 eed00000 4     /* IACK */
+                               0 eed00000 4     /* Special cycle */
+                               0 ef400000 40>;  /* 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>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+
+                        /* Bamboo has all 4 IRQ pins tied together per slot */
+                        interrupt-map-mask = <f800 0 0 0>;
+                        interrupt-map = <
+                                /* IDSEL 1 */
+                                0800 0 0 0 &UIC0 1c 8
+
+                                /* IDSEL 2 */
+                                1000 0 0 0 &UIC0 1b 8
+
+                                /* IDSEL 3 */
+                                1800 0 0 0 &UIC0 1a 8
+
+                                /* IDSEL 4 */
+                                2000 0 0 0 &UIC0 19 8
+                        >;
                 };
         };
 
         chosen {
                 linux,stdout-path = "/plb/opb/serial@ef600300";
-                bootargs = "console=ttyS0,115200";
         };
 };
diff --git a/arch/powerpc/boot/dts/cm5200.dts b/arch/powerpc/boot/dts/cm5200.dts
new file mode 100644
index 000000000000..30737eafe68e
--- /dev/null
+++ b/arch/powerpc/boot/dts/cm5200.dts
@@ -0,0 +1,234 @@
+/*
+ * CM5200 board Device Tree Source
+ *
+ * Copyright (C) 2007 Semihalf
+ * Marian Balakowicz <m8@semihalf.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.
+ */
+
+/*
+ * WARNING: Do not depend on this tree layout remaining static just yet.
+ * The MPC5200 device tree conventions are still in flux
+ * Keep an eye on the linuxppc-dev mailing list for more details
+ */
+
+/ {
+        model = "schindler,cm5200";
+        compatible = "schindler,cm5200";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,5200@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <20>;
+                        i-cache-line-size = <20>;
+                        d-cache-size = <4000>;          // L1, 16K
+                        i-cache-size = <4000>;          // L1, 16K
+                        timebase-frequency = <0>;       // from bootloader
+                        bus-frequency = <0>;            // from bootloader
+                        clock-frequency = <0>;          // from bootloader
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <00000000 04000000>;      // 64MB
+        };
+
+        soc5200@f0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc5200b-immr";
+                ranges = <0 f0000000 0000c000>;
+                reg = <f0000000 00000100>;
+                bus-frequency = <0>;            // from bootloader
+                system-frequency = <0>;         // from bootloader
+
+                cdm@200 {
+                        compatible = "fsl,mpc5200b-cdm","fsl,mpc5200-cdm";
+                        reg = <200 38>;
+                };
+
+                mpc5200_pic: pic@500 {
+                        // 5200 interrupts are encoded into two levels;
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        compatible = "fsl,mpc5200b-pic","fsl,mpc5200-pic";
+                        reg = <500 80>;
+                };
+
+                timer@600 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <600 10>;
+                        interrupts = <1 9 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                        fsl,has-wdt;
+                };
+
+                timer@610 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <610 10>;
+                        interrupts = <1 a 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                timer@620 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <620 10>;
+                        interrupts = <1 b 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                timer@630 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <630 10>;
+                        interrupts = <1 c 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                timer@640 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <640 10>;
+                        interrupts = <1 d 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                timer@650 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <650 10>;
+                        interrupts = <1 e 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                timer@660 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <660 10>;
+                        interrupts = <1 f 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                timer@670 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <670 10>;
+                        interrupts = <1 10 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                rtc@800 {       // Real time clock
+                        compatible = "fsl,mpc5200b-rtc","fsl,mpc5200-rtc";
+                        reg = <800 100>;
+                        interrupts = <1 5 0 1 6 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                gpio@b00 {
+                        compatible = "fsl,mpc5200b-gpio","fsl,mpc5200-gpio";
+                        reg = <b00 40>;
+                        interrupts = <1 7 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                gpio@c00 {
+                        compatible = "fsl,mpc5200b-gpio-wkup","fsl,mpc5200-gpio-wkup";
+                        reg = <c00 40>;
+                        interrupts = <1 8 0 0 3 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                spi@f00 {
+                        compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi";
+                        reg = <f00 20>;
+                        interrupts = <2 d 0 2 e 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                usb@1000 {
+                        compatible = "fsl,mpc5200b-ohci","fsl,mpc5200-ohci","ohci-be";
+                        reg = <1000 ff>;
+                        interrupts = <2 6 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                dma-controller@1200 {
+                        compatible = "fsl,mpc5200b-bestcomm","fsl,mpc5200-bestcomm";
+                        reg = <1200 80>;
+                        interrupts = <3 0 0  3 1 0  3 2 0  3 3 0
+                                      3 4 0  3 5 0  3 6 0  3 7 0
+                                      3 8 0  3 9 0  3 a 0  3 b 0
+                                      3 c 0  3 d 0  3 e 0  3 f 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                xlb@1f00 {
+                        compatible = "fsl,mpc5200b-xlb","fsl,mpc5200-xlb";
+                        reg = <1f00 100>;
+                };
+
+                serial@2000 {           // PSC1
+                        device_type = "serial";
+                        compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
+                        port-number = <0>;  // Logical port assignment
+                        reg = <2000 100>;
+                        interrupts = <2 1 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                serial@2200 {           // PSC2
+                        device_type = "serial";
+                        compatible = "fsl,mpc5200-psc-uart";
+                        port-number = <1>;  // Logical port assignment
+                        reg = <2200 100>;
+                        interrupts = <2 2 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                serial@2400 {           // PSC3
+                        device_type = "serial";
+                        compatible = "fsl,mpc5200-psc-uart";
+                        port-number = <2>;  // Logical port assignment
+                        reg = <2400 100>;
+                        interrupts = <2 3 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                serial@2c00 {           // PSC6
+                        device_type = "serial";
+                        compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
+                        port-number = <5>;  // Logical port assignment
+                        reg = <2c00 100>;
+                        interrupts = <2 4 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                ethernet@3000 {
+                        device_type = "network";
+                        compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";
+                        reg = <3000 800>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <2 5 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                i2c@3d40 {
+                        compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
+                        reg = <3d40 40>;
+                        interrupts = <2 10 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                        fsl5200-clocking;
+                };
+
+                sram@8000 {
+                        compatible = "fsl,mpc5200b-sram","fsl,mpc5200-sram";
+                        reg = <8000 4000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index bc259972aaa0..7aad135a44b0 100644
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -16,14 +16,22 @@
         #size-cells = <1>;
         model = "ibm,ebony";
         compatible = "ibm,ebony";
-        dcr-parent = <&/cpus/PowerPC,440GP@0>;
+        dcr-parent = <&/cpus/cpu@0>;
+
+        aliases {
+                ethernet0 = &EMAC0;
+                ethernet1 = &EMAC1;
+                serial0 = &UART0;
+                serial1 = &UART1;
+        };
 
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
-                PowerPC,440GP@0 {
+                cpu@0 {
                         device_type = "cpu";
+                        model = "PowerPC,440GP";
                         reg = <0>;
                         clock-frequency = <0>; // Filled in by zImage
                         timebase-frequency = <0>; // Filled in by zImage
@@ -150,9 +158,10 @@
                                         };
                                 };
 
-                                ds1743@1,0 {
+                                nvram@1,0 {
                                         /* NVRAM & RTC */
-                                        compatible = "ds1743";
+                                        compatible = "ds1743-nvram";
+                                        #bytes = <2000>;
                                         reg = <1 0 2000>;
                                 };
 
@@ -284,12 +293,43 @@
 
                 };
 
-                PCIX0: pci@1234 {
+                PCIX0: pci@20ec00000 {
                         device_type = "pci";
-                        /* FIXME */
-                        reg = <2 0ec00000 8
-                               2 0ec80000 f0
-                               2 0ec80100 fc>;
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #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 */
+
+                        /* 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>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+
+                        /* Ebony has all 4 IRQ pins tied together per slot */
+                        interrupt-map-mask = <f800 0 0 0>;
+                        interrupt-map = <
+                                /* IDSEL 1 */
+                                0800 0 0 0 &UIC0 17 8
+
+                                /* IDSEL 2 */
+                                1000 0 0 0 &UIC0 18 8
+
+                                /* IDSEL 3 */
+                                1800 0 0 0 &UIC0 19 8
+
+                                /* IDSEL 4 */
+                                2000 0 0 0 &UIC0 1a 8
+                        >;
                 };
         };
 
diff --git a/arch/powerpc/boot/dts/ep405.dts b/arch/powerpc/boot/dts/ep405.dts
new file mode 100644
index 000000000000..92938557ac8a
--- /dev/null
+++ b/arch/powerpc/boot/dts/ep405.dts
@@ -0,0 +1,228 @@
+/*
+ * Device Tree Source for EP405
+ *
+ * Copyright 2007 IBM Corp.
+ * Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ *
+ * 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.
+ */
+
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        model = "ep405";
+        compatible = "ep405";
+        dcr-parent = <&/cpus/cpu@0>;
+
+        aliases {
+                ethernet0 = &EMAC;
+                serial0 = &UART0;
+                serial1 = &UART1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        model = "PowerPC,405GP";
+                        reg = <0>;
+                        clock-frequency = <bebc200>; /* 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>;
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0>; /* Filled in by zImage */
+        };
+
+        UIC0: interrupt-controller {
+                compatible = "ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0c0 9>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+
+        plb {
+                compatible = "ibm,plb3";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by zImage */
+
+                SDRAM0: memory-controller {
+                        compatible = "ibm,sdram-405gp";
+                        dcr-reg = <010 2>;
+                };
+
+                MAL: mcmal {
+                        compatible = "ibm,mcmal-405gp", "ibm,mcmal";
+                        dcr-reg = <180 62>;
+                        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 */>;
+                };
+
+                POB0: opb {
+                        compatible = "ibm,opb-405gp", "ibm,opb";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <ef600000 ef600000 a00000>;
+                        dcr-reg = <0a0 5>;
+                        clock-frequency = <0>; /* Filled in by zImage */
+
+                        UART0: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600300 8>;
+                                virtual-reg = <ef600300>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                current-speed = <2580>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <0 4>;
+                        };
+
+                        UART1: serial@ef600400 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600400 8>;
+                                virtual-reg = <ef600400>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                current-speed = <2580>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+
+                        IIC: i2c@ef600500 {
+                                compatible = "ibm,iic-405gp", "ibm,iic";
+                                reg = <ef600500 11>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+
+                        GPIO: gpio@ef600700 {
+                                compatible = "ibm,gpio-405gp";
+                                reg = <ef600700 20>;
+                        };
+
+                        EMAC: ethernet@ef600800 {
+                                linux,network-index = <0>;
+                                device_type = "network";
+                                compatible = "ibm,emac-405gp", "ibm,emac";
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <
+                                        f 4 /* Ethernet */
+                                        9 4 /* Ethernet Wake Up */>;
+                                local-mac-address = [000000000000]; /* Filled in by zImage */
+                                reg = <ef600800 70>;
+                                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>;
+                                phy-mode = "rmii";
+                                phy-map = <00000000>;
+                        };
+
+                };
+
+                EBC0: ebc {
+                        compatible = "ibm,ebc-405gp", "ibm,ebc";
+                        dcr-reg = <012 2>;
+                        #address-cells = <2>;
+                        #size-cells = <1>;
+
+
+                        /* The ranges property is supplied by the bootwrapper
+                         * and is based on the firmware's configuration of the
+                         * EBC bridge
+                         */
+                        clock-frequency = <0>; /* Filled in by zImage */
+
+                        /* NVRAM and RTC */
+                        nvrtc@4,200000 {
+                                compatible = "ds1742";
+                                reg = <4 200000 0>; /* size fixed up by zImage */
+                        };
+
+                        /* "BCSR" CPLD contains a PCI irq controller */
+                        bcsr@4,0 {
+                                compatible = "ep405-bcsr";
+                                reg = <4 0 10>;
+                                interrupt-controller;
+                                /* Routing table */
+                                irq-routing = [ 00      /* SYSERR */
+                                                01      /* STTM */
+                                                01      /* RTC */
+                                                01      /* FENET */
+                                                02      /* NB PCIIRQ mux ? */
+                                                03      /* SB Winbond 8259 ? */
+                                                04      /* Serial Ring */
+                                                05      /* USB (ep405pc) */
+                                                06      /* XIRQ 0 */
+                                                06      /* XIRQ 1 */
+                                                06      /* XIRQ 2 */
+                                                06      /* XIRQ 3 */
+                                                06      /* XIRQ 4 */
+                                                06      /* XIRQ 5 */
+                                                06      /* XIRQ 6 */
+                                                07];    /* Reserved */
+                        };
+                };
+
+                PCI0: pci@ec000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #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 */
+
+                        /* 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>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 80000000>;
+
+                        /* That's all I know about IRQs on that thing ... */
+                        interrupt-map-mask = <f800 0 0 0>;
+                        interrupt-map = <
+                                /* USB */
+                                7000 0 0 0 &UIC0 1e 8 /* IRQ5 */
+                        >;
+                };
+        };
+
+        chosen {
+                linux,stdout-path = "/plb/opb/serial@ef600300";
+        };
+};
diff --git a/arch/powerpc/boot/dts/ep8248e.dts b/arch/powerpc/boot/dts/ep8248e.dts
new file mode 100644
index 000000000000..5d2fb76a72c1
--- /dev/null
+++ b/arch/powerpc/boot/dts/ep8248e.dts
@@ -0,0 +1,207 @@
+/*
+ * Device Tree for the Embedded Planet EP8248E board running PlanetCore.
+ *
+ * Copyright 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 as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+/ {
+        model = "EP8248E";
+        compatible = "fsl,ep8248e";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                planetcore-SMC1 = &smc1;
+                planetcore-SCC1 = &scc1;
+                ethernet0 = &eth0;
+                ethernet1 = &eth1;
+                serial0 = &smc1;
+                serial1 = &scc1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8248@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <16384>;
+                        i-cache-size = <16384>;
+                        timebase-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        localbus@f0010100 {
+                compatible = "fsl,mpc8248-localbus",
+                             "fsl,pq2-localbus",
+                             "simple-bus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <0xf0010100 0x40>;
+
+                ranges = <0 0 0xfc000000 0x04000000
+                          1 0 0xfa000000 0x00008000>;
+
+                flash@0,3800000 {
+                        compatible = "cfi-flash";
+                        reg = <0 0x3800000 0x800000>;
+                        bank-width = <4>;
+                        device-width = <2>;
+                };
+
+                bcsr@1,0 {
+                        #address-cells = <2>;
+                        #size-cells = <1>;
+                        reg = <1 0 0x10>;
+                        compatible = "fsl,ep8248e-bcsr";
+                        ranges;
+
+                        mdio {
+                                device_type = "mdio";
+                                compatible = "fsl,ep8248e-mdio-bitbang";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                reg = <1 8 1>;
+
+                                PHY0: ethernet-phy@0 {
+                                        interrupt-parent = <&PIC>;
+                                        reg = <0>;
+                                        device_type = "ethernet-phy";
+                                };
+
+                                PHY1: ethernet-phy@1 {
+                                        interrupt-parent = <&PIC>;
+                                        reg = <1>;
+                                        device_type = "ethernet-phy";
+                                };
+                        };
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0>;
+        };
+
+        soc@f0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8248-immr", "fsl,pq2-soc", "simple-bus";
+                ranges = <0x00000000 0xf0000000 0x00053000>;
+
+                // Temporary until code stops depending on it.
+                device_type = "soc";
+
+                // Temporary -- will go away once kernel uses ranges for get_immrbase().
+                reg = <0xf0000000 0x00053000>;
+
+                cpm@119c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        #interrupt-cells = <2>;
+                        compatible = "fsl,mpc8248-cpm", "fsl,cpm2",
+                                     "simple-bus";
+                        reg = <0x119c0 0x30>;
+                        ranges;
+
+                        muram {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0 0x10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 0x1100 0x1140
+                                               0xec0 0x9800 0x800>;
+                                };
+                        };
+
+                        brg@119f0 {
+                                compatible = "fsl,mpc8248-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <0x119f0 0x10 0x115f0 0x10>;
+                        };
+
+                        /* Monitor port/SMC1 */
+                        smc1: serial@11a80 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc8248-smc-uart",
+                                             "fsl,cpm2-smc-uart";
+                                reg = <0x11a80 0x20 0x1100 0x40>;
+                                interrupts = <4 8>;
+                                interrupt-parent = <&PIC>;
+                                fsl,cpm-brg = <7>;
+                                fsl,cpm-command = <0x1d000000>;
+                                linux,planetcore-label = "SMC1";
+                        };
+
+                        /* "Serial" port/SCC1 */
+                        scc1: serial@11a00 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc8248-scc-uart",
+                                             "fsl,cpm2-scc-uart";
+                                reg = <0x11a00 0x20 0x8000 0x100>;
+                                interrupts = <40 8>;
+                                interrupt-parent = <&PIC>;
+                                fsl,cpm-brg = <1>;
+                                fsl,cpm-command = <0x00800000>;
+                                linux,planetcore-label = "SCC1";
+                        };
+
+                        eth0: ethernet@11300 {
+                                device_type = "network";
+                                compatible = "fsl,mpc8248-fcc-enet",
+                                             "fsl,cpm2-fcc-enet";
+                                reg = <0x11300 0x20 0x8400 0x100 0x11390 1>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                                interrupts = <32 8>;
+                                interrupt-parent = <&PIC>;
+                                phy-handle = <&PHY0>;
+                                linux,network-index = <0>;
+                                fsl,cpm-command = <0x12000300>;
+                        };
+
+                        eth1: ethernet@11320 {
+                                device_type = "network";
+                                compatible = "fsl,mpc8248-fcc-enet",
+                                             "fsl,cpm2-fcc-enet";
+                                reg = <0x11320 0x20 0x8500 0x100 0x113b0 1>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                                interrupts = <33 8>;
+                                interrupt-parent = <&PIC>;
+                                phy-handle = <&PHY1>;
+                                linux,network-index = <1>;
+                                fsl,cpm-command = <0x16200300>;
+                        };
+
+                        usb@11b60 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,mpc8248-usb",
+                                             "fsl,cpm2-usb";
+                                reg = <0x11b60 0x18 0x8b00 0x100>;
+                                interrupt-parent = <&PIC>;
+                                interrupts = <11 8>;
+                                fsl,cpm-command = <0x2e600000>;
+                        };
+                };
+
+                PIC: interrupt-controller@10c00 {
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        reg = <0x10c00 0x80>;
+                        compatible = "fsl,mpc8248-pic", "fsl,pq2-pic";
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts
new file mode 100644
index 000000000000..5dd3d15f0feb
--- /dev/null
+++ b/arch/powerpc/boot/dts/haleakala.dts
@@ -0,0 +1,274 @@
+/*
+ * Device Tree Source for AMCC Haleakala (405EXr)
+ *
+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ *
+ * 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.
+ */
+
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        model = "amcc,haleakala";
+        compatible = "amcc,kilauea";
+        dcr-parent = <&/cpus/cpu@0>;
+
+        aliases {
+                ethernet0 = &EMAC0;
+                serial0 = &UART0;
+                serial1 = &UART1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        model = "PowerPC,405EXr";
+                        reg = <0>;
+                        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 */
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0>; /* Filled in by U-Boot */
+        };
+
+        UIC0: interrupt-controller {
+                compatible = "ibm,uic-405exr", "ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0c0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+
+        UIC1: interrupt-controller1 {
+                compatible = "ibm,uic-405exr","ibm,uic";
+                interrupt-controller;
+                cell-index = <1>;
+                dcr-reg = <0d0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        UIC2: interrupt-controller2 {
+                compatible = "ibm,uic-405exr","ibm,uic";
+                interrupt-controller;
+                cell-index = <2>;
+                dcr-reg = <0e0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1c 4 1d 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        plb {
+                compatible = "ibm,plb-405exr", "ibm,plb4";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by U-Boot */
+
+                SDRAM0: memory-controller {
+                        compatible = "ibm,sdram-405exr";
+                        dcr-reg = <010 2>;
+                };
+
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-405exr", "ibm,mcmal2";
+                        dcr-reg = <180 62>;
+                        num-tx-chans = <2>;
+                        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 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>;
+                };
+
+                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>;
+                        clock-frequency = <0>; /* Filled in by U-Boot */
+
+                        EBC0: ebc {
+                                compatible = "ibm,ebc-405exr", "ibm,ebc";
+                                dcr-reg = <012 2>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                /* ranges property is supplied by U-Boot */
+                                interrupts = <5 1>;
+                                interrupt-parent = <&UIC1>;
+
+                                nor_flash@0,0 {
+                                        compatible = "amd,s29gl512n", "cfi-flash";
+                                        bank-width = <2>;
+                                        reg = <0 000000 4000000>;
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+                                        partition@0 {
+                                                label = "kernel";
+                                                reg = <0 200000>;
+                                        };
+                                        partition@200000 {
+                                                label = "root";
+                                                reg = <200000 200000>;
+                                        };
+                                        partition@400000 {
+                                                label = "user";
+                                                reg = <400000 3b60000>;
+                                        };
+                                        partition@3f60000 {
+                                                label = "env";
+                                                reg = <3f60000 40000>;
+                                        };
+                                        partition@3fa0000 {
+                                                label = "u-boot";
+                                                reg = <3fa0000 60000>;
+                                        };
+                                };
+                        };
+
+                        UART0: serial@ef600200 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600200 8>;
+                                virtual-reg = <ef600200>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1a 4>;
+                        };
+
+                        UART1: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600300 8>;
+                                virtual-reg = <ef600300>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+
+                        IIC0: i2c@ef600400 {
+                                compatible = "ibm,iic-405exr", "ibm,iic";
+                                reg = <ef600400 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+
+                        IIC1: i2c@ef600500 {
+                                compatible = "ibm,iic-405exr", "ibm,iic";
+                                reg = <ef600500 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <7 4>;
+                        };
+
+
+                        RGMII0: emac-rgmii@ef600b00 {
+                                compatible = "ibm,rgmii-405exr", "ibm,rgmii";
+                                reg = <ef600b00 104>;
+                                has-mdio;
+                        };
+
+                        EMAC0: ethernet@ef600900 {
+                                linux,network-index = <0>;
+                                device_type = "network";
+                                compatible = "ibm,emac-405exr", "ibm,emac4";
+                                interrupt-parent = <&EMAC0>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC0 18 4
+                                                /*Wake*/  1 &UIC1 1d 4>;
+                                reg = <ef600900 70>;
+                                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 = <5dc>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000000>;
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <0>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                        };
+                };
+
+                PCIE0: pciex@0a0000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "ibm,plb-pciex-405exr", "ibm,plb-pciex";
+                        primary;
+                        port = <0>; /* port number */
+                        reg = <a0000000 20000000        /* Config space access */
+                               ef000000 00001000>;      /* Registers */
+                        dcr-reg = <040 020>;
+                        sdr-base = <400>;
+
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed
+                         */
+                        ranges = <02000000 0 80000000 90000000 0 08000000
+                                  01000000 0 00000000 e0000000 0 00010000>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 80000000>;
+
+                        /* This drives busses 0x00 to 0x3f */
+                        bus-range = <00 3f>;
+
+                        /* Legacy interrupts (note the weird polarity, the bridge seems
+                         * to invert PCIe legacy interrupts).
+                         * We are de-swizzling here because the numbers are actually for
+                         * port of the root complex virtual P2P bridge. But I want
+                         * to avoid putting a node for it in the tree, so the numbers
+                         * 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 = <
+                                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 */>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts
new file mode 100644
index 000000000000..9bdfc0ff3c24
--- /dev/null
+++ b/arch/powerpc/boot/dts/katmai.dts
@@ -0,0 +1,400 @@
+/*
+ * Device Tree Source for AMCC Katmai eval board
+ *
+ * Copyright (c) 2006, 2007 IBM Corp.
+ * Benjamin Herrenschmidt <benh@kernel.crashing.org>
+ *
+ * Copyright (c) 2006, 2007 IBM Corp.
+ * Josh Boyer <jwboyer@linux.vnet.ibm.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.
+ */
+
+/ {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        model = "amcc,katmai";
+        compatible = "amcc,katmai";
+        dcr-parent = <&/cpus/cpu@0>;
+
+        aliases {
+                ethernet0 = &EMAC0;
+                serial0 = &UART0;
+                serial1 = &UART1;
+                serial2 = &UART2;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        model = "PowerPC,440SPe";
+                        reg = <0>;
+                        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 = <20000>;
+                        d-cache-size = <20000>;
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0 0>; /* Filled in by zImage */
+        };
+
+        UIC0: interrupt-controller0 {
+                compatible = "ibm,uic-440spe","ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0c0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+
+        UIC1: interrupt-controller1 {
+                compatible = "ibm,uic-440spe","ibm,uic";
+                interrupt-controller;
+                cell-index = <1>;
+                dcr-reg = <0d0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        UIC2: interrupt-controller2 {
+                compatible = "ibm,uic-440spe","ibm,uic";
+                interrupt-controller;
+                cell-index = <2>;
+                dcr-reg = <0e0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <a 4 b 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        UIC3: interrupt-controller3 {
+                compatible = "ibm,uic-440spe","ibm,uic";
+                interrupt-controller;
+                cell-index = <3>;
+                dcr-reg = <0f0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <10 4 11 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        SDR0: sdr {
+                compatible = "ibm,sdr-440spe";
+                dcr-reg = <00e 002>;
+        };
+
+        CPR0: cpr {
+                compatible = "ibm,cpr-440spe";
+                dcr-reg = <00c 002>;
+        };
+
+        plb {
+                compatible = "ibm,plb-440spe", "ibm,plb-440gp", "ibm,plb4";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by zImage */
+
+                SDRAM0: sdram {
+                        compatible = "ibm,sdram-440spe", "ibm,sdram-405gp";
+                        dcr-reg = <010 2>;
+                };
+
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-440spe", "ibm,mcmal2";
+                        dcr-reg = <180 62>;
+                        num-tx-chans = <2>;
+                        num-rx-chans = <1>;
+                        interrupt-parent = <&MAL0>;
+                        interrupts = <0 1 2 3 4>;
+                        #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>;
+                };
+
+                POB0: opb {
+                        compatible = "ibm,opb-440spe", "ibm,opb-440gp", "ibm,opb";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <00000000 4 e0000000 20000000>;
+                        clock-frequency = <0>; /* Filled in by zImage */
+
+                        EBC0: ebc {
+                                compatible = "ibm,ebc-440spe", "ibm,ebc-440gp", "ibm,ebc";
+                                dcr-reg = <012 2>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                interrupts = <5 1>;
+                                interrupt-parent = <&UIC1>;
+                        };
+
+                        UART0: serial@10000200 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <10000200 8>;
+                                virtual-reg = <a0000200>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                current-speed = <1c200>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <0 4>;
+                        };
+
+                        UART1: serial@10000300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <10000300 8>;
+                                virtual-reg = <a0000300>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+
+
+                        UART2: serial@10000600 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <10000600 8>;
+                                virtual-reg = <a0000600>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <5 4>;
+                        };
+
+                        IIC0: i2c@10000400 {
+                                device_type = "i2c";
+                                compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic";
+                                reg = <10000400 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+
+                        IIC1: i2c@10000500 {
+                                device_type = "i2c";
+                                compatible = "ibm,iic-440spe", "ibm,iic-440gp", "ibm,iic";
+                                reg = <10000500 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <3 4>;
+                        };
+
+                        EMAC0: ethernet@10000800 {
+                                linux,network-index = <0>;
+                                device_type = "network";
+                                compatible = "ibm,emac-440spe", "ibm,emac4";
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <1c 4 1d 4>;
+                                reg = <10000800 70>;
+                                local-mac-address = [000000000000];
+                                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>;
+                                phy-mode = "gmii";
+                                phy-map = <00000000>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                        };
+                };
+
+                PCIX0: pci@c0ec00000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "ibm,plb-pcix-440spe", "ibm,plb-pcix";
+                        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 */
+
+                        /* 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>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+
+                        /* This drives busses 0 to 0xf */
+                        bus-range = <0 f>;
+
+                        /*
+                         * On Katmai, the following PCI-X interrupts signals
+                         * have to be enabled via jumpers (only INTA is
+                         * enabled per default):
+                         *
+                         * INTB: J3: 1-2
+                         * INTC: J2: 1-2
+                         * INTD: J1: 1-2
+                         */
+                        interrupt-map-mask = <f800 0 0 7>;
+                        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
+                        >;
+                };
+
+                PCIE0: pciex@d00000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #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>;
+
+                        /* 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>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+
+                        /* This drives busses 10 to 0x1f */
+                        bus-range = <10 1f>;
+
+                        /* Legacy interrupts (note the weird polarity, the bridge seems
+                         * to invert PCIe legacy interrupts).
+                         * We are de-swizzling here because the numbers are actually for
+                         * port of the root complex virtual P2P bridge. But I want
+                         * to avoid putting a node for it in the tree, so the numbers
+                         * 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 = <
+                                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 */>;
+                };
+
+                PCIE1: pciex@d20000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #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>;
+
+                        /* 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>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+
+                        /* This drives busses 10 to 0x1f */
+                        bus-range = <20 2f>;
+
+                        /* Legacy interrupts (note the weird polarity, the bridge seems
+                         * to invert PCIe legacy interrupts).
+                         * We are de-swizzling here because the numbers are actually for
+                         * port of the root complex virtual P2P bridge. But I want
+                         * to avoid putting a node for it in the tree, so the numbers
+                         * 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 = <
+                                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 */>;
+                };
+
+                PCIE2: pciex@d40000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #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>;
+
+                        /* 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>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+
+                        /* This drives busses 10 to 0x1f */
+                        bus-range = <30 3f>;
+
+                        /* Legacy interrupts (note the weird polarity, the bridge seems
+                         * to invert PCIe legacy interrupts).
+                         * We are de-swizzling here because the numbers are actually for
+                         * port of the root complex virtual P2P bridge. But I want
+                         * to avoid putting a node for it in the tree, so the numbers
+                         * 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 = <
+                                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 */>;
+                };
+        };
+
+        chosen {
+                linux,stdout-path = "/plb/opb/serial@10000200";
+        };
+};
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index c824e8f06454..67c7ea179a07 100644
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -13,14 +13,22 @@
         #size-cells = <1>;
         model = "amcc,kilauea";
         compatible = "amcc,kilauea";
-        dcr-parent = <&/cpus/PowerPC,405EX@0>;
+        dcr-parent = <&/cpus/cpu@0>;
+
+        aliases {
+                ethernet0 = &EMAC0;
+                ethernet1 = &EMAC1;
+                serial0 = &UART0;
+                serial1 = &UART1;
+        };
 
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
-                PowerPC,405EX@0 {
+                cpu@0 {
                         device_type = "cpu";
+                        model = "PowerPC,405EX";
                         reg = <0>;
                         clock-frequency = <0>; /* Filled in by U-Boot */
                         timebase-frequency = <0>; /* Filled in by U-Boot */
@@ -194,6 +202,7 @@
                                 device_type = "rgmii-interface";
                                 compatible = "ibm,rgmii-405ex", "ibm,rgmii";
                                 reg = <ef600b00 104>;
+                                has-mdio;
                         };
 
                         EMAC0: ethernet@ef600900 {
@@ -220,6 +229,8 @@
                                 phy-map = <00000000>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <0>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
                         };
 
                         EMAC1: ethernet@ef600a00 {
@@ -246,7 +257,91 @@
                                 phy-map = <00000000>;
                                 rgmii-device = <&RGMII0>;
                                 rgmii-channel = <1>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
                         };
                 };
+
+                PCIE0: pciex@0a0000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #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>;
+
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed
+                         */
+                        ranges = <02000000 0 80000000 90000000 0 08000000
+                                  01000000 0 00000000 e0000000 0 00010000>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 80000000>;
+
+                        /* This drives busses 0x00 to 0x3f */
+                        bus-range = <00 3f>;
+
+                        /* Legacy interrupts (note the weird polarity, the bridge seems
+                         * to invert PCIe legacy interrupts).
+                         * We are de-swizzling here because the numbers are actually for
+                         * port of the root complex virtual P2P bridge. But I want
+                         * to avoid putting a node for it in the tree, so the numbers
+                         * 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 = <
+                                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 */>;
+                };
+
+                PCIE1: pciex@0c0000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #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>;
+
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed
+                         */
+                        ranges = <02000000 0 80000000 98000000 0 08000000
+                                  01000000 0 00000000 e0010000 0 00010000>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 80000000>;
+
+                        /* This drives busses 0x40 to 0x7f */
+                        bus-range = <40 7f>;
+
+                        /* Legacy interrupts (note the weird polarity, the bridge seems
+                         * to invert PCIe legacy interrupts).
+                         * We are de-swizzling here because the numbers are actually for
+                         * port of the root complex virtual P2P bridge. But I want
+                         * to avoid putting a node for it in the tree, so the numbers
+                         * 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 = <
+                                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 */>;
+                };
         };
 };
diff --git a/arch/powerpc/boot/dts/kuroboxHD.dts b/arch/powerpc/boot/dts/kuroboxHD.dts
index ec71ab819fee..446958854519 100644
--- a/arch/powerpc/boot/dts/kuroboxHD.dts
+++ b/arch/powerpc/boot/dts/kuroboxHD.dts
@@ -23,6 +23,12 @@ XXXX add flash parts, rtc, ??
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -60,7 +66,7 @@ XXXX add flash parts, rtc, ??
                 i2c@80003000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "i2c";
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
                         reg = <80003000 1000>;
                         interrupts = <5 2>;
@@ -73,7 +79,8 @@ XXXX add flash parts, rtc, ??
                         };
                 };
 
-                serial@80004500 {
+                serial0: serial@80004500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <80004500 8>;
@@ -83,7 +90,8 @@ XXXX add flash parts, rtc, ??
                         interrupt-parent = <&mpic>;
                 };
 
-                serial@80004600 {
+                serial1: serial@80004600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <80004600 8>;
@@ -102,7 +110,7 @@ XXXX add flash parts, rtc, ??
                         reg = <80040000 40000>;
                 };
 
-                pci@fec00000 {
+                pci0: pci@fec00000 {
                         #address-cells = <3>;
                         #size-cells = <2>;
                         #interrupt-cells = <1>;
diff --git a/arch/powerpc/boot/dts/kuroboxHG.dts b/arch/powerpc/boot/dts/kuroboxHG.dts
index 32ecd2319928..8443c85b7b30 100644
--- a/arch/powerpc/boot/dts/kuroboxHG.dts
+++ b/arch/powerpc/boot/dts/kuroboxHG.dts
@@ -23,6 +23,12 @@ XXXX add flash parts, rtc, ??
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -60,7 +66,7 @@ XXXX add flash parts, rtc, ??
                 i2c@80003000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "i2c";
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
                         reg = <80003000 1000>;
                         interrupts = <5 2>;
@@ -73,7 +79,8 @@ XXXX add flash parts, rtc, ??
                         };
                 };
 
-                serial@80004500 {
+                serial0: serial@80004500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <80004500 8>;
@@ -83,7 +90,8 @@ XXXX add flash parts, rtc, ??
                         interrupt-parent = <&mpic>;
                 };
 
-                serial@80004600 {
+                serial1: serial@80004600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <80004600 8>;
@@ -102,7 +110,7 @@ XXXX add flash parts, rtc, ??
                         reg = <80040000 40000>;
                 };
 
-                pci@fec00000 {
+                pci0: pci@fec00000 {
                         #address-cells = <3>;
                         #size-cells = <2>;
                         #interrupt-cells = <1>;
diff --git a/arch/powerpc/boot/dts/lite5200.dts b/arch/powerpc/boot/dts/lite5200.dts
index 6731763f0282..0d701c1bf539 100644
--- a/arch/powerpc/boot/dts/lite5200.dts
+++ b/arch/powerpc/boot/dts/lite5200.dts
@@ -10,16 +10,9 @@
  * option) any later version.
  */
 
-/*
- * WARNING: Do not depend on this tree layout remaining static just yet.
- * The MPC5200 device tree conventions are still in flux
- * Keep an eye on the linuxppc-dev mailing list for more details
- */
-
 / {
         model = "fsl,lite5200";
-        // revision = "1.0";
-        compatible = "fsl,lite5200","generic-mpc5200";
+        compatible = "fsl,lite5200";
         #address-cells = <1>;
         #size-cells = <1>;
 
@@ -46,30 +39,29 @@
         };
 
         soc5200@f0000000 {
-                model = "fsl,mpc5200";
-                compatible = "mpc5200";
-                revision = "";                  // from bootloader
-                device_type = "soc";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc5200-immr";
                 ranges = <0 f0000000 0000c000>;
                 reg = <f0000000 00000100>;
                 bus-frequency = <0>;            // from bootloader
                 system-frequency = <0>;         // from bootloader
 
                 cdm@200 {
-                        compatible = "mpc5200-cdm";
+                        compatible = "fsl,mpc5200-cdm";
                         reg = <200 38>;
                 };
 
-                mpc5200_pic: pic@500 {
+                mpc5200_pic: interrupt-controller@500 {
                         // 5200 interrupts are encoded into two levels;
                         interrupt-controller;
                         #interrupt-cells = <3>;
                         device_type = "interrupt-controller";
-                        compatible = "mpc5200-pic";
+                        compatible = "fsl,mpc5200-pic";
                         reg = <500 80>;
                 };
 
-                gpt@600 {       // General Purpose Timer
+                timer@600 {     // General Purpose Timer
                         compatible = "fsl,mpc5200-gpt";
                         cell-index = <0>;
                         reg = <600 10>;
@@ -78,7 +70,7 @@
                         fsl,has-wdt;
                 };
 
-                gpt@610 {       // General Purpose Timer
+                timer@610 {     // General Purpose Timer
                         compatible = "fsl,mpc5200-gpt";
                         cell-index = <1>;
                         reg = <610 10>;
@@ -86,7 +78,7 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpt@620 {       // General Purpose Timer
+                timer@620 {     // General Purpose Timer
                         compatible = "fsl,mpc5200-gpt";
                         cell-index = <2>;
                         reg = <620 10>;
@@ -94,7 +86,7 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpt@630 {       // General Purpose Timer
+                timer@630 {     // General Purpose Timer
                         compatible = "fsl,mpc5200-gpt";
                         cell-index = <3>;
                         reg = <630 10>;
@@ -102,7 +94,7 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpt@640 {       // General Purpose Timer
+                timer@640 {     // General Purpose Timer
                         compatible = "fsl,mpc5200-gpt";
                         cell-index = <4>;
                         reg = <640 10>;
@@ -110,7 +102,7 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpt@650 {       // General Purpose Timer
+                timer@650 {     // General Purpose Timer
                         compatible = "fsl,mpc5200-gpt";
                         cell-index = <5>;
                         reg = <650 10>;
@@ -118,7 +110,7 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpt@660 {       // General Purpose Timer
+                timer@660 {     // General Purpose Timer
                         compatible = "fsl,mpc5200-gpt";
                         cell-index = <6>;
                         reg = <660 10>;
@@ -126,7 +118,7 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpt@670 {       // General Purpose Timer
+                timer@670 {     // General Purpose Timer
                         compatible = "fsl,mpc5200-gpt";
                         cell-index = <7>;
                         reg = <670 10>;
@@ -135,25 +127,23 @@
                 };
 
                 rtc@800 {       // Real time clock
-                        compatible = "mpc5200-rtc";
+                        compatible = "fsl,mpc5200-rtc";
                         device_type = "rtc";
                         reg = <800 100>;
                         interrupts = <1 5 0 1 6 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                mscan@900 {
-                        device_type = "mscan";
-                        compatible = "mpc5200-mscan";
+                can@900 {
+                        compatible = "fsl,mpc5200-mscan";
                         cell-index = <0>;
                         interrupts = <2 11 0>;
                         interrupt-parent = <&mpc5200_pic>;
                         reg = <900 80>;
                 };
 
-                mscan@980 {
-                        device_type = "mscan";
-                        compatible = "mpc5200-mscan";
+                can@980 {
+                        compatible = "fsl,mpc5200-mscan";
                         cell-index = <1>;
                         interrupts = <2 12 0>;
                         interrupt-parent = <&mpc5200_pic>;
@@ -161,38 +151,36 @@
                 };
 
                 gpio@b00 {
-                        compatible = "mpc5200-gpio";
+                        compatible = "fsl,mpc5200-gpio";
                         reg = <b00 40>;
                         interrupts = <1 7 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpio-wkup@c00 {
-                        compatible = "mpc5200-gpio-wkup";
+                gpio@c00 {
+                        compatible = "fsl,mpc5200-gpio-wkup";
                         reg = <c00 40>;
                         interrupts = <1 8 0 0 3 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
                 spi@f00 {
-                        device_type = "spi";
-                        compatible = "mpc5200-spi";
+                        compatible = "fsl,mpc5200-spi";
                         reg = <f00 20>;
                         interrupts = <2 d 0 2 e 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
                 usb@1000 {
-                        device_type = "usb-ohci-be";
-                        compatible = "mpc5200-ohci","ohci-be";
+                        compatible = "fsl,mpc5200-ohci","ohci-be";
                         reg = <1000 ff>;
                         interrupts = <2 6 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                bestcomm@1200 {
+                dma-controller@1200 {
                         device_type = "dma-controller";
-                        compatible = "mpc5200-bestcomm";
+                        compatible = "fsl,mpc5200-bestcomm";
                         reg = <1200 80>;
                         interrupts = <3 0 0  3 1 0  3 2 0  3 3 0
                                       3 4 0  3 5 0  3 6 0  3 7 0
@@ -202,13 +190,13 @@
                 };
 
                 xlb@1f00 {
-                        compatible = "mpc5200-xlb";
+                        compatible = "fsl,mpc5200-xlb";
                         reg = <1f00 100>;
                 };
 
                 serial@2000 {           // PSC1
                         device_type = "serial";
-                        compatible = "mpc5200-psc-uart";
+                        compatible = "fsl,mpc5200-psc-uart";
                         port-number = <0>;  // Logical port assignment
                         cell-index = <0>;
                         reg = <2000 100>;
@@ -218,8 +206,7 @@
 
                 // PSC2 in ac97 mode example
                 //ac97@2200 {           // PSC2
-                //      device_type = "sound";
-                //      compatible = "mpc5200-psc-ac97";
+                //      compatible = "fsl,mpc5200-psc-ac97";
                 //      cell-index = <1>;
                 //      reg = <2200 100>;
                 //      interrupts = <2 2 0>;
@@ -228,8 +215,7 @@
 
                 // PSC3 in CODEC mode example
                 //i2s@2400 {            // PSC3
-                //      device_type = "sound";
-                //      compatible = "mpc5200-psc-i2s";
+                //      compatible = "fsl,mpc5200-psc-i2s";
                 //      cell-index = <2>;
                 //      reg = <2400 100>;
                 //      interrupts = <2 3 0>;
@@ -239,7 +225,7 @@
                 // PSC4 in uart mode example
                 //serial@2600 {         // PSC4
                 //      device_type = "serial";
-                //      compatible = "mpc5200-psc-uart";
+                //      compatible = "fsl,mpc5200-psc-uart";
                 //      cell-index = <3>;
                 //      reg = <2600 100>;
                 //      interrupts = <2 b 0>;
@@ -249,7 +235,7 @@
                 // PSC5 in uart mode example
                 //serial@2800 {         // PSC5
                 //      device_type = "serial";
-                //      compatible = "mpc5200-psc-uart";
+                //      compatible = "fsl,mpc5200-psc-uart";
                 //      cell-index = <4>;
                 //      reg = <2800 100>;
                 //      interrupts = <2 c 0>;
@@ -258,8 +244,7 @@
 
                 // PSC6 in spi mode example
                 //spi@2c00 {            // PSC6
-                //      device_type = "spi";
-                //      compatible = "mpc5200-psc-spi";
+                //      compatible = "fsl,mpc5200-psc-spi";
                 //      cell-index = <5>;
                 //      reg = <2c00 100>;
                 //      interrupts = <2 4 0>;
@@ -268,24 +253,25 @@
 
                 ethernet@3000 {
                         device_type = "network";
-                        compatible = "mpc5200-fec";
+                        compatible = "fsl,mpc5200-fec";
                         reg = <3000 800>;
-                        mac-address = [ 02 03 04 05 06 07 ]; // Bad!
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <2 5 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
                 ata@3a00 {
                         device_type = "ata";
-                        compatible = "mpc5200-ata";
+                        compatible = "fsl,mpc5200-ata";
                         reg = <3a00 100>;
                         interrupts = <2 7 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
                 i2c@3d00 {
-                        device_type = "i2c";
-                        compatible = "mpc5200-i2c","fsl-i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5200-i2c","fsl-i2c";
                         cell-index = <0>;
                         reg = <3d00 40>;
                         interrupts = <2 f 0>;
@@ -294,8 +280,9 @@
                 };
 
                 i2c@3d40 {
-                        device_type = "i2c";
-                        compatible = "mpc5200-i2c","fsl-i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5200-i2c","fsl-i2c";
                         cell-index = <1>;
                         reg = <3d40 40>;
                         interrupts = <2 10 0>;
@@ -303,8 +290,7 @@
                         fsl5200-clocking;
                 };
                 sram@8000 {
-                        device_type = "sram";
-                        compatible = "mpc5200-sram","sram";
+                        compatible = "fsl,mpc5200-sram","sram";
                         reg = <8000 4000>;
                 };
         };
@@ -314,7 +300,7 @@
                 #size-cells = <2>;
                 #address-cells = <3>;
                 device_type = "pci";
-                compatible = "mpc5200-pci";
+                compatible = "fsl,mpc5200-pci";
                 reg = <f0000d00 100>;
                 interrupt-map-mask = <f800 0 0 7>;
                 interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3
diff --git a/arch/powerpc/boot/dts/lite5200b.dts b/arch/powerpc/boot/dts/lite5200b.dts
index b540388c608c..571ba02accac 100644
--- a/arch/powerpc/boot/dts/lite5200b.dts
+++ b/arch/powerpc/boot/dts/lite5200b.dts
@@ -18,8 +18,7 @@
 
 / {
         model = "fsl,lite5200b";
-        // revision = "1.0";
-        compatible = "fsl,lite5200b","generic-mpc5200";
+        compatible = "fsl,lite5200b";
         #address-cells = <1>;
         #size-cells = <1>;
 
@@ -46,30 +45,29 @@
         };
 
         soc5200@f0000000 {
-                model = "fsl,mpc5200b";
-                compatible = "mpc5200";
-                revision = "";                  // from bootloader
-                device_type = "soc";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc5200b-immr";
                 ranges = <0 f0000000 0000c000>;
                 reg = <f0000000 00000100>;
                 bus-frequency = <0>;            // from bootloader
                 system-frequency = <0>;         // from bootloader
 
                 cdm@200 {
-                        compatible = "mpc5200b-cdm","mpc5200-cdm";
+                        compatible = "fsl,mpc5200b-cdm","fsl,mpc5200-cdm";
                         reg = <200 38>;
                 };
 
-                mpc5200_pic: pic@500 {
+                mpc5200_pic: interrupt-controller@500 {
                         // 5200 interrupts are encoded into two levels;
                         interrupt-controller;
                         #interrupt-cells = <3>;
                         device_type = "interrupt-controller";
-                        compatible = "mpc5200b-pic","mpc5200-pic";
+                        compatible = "fsl,mpc5200b-pic","fsl,mpc5200-pic";
                         reg = <500 80>;
                 };
 
-                gpt@600 {       // General Purpose Timer
+                timer@600 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         cell-index = <0>;
                         reg = <600 10>;
@@ -78,7 +76,7 @@
                         fsl,has-wdt;
                 };
 
-                gpt@610 {       // General Purpose Timer
+                timer@610 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         cell-index = <1>;
                         reg = <610 10>;
@@ -86,7 +84,7 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpt@620 {       // General Purpose Timer
+                timer@620 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         cell-index = <2>;
                         reg = <620 10>;
@@ -94,7 +92,7 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpt@630 {       // General Purpose Timer
+                timer@630 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         cell-index = <3>;
                         reg = <630 10>;
@@ -102,7 +100,7 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpt@640 {       // General Purpose Timer
+                timer@640 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         cell-index = <4>;
                         reg = <640 10>;
@@ -110,7 +108,7 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpt@650 {       // General Purpose Timer
+                timer@650 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         cell-index = <5>;
                         reg = <650 10>;
@@ -118,7 +116,7 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpt@660 {       // General Purpose Timer
+                timer@660 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         cell-index = <6>;
                         reg = <660 10>;
@@ -126,7 +124,7 @@
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpt@670 {       // General Purpose Timer
+                timer@670 {     // General Purpose Timer
                         compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
                         cell-index = <7>;
                         reg = <670 10>;
@@ -135,25 +133,23 @@
                 };
 
                 rtc@800 {       // Real time clock
-                        compatible = "mpc5200b-rtc","mpc5200-rtc";
+                        compatible = "fsl,mpc5200b-rtc","fsl,mpc5200-rtc";
                         device_type = "rtc";
                         reg = <800 100>;
                         interrupts = <1 5 0 1 6 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                mscan@900 {
-                        device_type = "mscan";
-                        compatible = "mpc5200b-mscan","mpc5200-mscan";
+                can@900 {
+                        compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan";
                         cell-index = <0>;
                         interrupts = <2 11 0>;
                         interrupt-parent = <&mpc5200_pic>;
                         reg = <900 80>;
                 };
 
-                mscan@980 {
-                        device_type = "mscan";
-                        compatible = "mpc5200b-mscan","mpc5200-mscan";
+                can@980 {
+                        compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan";
                         cell-index = <1>;
                         interrupts = <2 12 0>;
                         interrupt-parent = <&mpc5200_pic>;
@@ -161,38 +157,36 @@
                 };
 
                 gpio@b00 {
-                        compatible = "mpc5200b-gpio","mpc5200-gpio";
+                        compatible = "fsl,mpc5200b-gpio","fsl,mpc5200-gpio";
                         reg = <b00 40>;
                         interrupts = <1 7 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                gpio-wkup@c00 {
-                        compatible = "mpc5200b-gpio-wkup","mpc5200-gpio-wkup";
+                gpio@c00 {
+                        compatible = "fsl,mpc5200b-gpio-wkup","fsl,mpc5200-gpio-wkup";
                         reg = <c00 40>;
                         interrupts = <1 8 0 0 3 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
                 spi@f00 {
-                        device_type = "spi";
-                        compatible = "mpc5200b-spi","mpc5200-spi";
+                        compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi";
                         reg = <f00 20>;
                         interrupts = <2 d 0 2 e 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
                 usb@1000 {
-                        device_type = "usb-ohci-be";
-                        compatible = "mpc5200b-ohci","mpc5200-ohci","ohci-be";
+                        compatible = "fsl,mpc5200b-ohci","fsl,mpc5200-ohci","ohci-be";
                         reg = <1000 ff>;
                         interrupts = <2 6 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
-                bestcomm@1200 {
+                dma-controller@1200 {
                         device_type = "dma-controller";
-                        compatible = "mpc5200b-bestcomm","mpc5200-bestcomm";
+                        compatible = "fsl,mpc5200b-bestcomm","fsl,mpc5200-bestcomm";
                         reg = <1200 80>;
                         interrupts = <3 0 0  3 1 0  3 2 0  3 3 0
                                       3 4 0  3 5 0  3 6 0  3 7 0
@@ -202,13 +196,13 @@
                 };
 
                 xlb@1f00 {
-                        compatible = "mpc5200b-xlb","mpc5200-xlb";
+                        compatible = "fsl,mpc5200b-xlb","fsl,mpc5200-xlb";
                         reg = <1f00 100>;
                 };
 
                 serial@2000 {           // PSC1
                         device_type = "serial";
-                        compatible = "mpc5200b-psc-uart","mpc5200-psc-uart";
+                        compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
                         port-number = <0>;  // Logical port assignment
                         cell-index = <0>;
                         reg = <2000 100>;
@@ -218,8 +212,7 @@
 
                 // PSC2 in ac97 mode example
                 //ac97@2200 {           // PSC2
-                //      device_type = "sound";
-                //      compatible = "mpc5200b-psc-ac97","mpc5200-psc-ac97";
+                //      compatible = "fsl,mpc5200b-psc-ac97","fsl,mpc5200-psc-ac97";
                 //      cell-index = <1>;
                 //      reg = <2200 100>;
                 //      interrupts = <2 2 0>;
@@ -228,8 +221,7 @@
 
                 // PSC3 in CODEC mode example
                 //i2s@2400 {            // PSC3
-                //      device_type = "sound";
-                //      compatible = "mpc5200b-psc-i2s"; //not 5200 compatible
+                //      compatible = "fsl,mpc5200b-psc-i2s"; //not 5200 compatible
                 //      cell-index = <2>;
                 //      reg = <2400 100>;
                 //      interrupts = <2 3 0>;
@@ -239,7 +231,7 @@
                 // PSC4 in uart mode example
                 //serial@2600 {         // PSC4
                 //      device_type = "serial";
-                //      compatible = "mpc5200b-psc-uart","mpc5200-psc-uart";
+                //      compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
                 //      cell-index = <3>;
                 //      reg = <2600 100>;
                 //      interrupts = <2 b 0>;
@@ -249,7 +241,7 @@
                 // PSC5 in uart mode example
                 //serial@2800 {         // PSC5
                 //      device_type = "serial";
-                //      compatible = "mpc5200b-psc-uart","mpc5200-psc-uart";
+                //      compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
                 //      cell-index = <4>;
                 //      reg = <2800 100>;
                 //      interrupts = <2 c 0>;
@@ -258,8 +250,7 @@
 
                 // PSC6 in spi mode example
                 //spi@2c00 {            // PSC6
-                //      device_type = "spi";
-                //      compatible = "mpc5200b-psc-spi","mpc5200-psc-spi";
+                //      compatible = "fsl,mpc5200b-psc-spi","fsl,mpc5200-psc-spi";
                 //      cell-index = <5>;
                 //      reg = <2c00 100>;
                 //      interrupts = <2 4 0>;
@@ -268,9 +259,9 @@
 
                 ethernet@3000 {
                         device_type = "network";
-                        compatible = "mpc5200b-fec","mpc5200-fec";
+                        compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";
                         reg = <3000 400>;
-                        mac-address = [ 02 03 04 05 06 07 ]; // Bad!
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <2 5 0>;
                         interrupt-parent = <&mpc5200_pic>;
                         phy-handle = <&phy0>;
@@ -279,8 +270,7 @@
                 mdio@3000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "mdio";
-                        compatible = "mpc5200b-fec-phy";
+                        compatible = "fsl,mpc5200b-mdio";
                         reg = <3000 400>;       // fec range, since we need to setup fec interrupts
                         interrupts = <2 5 0>;   // these are for "mii command finished", not link changes & co.
                         interrupt-parent = <&mpc5200_pic>;
@@ -293,15 +283,16 @@
 
                 ata@3a00 {
                         device_type = "ata";
-                        compatible = "mpc5200b-ata","mpc5200-ata";
+                        compatible = "fsl,mpc5200b-ata","fsl,mpc5200-ata";
                         reg = <3a00 100>;
                         interrupts = <2 7 0>;
                         interrupt-parent = <&mpc5200_pic>;
                 };
 
                 i2c@3d00 {
-                        device_type = "i2c";
-                        compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
                         cell-index = <0>;
                         reg = <3d00 40>;
                         interrupts = <2 f 0>;
@@ -310,8 +301,9 @@
                 };
 
                 i2c@3d40 {
-                        device_type = "i2c";
-                        compatible = "mpc5200b-i2c","mpc5200-i2c","fsl-i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
                         cell-index = <1>;
                         reg = <3d40 40>;
                         interrupts = <2 10 0>;
@@ -319,8 +311,7 @@
                         fsl5200-clocking;
                 };
                 sram@8000 {
-                        device_type = "sram";
-                        compatible = "mpc5200b-sram","mpc5200-sram","sram";
+                        compatible = "fsl,mpc5200b-sram","fsl,mpc5200-sram","sram";
                         reg = <8000 4000>;
                 };
         };
@@ -330,7 +321,7 @@
                 #size-cells = <2>;
                 #address-cells = <3>;
                 device_type = "pci";
-                compatible = "mpc5200b-pci","mpc5200-pci";
+                compatible = "fsl,mpc5200b-pci","fsl,mpc5200-pci";
                 reg = <f0000d00 100>;
                 interrupt-map-mask = <f800 0 0 7>;
                 interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts
new file mode 100644
index 000000000000..bdd70e4596ae
--- /dev/null
+++ b/arch/powerpc/boot/dts/makalu.dts
@@ -0,0 +1,347 @@
+/*
+ * Device Tree Source for AMCC Makalu (405EX)
+ *
+ * Copyright 2007 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ *
+ * 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.
+ */
+
+/ {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        model = "amcc,makalu";
+        compatible = "amcc,makalu";
+        dcr-parent = <&/cpus/cpu@0>;
+
+        aliases {
+                ethernet0 = &EMAC0;
+                ethernet1 = &EMAC1;
+                serial0 = &UART0;
+                serial1 = &UART1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        model = "PowerPC,405EX";
+                        reg = <0>;
+                        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 */
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0>; /* Filled in by U-Boot */
+        };
+
+        UIC0: interrupt-controller {
+                compatible = "ibm,uic-405ex", "ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0c0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+
+        UIC1: interrupt-controller1 {
+                compatible = "ibm,uic-405ex","ibm,uic";
+                interrupt-controller;
+                cell-index = <1>;
+                dcr-reg = <0d0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        UIC2: interrupt-controller2 {
+                compatible = "ibm,uic-405ex","ibm,uic";
+                interrupt-controller;
+                cell-index = <2>;
+                dcr-reg = <0e0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1c 4 1d 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        plb {
+                compatible = "ibm,plb-405ex", "ibm,plb4";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by U-Boot */
+
+                SDRAM0: memory-controller {
+                        compatible = "ibm,sdram-405ex";
+                        dcr-reg = <010 2>;
+                };
+
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-405ex", "ibm,mcmal2";
+                        dcr-reg = <180 62>;
+                        num-tx-chans = <2>;
+                        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 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>;
+                };
+
+                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>;
+                        clock-frequency = <0>; /* Filled in by U-Boot */
+
+                        EBC0: ebc {
+                                compatible = "ibm,ebc-405ex", "ibm,ebc";
+                                dcr-reg = <012 2>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                /* ranges property is supplied by U-Boot */
+                                interrupts = <5 1>;
+                                interrupt-parent = <&UIC1>;
+
+                                nor_flash@0,0 {
+                                        compatible = "amd,s29gl512n", "cfi-flash";
+                                        bank-width = <2>;
+                                        reg = <0 000000 4000000>;
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+                                        partition@0 {
+                                                label = "kernel";
+                                                reg = <0 200000>;
+                                        };
+                                        partition@200000 {
+                                                label = "root";
+                                                reg = <200000 200000>;
+                                        };
+                                        partition@400000 {
+                                                label = "user";
+                                                reg = <400000 3b60000>;
+                                        };
+                                        partition@3f60000 {
+                                                label = "env";
+                                                reg = <3f60000 40000>;
+                                        };
+                                        partition@3fa0000 {
+                                                label = "u-boot";
+                                                reg = <3fa0000 60000>;
+                                        };
+                                };
+                        };
+
+                        UART0: serial@ef600200 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600200 8>;
+                                virtual-reg = <ef600200>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1a 4>;
+                        };
+
+                        UART1: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600300 8>;
+                                virtual-reg = <ef600300>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+
+                        IIC0: i2c@ef600400 {
+                                device_type = "i2c";
+                                compatible = "ibm,iic-405ex", "ibm,iic";
+                                reg = <ef600400 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+
+                        IIC1: i2c@ef600500 {
+                                device_type = "i2c";
+                                compatible = "ibm,iic-405ex", "ibm,iic";
+                                reg = <ef600500 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <7 4>;
+                        };
+
+
+                        RGMII0: emac-rgmii@ef600b00 {
+                                device_type = "rgmii-interface";
+                                compatible = "ibm,rgmii-405ex", "ibm,rgmii";
+                                reg = <ef600b00 104>;
+                                has-mdio;
+                        };
+
+                        EMAC0: ethernet@ef600900 {
+                                linux,network-index = <0>;
+                                device_type = "network";
+                                compatible = "ibm,emac-405ex", "ibm,emac4";
+                                interrupt-parent = <&EMAC0>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC0 18 4
+                                                /*Wake*/  1 &UIC1 1d 4>;
+                                reg = <ef600900 70>;
+                                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 = <5dc>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <0000003f>;   /* Start at 6 */
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <0>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                        };
+
+                        EMAC1: ethernet@ef600a00 {
+                                linux,network-index = <1>;
+                                device_type = "network";
+                                compatible = "ibm,emac-405ex", "ibm,emac4";
+                                interrupt-parent = <&EMAC1>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC0 19 4
+                                                /*Wake*/  1 &UIC1 1f 4>;
+                                reg = <ef600a00 70>;
+                                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 = <5dc>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000000>;
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <1>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                        };
+                };
+
+                PCIE0: pciex@0a0000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #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>;
+
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed
+                         */
+                        ranges = <02000000 0 80000000 90000000 0 08000000
+                                  01000000 0 00000000 e0000000 0 00010000>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 80000000>;
+
+                        /* This drives busses 0x00 to 0x3f */
+                        bus-range = <00 3f>;
+
+                        /* Legacy interrupts (note the weird polarity, the bridge seems
+                         * to invert PCIe legacy interrupts).
+                         * We are de-swizzling here because the numbers are actually for
+                         * port of the root complex virtual P2P bridge. But I want
+                         * to avoid putting a node for it in the tree, so the numbers
+                         * 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 = <
+                                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 */>;
+                };
+
+                PCIE1: pciex@0c0000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #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>;
+
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed
+                         */
+                        ranges = <02000000 0 80000000 98000000 0 08000000
+                                  01000000 0 00000000 e0010000 0 00010000>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 80000000>;
+
+                        /* This drives busses 0x40 to 0x7f */
+                        bus-range = <40 7f>;
+
+                        /* Legacy interrupts (note the weird polarity, the bridge seems
+                         * to invert PCIe legacy interrupts).
+                         * We are de-swizzling here because the numbers are actually for
+                         * port of the root complex virtual P2P bridge. But I want
+                         * to avoid putting a node for it in the tree, so the numbers
+                         * 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 = <
+                                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 */>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/motionpro.dts b/arch/powerpc/boot/dts/motionpro.dts
new file mode 100644
index 000000000000..76951ab038ee
--- /dev/null
+++ b/arch/powerpc/boot/dts/motionpro.dts
@@ -0,0 +1,301 @@
+/*
+ * Motion-PRO board Device Tree Source
+ *
+ * Copyright (C) 2007 Semihalf
+ * Marian Balakowicz <m8@semihalf.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.
+ */
+
+/ {
+        model = "promess,motionpro";
+        compatible = "promess,motionpro";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,5200@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <20>;
+                        i-cache-line-size = <20>;
+                        d-cache-size = <4000>;          // L1, 16K
+                        i-cache-size = <4000>;          // L1, 16K
+                        timebase-frequency = <0>;       // from bootloader
+                        bus-frequency = <0>;            // from bootloader
+                        clock-frequency = <0>;          // from bootloader
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <00000000 04000000>;      // 64MB
+        };
+
+        soc5200@f0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc5200b-immr";
+                ranges = <0 f0000000 0000c000>;
+                reg = <f0000000 00000100>;
+                bus-frequency = <0>;            // from bootloader
+                system-frequency = <0>;         // from bootloader
+
+                cdm@200 {
+                        compatible = "fsl,mpc5200b-cdm","fsl,mpc5200-cdm";
+                        reg = <200 38>;
+                };
+
+                mpc5200_pic: interrupt-controller@500 {
+                        // 5200 interrupts are encoded into two levels;
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        compatible = "fsl,mpc5200b-pic","fsl,mpc5200-pic";
+                        reg = <500 80>;
+                };
+
+                timer@600 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <600 10>;
+                        interrupts = <1 9 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                        fsl,has-wdt;
+                };
+
+                timer@610 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <610 10>;
+                        interrupts = <1 a 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                timer@620 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <620 10>;
+                        interrupts = <1 b 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                timer@630 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <630 10>;
+                        interrupts = <1 c 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                timer@640 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <640 10>;
+                        interrupts = <1 d 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                timer@650 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200b-gpt","fsl,mpc5200-gpt";
+                        reg = <650 10>;
+                        interrupts = <1 e 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                motionpro-led@660 {     // Motion-PRO status LED
+                        compatible = "promess,motionpro-led";
+                        label = "motionpro-statusled";
+                        reg = <660 10>;
+                        interrupts = <1 f 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                        blink-delay = <64>; // 100 msec
+                };
+
+                motionpro-led@670 {     // Motion-PRO ready LED
+                        compatible = "promess,motionpro-led";
+                        label = "motionpro-readyled";
+                        reg = <670 10>;
+                        interrupts = <1 10 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                rtc@800 {       // Real time clock
+                        compatible = "fsl,mpc5200b-rtc","fsl,mpc5200-rtc";
+                        reg = <800 100>;
+                        interrupts = <1 5 0 1 6 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                mscan@980 {
+                        compatible = "fsl,mpc5200b-mscan","fsl,mpc5200-mscan";
+                        interrupts = <2 12 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                        reg = <980 80>;
+                };
+
+                gpio@b00 {
+                        compatible = "fsl,mpc5200b-gpio","fsl,mpc5200-gpio";
+                        reg = <b00 40>;
+                        interrupts = <1 7 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                gpio@c00 {
+                        compatible = "fsl,mpc5200b-gpio-wkup","fsl,mpc5200-gpio-wkup";
+                        reg = <c00 40>;
+                        interrupts = <1 8 0 0 3 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+
+                spi@f00 {
+                        compatible = "fsl,mpc5200b-spi","fsl,mpc5200-spi";
+                        reg = <f00 20>;
+                        interrupts = <2 d 0 2 e 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                usb@1000 {
+                        compatible = "fsl,mpc5200b-ohci","fsl,mpc5200-ohci","ohci-be";
+                        reg = <1000 ff>;
+                        interrupts = <2 6 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                dma-controller@1200 {
+                        compatible = "fsl,mpc5200b-bestcomm","fsl,mpc5200-bestcomm";
+                        reg = <1200 80>;
+                        interrupts = <3 0 0  3 1 0  3 2 0  3 3 0
+                                      3 4 0  3 5 0  3 6 0  3 7 0
+                                      3 8 0  3 9 0  3 a 0  3 b 0
+                                      3 c 0  3 d 0  3 e 0  3 f 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                xlb@1f00 {
+                        compatible = "fsl,mpc5200b-xlb","fsl,mpc5200-xlb";
+                        reg = <1f00 100>;
+                };
+
+                serial@2000 {           // PSC1
+                        device_type = "serial";
+                        compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
+                        port-number = <0>;  // Logical port assignment
+                        reg = <2000 100>;
+                        interrupts = <2 1 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                // PSC2 in spi master mode 
+                spi@2200 {              // PSC2
+                        compatible = "fsl,mpc5200b-psc-spi","fsl,mpc5200-psc-spi";
+                        cell-index = <1>;
+                        reg = <2200 100>;
+                        interrupts = <2 2 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                // PSC5 in uart mode
+                serial@2800 {           // PSC5
+                        device_type = "serial";
+                        compatible = "fsl,mpc5200b-psc-uart","fsl,mpc5200-psc-uart";
+                        port-number = <4>;  // Logical port assignment
+                        reg = <2800 100>;
+                        interrupts = <2 c 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                ethernet@3000 {
+                        device_type = "network";
+                        compatible = "fsl,mpc5200b-fec","fsl,mpc5200-fec";
+                        reg = <3000 800>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <2 5 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                ata@3a00 {
+                        compatible = "fsl,mpc5200b-ata","fsl,mpc5200-ata";
+                        reg = <3a00 100>;
+                        interrupts = <2 7 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                i2c@3d40 {
+                        compatible = "fsl,mpc5200b-i2c","fsl,mpc5200-i2c","fsl-i2c";
+                        reg = <3d40 40>;
+                        interrupts = <2 10 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                        fsl5200-clocking;
+                };
+
+                sram@8000 {
+                        compatible = "fsl,mpc5200b-sram","fsl,mpc5200-sram";
+                        reg = <8000 4000>;
+                };
+        };
+
+        lpb {
+                compatible = "fsl,lpb";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                ranges = <1 0 50000000 00010000
+                          2 0 50010000 00010000
+                          3 0 50020000 00010000>;
+
+                // 8-bit DualPort SRAM on LocalPlus Bus CS1
+                kollmorgen@1,0 {
+                        compatible = "promess,motionpro-kollmorgen";
+                        reg = <1 0 10000>;
+                        interrupts = <1 1 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                // 8-bit board CPLD on LocalPlus Bus CS2
+                cpld@2,0 {
+                        compatible = "promess,motionpro-cpld";
+                        reg = <2 0 10000>;
+                };
+
+                // 8-bit custom Anybus Module on LocalPlus Bus CS3
+                anybus@3,0 {
+                        compatible = "promess,motionpro-anybus";
+                        reg = <3 0 10000>;
+                };
+                pro_module_general@3,0 {
+                        compatible = "promess,pro_module_general";
+                        reg = <3 0 3>;
+                };
+                pro_module_dio@3,800 {
+                        compatible = "promess,pro_module_dio";
+                        reg = <3 800 2>;
+                };
+        };
+
+        pci@f0000d00 {
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                device_type = "pci";
+                compatible = "fsl,mpc5200b-pci","fsl,mpc5200-pci";
+                reg = <f0000d00 100>;
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3 // 1st slot
+                                 c000 0 0 2 &mpc5200_pic 1 1 3
+                                 c000 0 0 3 &mpc5200_pic 1 2 3
+                                 c000 0 0 4 &mpc5200_pic 1 3 3
+
+                                 c800 0 0 1 &mpc5200_pic 1 1 3 // 2nd slot
+                                 c800 0 0 2 &mpc5200_pic 1 2 3
+                                 c800 0 0 3 &mpc5200_pic 1 3 3
+                                 c800 0 0 4 &mpc5200_pic 0 0 3>;
+                clock-frequency = <0>; // From boot loader
+                interrupts = <2 8 0 2 9 0 2 a 0>;
+                interrupt-parent = <&mpc5200_pic>;
+                bus-range = <0 0>;
+                ranges = <42000000 0 80000000 80000000 0 20000000
+                          02000000 0 a0000000 a0000000 0 10000000
+                          01000000 0 00000000 b0000000 0 01000000>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index 9e7eba973262..2d6653fe72ff 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -9,23 +9,33 @@
  * option) any later version.
  */
 
+/dts-v1/;
+
 / {
         model = "MPC8313ERDB";
         compatible = "MPC8313ERDB", "MPC831xRDB", "MPC83xxRDB";
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
                 PowerPC,8313@0 {
                         device_type = "cpu";
-                        reg = <0>;
-                        d-cache-line-size = <20>;       // 32 bytes
-                        i-cache-line-size = <20>;       // 32 bytes
-                        d-cache-size = <4000>;          // L1, 16K
-                        i-cache-size = <4000>;          // L1, 16K
+                        reg = <0x0>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <16384>;
+                        i-cache-size = <16384>;
                         timebase-frequency = <0>;       // from bootloader
                         bus-frequency = <0>;            // from bootloader
                         clock-frequency = <0>;          // from bootloader
@@ -34,134 +44,188 @@
 
         memory {
                 device_type = "memory";
-                reg = <00000000 08000000>;      // 128MB at 0
+                reg = <0x00000000 0x08000000>;  // 128MB at 0
+        };
+
+        localbus@e0005000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8313-elbc", "fsl,elbc", "simple-bus";
+                reg = <0xe0005000 0x1000>;
+                interrupts = <77 0x8>;
+                interrupt-parent = <&ipic>;
+
+                // CS0 and CS1 are swapped when
+                // booting from nand, but the
+                // addresses are the same.
+                ranges = <0x0 0x0 0xfe000000 0x00800000
+                          0x1 0x0 0xe2800000 0x00008000
+                          0x2 0x0 0xf0000000 0x00020000
+                          0x3 0x0 0xfa000000 0x00008000>;
+
+                flash@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x800000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+
+                nand@1,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8313-fcm-nand",
+                                     "fsl,elbc-fcm-nand";
+                        reg = <0x1 0x0 0x2000>;
+
+                        u-boot@0 {
+                                reg = <0x0 0x100000>;
+                                read-only;
+                        };
+
+                        kernel@100000 {
+                                reg = <0x100000 0x300000>;
+                        };
+
+                        fs@400000 {
+                                reg = <0x400000 0x1c00000>;
+                        };
+                };
         };
 
         soc8313@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "soc";
-                ranges = <0 e0000000 00100000>;
-                reg = <e0000000 00000200>;
+                compatible = "simple-bus";
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x00000200>;
                 bus-frequency = <0>;
 
                 wdt@200 {
                         device_type = "watchdog";
                         compatible = "mpc83xx_wdt";
-                        reg = <200 100>;
+                        reg = <0x200 0x100>;
                 };
 
                 i2c@3000 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
-                        reg = <3000 100>;
-                        interrupts = <e 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x3000 0x100>;
+                        interrupts = <14 0x8>;
+                        interrupt-parent = <&ipic>;
                         dfsrr;
                 };
 
                 i2c@3100 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
                         compatible = "fsl-i2c";
-                        reg = <3100 100>;
-                        interrupts = <f 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x3100 0x100>;
+                        interrupts = <15 0x8>;
+                        interrupt-parent = <&ipic>;
                         dfsrr;
                 };
 
                 spi@7000 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
-                        reg = <7000 1000>;
-                        interrupts = <10 8>;
-                        interrupt-parent = < &ipic >;
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
+                        reg = <0x7000 0x1000>;
+                        interrupts = <16 0x8>;
+                        interrupt-parent = <&ipic>;
                         mode = "cpu";
                 };
 
                 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
                 usb@23000 {
-                        device_type = "usb";
                         compatible = "fsl-usb2-dr";
-                        reg = <23000 1000>;
+                        reg = <0x23000 0x1000>;
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <26 8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <38 0x8>;
                         phy_type = "utmi_wide";
                 };
 
                 mdio@24520 {
-                        device_type = "mdio";
-                        compatible = "gianfar";
-                        reg = <24520 20>;
                         #address-cells = <1>;
                         #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
                         phy1: ethernet-phy@1 {
-                                interrupt-parent = < &ipic >;
-                                interrupts = <13 8>;
-                                reg = <1>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <19 0x8>;
+                                reg = <0x1>;
                                 device_type = "ethernet-phy";
                         };
                         phy4: ethernet-phy@4 {
-                                interrupt-parent = < &ipic >;
-                                interrupts = <14 8>;
-                                reg = <4>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <20 0x8>;
+                                reg = <0x4>;
                                 device_type = "ethernet-phy";
                         };
                 };
 
-                ethernet@24000 {
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
-                        reg = <24000 1000>;
+                        reg = <0x24000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <25 8 24 8 23 8>;
-                        interrupt-parent = < &ipic >;
+                        interrupts = <37 0x8 36 0x8 35 0x8>;
+                        interrupt-parent = <&ipic>;
                         phy-handle = < &phy1 >;
                 };
 
-                ethernet@25000 {
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
-                        reg = <25000 1000>;
+                        reg = <0x25000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <22 8 21 8 20 8>;
-                        interrupt-parent = < &ipic >;
+                        interrupts = <34 0x8 33 0x8 32 0x8>;
+                        interrupt-parent = <&ipic>;
                         phy-handle = < &phy4 >;
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4500 100>;
+                        reg = <0x4500 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <9 8>;
-                        interrupt-parent = < &ipic >;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4600 100>;
+                        reg = <0x4600 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <a 8>;
-                        interrupt-parent = < &ipic >;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = <&ipic>;
                 };
 
                 crypto@30000 {
                         device_type = "crypto";
                         model = "SEC2";
                         compatible = "talitos";
-                        reg = <30000 7000>;
-                        interrupts = <b 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x30000 0x7000>;
+                        interrupts = <11 0x8>;
+                        interrupt-parent = <&ipic>;
                         /* Rev. 2.2 */
                         num-channels = <1>;
-                        channel-fifo-len = <18>;
-                        exec-units-mask = <0000004c>;
-                        descriptor-types-mask = <0122003f>;
+                        channel-fifo-len = <24>;
+                        exec-units-mask = <0x0000004c>;
+                        descriptor-types-mask = <0x0122003f>;
                 };
 
                 /* IPIC
@@ -174,37 +238,38 @@
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
-                        reg = <700 100>;
+                        reg = <0x700 0x100>;
                         device_type = "ipic";
                 };
         };
 
-        pci@e0008500 {
-                interrupt-map-mask = <f800 0 0 7>;
+        pci0: pci@e0008500 {
+                cell-index = <1>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
                                 /* IDSEL 0x0E -mini PCI */
-                                 7000 0 0 1 &ipic 12 8
-                                 7000 0 0 2 &ipic 12 8
-                                 7000 0 0 3 &ipic 12 8
-                                 7000 0 0 4 &ipic 12 8
+                                 0x7000 0x0 0x0 0x1 &ipic 18 0x8
+                                 0x7000 0x0 0x0 0x2 &ipic 18 0x8
+                                 0x7000 0x0 0x0 0x3 &ipic 18 0x8
+                                 0x7000 0x0 0x0 0x4 &ipic 18 0x8
 
                                 /* IDSEL 0x0F - PCI slot */
-                                 7800 0 0 1 &ipic 11 8
-                                 7800 0 0 2 &ipic 12 8
-                                 7800 0 0 3 &ipic 11 8
-                                 7800 0 0 4 &ipic 12 8>;
-                interrupt-parent = < &ipic >;
-                interrupts = <42 8>;
-                bus-range = <0 0>;
-                ranges = <02000000 0 90000000 90000000 0 10000000
-                          42000000 0 80000000 80000000 0 10000000
-                          01000000 0 00000000 e2000000 0 00100000>;
-                clock-frequency = <3f940aa>;
+                                 0x7800 0x0 0x0 0x1 &ipic 17 0x8
+                                 0x7800 0x0 0x0 0x2 &ipic 18 0x8
+                                 0x7800 0x0 0x0 0x3 &ipic 17 0x8
+                                 0x7800 0x0 0x0 0x4 &ipic 18 0x8>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
+                bus-range = <0x0 0x0>;
+                ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
+                clock-frequency = <66666666>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <e0008500 100>;
+                reg = <0xe0008500 0x100>;
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
new file mode 100644
index 000000000000..b582032ba3d6
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8315erdb.dts
@@ -0,0 +1,287 @@
+/*
+ * MPC8315E RDB Device Tree Source
+ *
+ * Copyright 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 as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        compatible = "fsl,mpc8315erdb";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8315@0 {
+                        device_type = "cpu";
+                        reg = <0x0>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <16384>;
+                        i-cache-size = <16384>;
+                        timebase-frequency = <0>;       // from bootloader
+                        bus-frequency = <0>;            // from bootloader
+                        clock-frequency = <0>;          // from bootloader
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x08000000>;  // 128MB at 0
+        };
+
+        localbus@e0005000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8315-elbc", "fsl,elbc", "simple-bus";
+                reg = <0xe0005000 0x1000>;
+                interrupts = <77 0x8>;
+                interrupt-parent = <&ipic>;
+
+                // CS0 and CS1 are swapped when
+                // booting from nand, but the
+                // addresses are the same.
+                ranges = <0x0 0x0 0xfe000000 0x00800000
+                          0x1 0x0 0xe0600000 0x00002000
+                          0x2 0x0 0xf0000000 0x00020000
+                          0x3 0x0 0xfa000000 0x00008000>;
+
+                flash@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x800000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+
+                nand@1,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8315-fcm-nand",
+                                     "fsl,elbc-fcm-nand";
+                        reg = <0x1 0x0 0x2000>;
+
+                        u-boot@0 {
+                                reg = <0x0 0x100000>;
+                                read-only;
+                        };
+
+                        kernel@100000 {
+                                reg = <0x100000 0x300000>;
+                        };
+                        fs@400000 {
+                                reg = <0x400000 0x1c00000>;
+                        };
+                };
+        };
+
+        immr@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "simple-bus";
+                ranges = <0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 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 {
+                                device_type = "rtc";
+                                compatible = "dallas,ds1339";
+                                reg = <0x68>;
+                        };
+                };
+
+                spi@7000 {
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
+                        reg = <0x7000 0x1000>;
+                        interrupts = <16 0x8>;
+                        interrupt-parent = <&ipic>;
+                        mode = "cpu";
+                };
+
+                usb@23000 {
+                        compatible = "fsl-usb2-dr";
+                        reg = <0x23000 0x1000>;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <38 0x8>;
+                        phy_type = "utmi";
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+                        phy0: ethernet-phy@0 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <20 0x8>;
+                                reg = <0x0>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy1: ethernet-phy@1 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <19 0x8>;
+                                reg = <0x1>;
+                                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 = <32 0x8 33 0x8 34 0x8>;
+                        interrupt-parent = <&ipic>;
+                        phy-handle = < &phy0 >;
+                };
+
+                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 0x8 36 0x8 37 0x8>;
+                        interrupt-parent = <&ipic>;
+                        phy-handle = < &phy1 >;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                crypto@30000 {
+                        model = "SEC3";
+                        device_type = "crypto";
+                        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>;
+                };
+
+                sata@18000 {
+                        compatible = "fsl,mpc8315-sata", "fsl,pq-sata";
+                        reg = <0x18000 0x1000>;
+                        cell-index = <1>;
+                        interrupts = <44 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                sata@19000 {
+                        compatible = "fsl,mpc8315-sata", "fsl,pq-sata";
+                        reg = <0x19000 0x1000>;
+                        cell-index = <2>;
+                        interrupts = <45 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                /* 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: interrupt-controller@700 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x700 0x100>;
+                        device_type = "ipic";
+                };
+        };
+
+        pci0: pci@e0008500 {
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                                /* IDSEL 0x0E -mini PCI */
+                                 0x7000 0x0 0x0 0x1 &ipic 18 0x8
+                                 0x7000 0x0 0x0 0x2 &ipic 18 0x8
+                                 0x7000 0x0 0x0 0x3 &ipic 18 0x8
+                                 0x7000 0x0 0x0 0x4 &ipic 18 0x8
+
+                                /* IDSEL 0x0F -mini PCI */
+                                 0x7800 0x0 0x0 0x1 &ipic 17 0x8
+                                 0x7800 0x0 0x0 0x2 &ipic 17 0x8
+                                 0x7800 0x0 0x0 0x3 &ipic 17 0x8
+                                 0x7800 0x0 0x0 0x4 &ipic 17 0x8
+
+                                /* IDSEL 0x10 - PCI slot */
+                                 0x8000 0x0 0x0 0x1 &ipic 48 0x8
+                                 0x8000 0x0 0x0 0x2 &ipic 17 0x8
+                                 0x8000 0x0 0x0 0x3 &ipic 48 0x8
+                                 0x8000 0x0 0x0 0x4 &ipic 17 0x8>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
+                bus-range = <0x0 0x0>;
+                ranges = <0x02000000 0 0x90000000 0x90000000 0 0x10000000
+                          0x42000000 0 0x80000000 0x80000000 0 0x10000000
+                          0x01000000 0 0x00000000 0xe0300000 0 0x00100000>;
+                clock-frequency = <66666666>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe0008500 0x100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc832x_mds.dts b/arch/powerpc/boot/dts/mpc832x_mds.dts
index c64f3037a13b..9bb408371bcd 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -7,25 +7,47 @@
  * 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.
+
+ * To enable external serial I/O on a Freescale MPC 8323 SYS/MDS board, do
+ * this:
+ *
+ * 1) On chip U61, lift (disconnect) pins 21 (TXD) and 22 (RXD) from the board.
+ * 2) Solder a wire from U61-21 to P19A-23.  P19 is a grid of pins on the board
+ *    next to the serial ports.
+ * 3) Solder a wire from U61-22 to P19K-22.
+ *
+ * Note that there's a typo in the schematic.  The board labels the last column
+ * of pins "P19K", but in the schematic, that column is called "P19J".  So if
+ * you're going by the schematic, the pin is called "P19J-K22".
  */
 
+/dts-v1/;
+
 / {
         model = "MPC8323EMDS";
         compatible = "MPC8323EMDS", "MPC832xMDS", "MPC83xxMDS";
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
                 PowerPC,8323@0 {
                         device_type = "cpu";
-                        reg = <0>;
-                        d-cache-line-size = <20>;       // 32 bytes
-                        i-cache-line-size = <20>;       // 32 bytes
-                        d-cache-size = <4000>;          // L1, 16K
-                        i-cache-size = <4000>;          // L1, 16K
+                        reg = <0x0>;
+                        d-cache-line-size = <32>;       // 32 bytes
+                        i-cache-line-size = <32>;       // 32 bytes
+                        d-cache-size = <16384>;         // L1, 16K
+                        i-cache-size = <16384>;         // L1, 16K
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
@@ -34,86 +56,88 @@
 
         memory {
                 device_type = "memory";
-                reg = <00000000 08000000>;
+                reg = <0x00000000 0x08000000>;
         };
 
         bcsr@f8000000 {
                 device_type = "board-control";
-                reg = <f8000000 8000>;
+                reg = <0xf8000000 0x8000>;
         };
 
         soc8323@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "soc";
-                ranges = <0 e0000000 00100000>;
-                reg = <e0000000 00000200>;
-                bus-frequency = <7DE2900>;
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x00000200>;
+                bus-frequency = <132000000>;
 
                 wdt@200 {
                         device_type = "watchdog";
                         compatible = "mpc83xx_wdt";
-                        reg = <200 100>;
+                        reg = <0x200 0x100>;
                 };
 
                 i2c@3000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "i2c";
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
-                        reg = <3000 100>;
-                        interrupts = <e 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x3000 0x100>;
+                        interrupts = <14 0x8>;
+                        interrupt-parent = <&ipic>;
                         dfsrr;
 
                         rtc@68 {
                                 compatible = "dallas,ds1374";
-                                reg = <68>;
+                                reg = <0x68>;
                         };
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4500 100>;
+                        reg = <0x4500 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <9 8>;
-                        interrupt-parent = < &ipic >;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4600 100>;
+                        reg = <0x4600 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <a 8>;
-                        interrupt-parent = < &ipic >;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = <&ipic>;
                 };
 
                 crypto@30000 {
                         device_type = "crypto";
                         model = "SEC2";
                         compatible = "talitos";
-                        reg = <30000 7000>;
-                        interrupts = <b 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x30000 0x7000>;
+                        interrupts = <11 0x8>;
+                        interrupt-parent = <&ipic>;
                         /* Rev. 2.2 */
                         num-channels = <1>;
-                        channel-fifo-len = <18>;
-                        exec-units-mask = <0000004c>;
-                        descriptor-types-mask = <0122003f>;
+                        channel-fifo-len = <24>;
+                        exec-units-mask = <0x0000004c>;
+                        descriptor-types-mask = <0x0122003f>;
                 };
 
                 ipic: pic@700 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
-                        reg = <700 100>;
+                        reg = <0x700 0x100>;
                         device_type = "ipic";
                 };
 
                 par_io@1400 {
-                        reg = <1400 100>;
+                        reg = <0x1400 0x100>;
                         device_type = "par_io";
                         num-ports = <7>;
 
@@ -122,8 +146,8 @@
                         /* port  pin  dir  open_drain  assignment  has_irq */
                                         3  4  3  0  2  0  /* MDIO */
                                         3  5  1  0  2  0  /* MDC */
-                                        0  d  2  0  1  0        /* RX_CLK (CLK9) */
-                                        3 18  2  0  1  0        /* TX_CLK (CLK10) */
+                                        0 13  2  0  1  0        /* RX_CLK (CLK9) */
+                                        3 24  2  0  1  0        /* TX_CLK (CLK10) */
                                         1  0  1  0  1  0        /* TxD0 */
                                         1  1  1  0  1  0        /* TxD1 */
                                         1  2  1  0  1  0        /* TxD2 */
@@ -134,31 +158,48 @@
                                         1  7  2  0  1  0        /* RxD3 */
                                         1  8  2  0  1  0        /* RX_ER */
                                         1  9  1  0  1  0        /* TX_ER */
-                                        1  a  2  0  1  0        /* RX_DV */
-                                        1  b  2  0  1  0        /* COL */
-                                        1  c  1  0  1  0        /* TX_EN */
-                                        1  d  2  0  1  0>;/* CRS */
+                                        1 10  2  0  1  0        /* RX_DV */
+                                        1 11  2  0  1  0        /* COL */
+                                        1 12  1  0  1  0        /* TX_EN */
+                                        1 13  2  0  1  0>;      /* CRS */
                         };
                         pio4: ucc_pin@04 {
                                 pio-map = <
                         /* port  pin  dir  open_drain  assignment  has_irq */
-                                        3 1f  2  0  1  0        /* RX_CLK (CLK7) */
+                                        3 31  2  0  1  0        /* RX_CLK (CLK7) */
                                         3  6  2  0  1  0        /* TX_CLK (CLK8) */
-                                        1 12  1  0  1  0        /* TxD0 */
-                                        1 13  1  0  1  0        /* TxD1 */
-                                        1 14  1  0  1  0        /* TxD2 */
-                                        1 15  1  0  1  0        /* TxD3 */
-                                        1 16  2  0  1  0        /* RxD0 */
-                                        1 17  2  0  1  0        /* RxD1 */
-                                        1 18  2  0  1  0        /* RxD2 */
-                                        1 19  2  0  1  0        /* RxD3 */
-                                        1 1a  2  0  1  0        /* RX_ER */
-                                        1 1b  1  0  1  0        /* TX_ER */
-                                        1 1c  2  0  1  0        /* RX_DV */
-                                        1 1d  2  0  1  0        /* COL */
-                                        1 1e  1  0  1  0        /* TX_EN */
-                                        1 1f  2  0  1  0>;/* CRS */
+                                        1 18  1  0  1  0        /* TxD0 */
+                                        1 19  1  0  1  0        /* TxD1 */
+                                        1 20  1  0  1  0        /* TxD2 */
+                                        1 21  1  0  1  0        /* TxD3 */
+                                        1 22  2  0  1  0        /* RxD0 */
+                                        1 23  2  0  1  0        /* RxD1 */
+                                        1 24  2  0  1  0        /* RxD2 */
+                                        1 25  2  0  1  0        /* RxD3 */
+                                        1 26  2  0  1  0        /* RX_ER */
+                                        1 27  1  0  1  0        /* TX_ER */
+                                        1 28  2  0  1  0        /* RX_DV */
+                                        1 29  2  0  1  0        /* COL */
+                                        1 30  1  0  1  0        /* TX_EN */
+                                        1 31  2  0  1  0>;      /* CRS */
                         };
+                        pio5: ucc_pin@05 {
+                                pio-map = <
+                                /*
+                                 *                    open       has
+                                 *   port  pin  dir  drain  sel  irq
+                                 */
+                                        2    0    1      0    2    0  /* TxD5 */
+                                        2    8    2      0    2    0  /* RxD5 */
+
+                                        2   29    2      0    0    0  /* CTS5 */
+                                        2   31    1      0    2    0  /* RTS5 */
+
+                                        2   24    2      0    0    0  /* CD */
+
+                                >;
+                        };
+
                 };
         };
 
@@ -166,178 +207,191 @@
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "qe";
-                model = "QE";
-                ranges = <0 e0100000 00100000>;
-                reg = <e0100000 480>;
+                compatible = "fsl,qe";
+                ranges = <0x0 0xe0100000 0x00100000>;
+                reg = <0xe0100000 0x480>;
                 brg-frequency = <0>;
-                bus-frequency = <BCD3D80>;
+                bus-frequency = <198000000>;
 
                 muram@10000 {
-                        device_type = "muram";
-                        ranges = <0 00010000 00004000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
+                        ranges = <0x0 0x00010000 0x00004000>;
 
                         data-only@0 {
-                                reg = <0 4000>;
+                                compatible = "fsl,qe-muram-data",
+                                             "fsl,cpm-muram-data";
+                                reg = <0x0 0x4000>;
                         };
                 };
 
                 spi@4c0 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
-                        reg = <4c0 40>;
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
+                        reg = <0x4c0 0x40>;
                         interrupts = <2>;
-                        interrupt-parent = < &qeic >;
+                        interrupt-parent = <&qeic>;
                         mode = "cpu";
                 };
 
                 spi@500 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
-                        reg = <500 40>;
+                        cell-index = <1>;
+                        compatible = "fsl,spi";
+                        reg = <0x500 0x40>;
                         interrupts = <1>;
-                        interrupt-parent = < &qeic >;
+                        interrupt-parent = <&qeic>;
                         mode = "cpu";
                 };
 
                 usb@6c0 {
-                        device_type = "usb";
                         compatible = "qe_udc";
-                        reg = <6c0 40 8B00 100>;
-                        interrupts = <b>;
-                        interrupt-parent = < &qeic >;
+                        reg = <0x6c0 0x40 0x8b00 0x100>;
+                        interrupts = <11>;
+                        interrupt-parent = <&qeic>;
                         mode = "slave";
                 };
 
-                ucc@2200 {
+                enet0: ucc@2200 {
                         device_type = "network";
                         compatible = "ucc_geth";
                         model = "UCC";
+                        cell-index = <3>;
                         device-id = <3>;
-                        reg = <2200 200>;
-                        interrupts = <22>;
-                        interrupt-parent = < &qeic >;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
+                        reg = <0x2200 0x200>;
+                        interrupts = <34>;
+                        interrupt-parent = <&qeic>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <19>;
-                        tx-clock = <1a>;
-                        phy-handle = < &phy3 >;
-                        pio-handle = < &pio3 >;
+                        rx-clock-name = "clk9";
+                        tx-clock-name = "clk10";
+                        phy-handle = <&phy3>;
+                        pio-handle = <&pio3>;
                 };
 
-                ucc@3200 {
+                enet1: ucc@3200 {
                         device_type = "network";
                         compatible = "ucc_geth";
                         model = "UCC";
+                        cell-index = <4>;
                         device-id = <4>;
-                        reg = <3200 200>;
-                        interrupts = <23>;
+                        reg = <0x3200 0x200>;
+                        interrupts = <35>;
+                        interrupt-parent = <&qeic>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        rx-clock-name = "clk7";
+                        tx-clock-name = "clk8";
+                        phy-handle = <&phy4>;
+                        pio-handle = <&pio4>;
+                };
+
+                ucc@2400 {
+                        device_type = "serial";
+                        compatible = "ucc_uart";
+                        model = "UCC";
+                        device-id = <5>;        /* The UCC number, 1-7*/
+                        port-number = <0>;      /* Which ttyQEx device */
+                        soft-uart;              /* We need Soft-UART */
+                        reg = <0x2400 0x200>;
+                        interrupts = <40>;      /* From Table 18-12 */
                         interrupt-parent = < &qeic >;
                         /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
+                         * For Soft-UART, we need to set TX to 1X, which
+                         * means specifying separate clock sources.
                          */
-                        mac-address = [ 00 00 00 00 00 00 ];
-                        local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <17>;
-                        tx-clock = <18>;
-                        phy-handle = < &phy4 >;
-                        pio-handle = < &pio4 >;
+                        rx-clock-name = "brg5";
+                        tx-clock-name = "brg6";
+                        pio-handle = < &pio5 >;
                 };
 
+
                 mdio@2320 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        reg = <2320 18>;
-                        device_type = "mdio";
-                        compatible = "ucc_geth_phy";
+                        reg = <0x2320 0x18>;
+                        compatible = "fsl,ucc-mdio";
 
                         phy3: ethernet-phy@03 {
-                                interrupt-parent = < &ipic >;
-                                interrupts = <11 8>;
-                                reg = <3>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <17 0x8>;
+                                reg = <0x3>;
                                 device_type = "ethernet-phy";
                         };
                         phy4: ethernet-phy@04 {
-                                interrupt-parent = < &ipic >;
-                                interrupts = <12 8>;
-                                reg = <4>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <18 0x8>;
+                                reg = <0x4>;
                                 device_type = "ethernet-phy";
                         };
                 };
 
-                qeic: qeic@80 {
+                qeic: interrupt-controller@80 {
                         interrupt-controller;
-                        device_type = "qeic";
+                        compatible = "fsl,qe-ic";
                         #address-cells = <0>;
                         #interrupt-cells = <1>;
-                        reg = <80 80>;
+                        reg = <0x80 0x80>;
                         big-endian;
-                        interrupts = <20 8 21 8>; //high:32 low:33
-                        interrupt-parent = < &ipic >;
+                        interrupts = <32 0x8 33 0x8>; //high:32 low:33
+                        interrupt-parent = <&ipic>;
                 };
         };
 
-        pci@e0008500 {
-                interrupt-map-mask = <f800 0 0 7>;
+        pci0: pci@e0008500 {
+                cell-index = <1>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                                 /* IDSEL 0x11 AD17 */
-                                 8800 0 0 1 &ipic 14 8
-                                 8800 0 0 2 &ipic 15 8
-                                 8800 0 0 3 &ipic 16 8
-                                 8800 0 0 4 &ipic 17 8
+                                 0x8800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0x8800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0x8800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0x8800 0x0 0x0 0x4 &ipic 23 0x8
 
                                 /* IDSEL 0x12 AD18 */
-                                 9000 0 0 1 &ipic 16 8
-                                 9000 0 0 2 &ipic 17 8
-                                 9000 0 0 3 &ipic 14 8
-                                 9000 0 0 4 &ipic 15 8
+                                 0x9000 0x0 0x0 0x1 &ipic 22 0x8
+                                 0x9000 0x0 0x0 0x2 &ipic 23 0x8
+                                 0x9000 0x0 0x0 0x3 &ipic 20 0x8
+                                 0x9000 0x0 0x0 0x4 &ipic 21 0x8
 
                                 /* IDSEL 0x13 AD19 */
-                                 9800 0 0 1 &ipic 17 8
-                                 9800 0 0 2 &ipic 14 8
-                                 9800 0 0 3 &ipic 15 8
-                                 9800 0 0 4 &ipic 16 8
+                                 0x9800 0x0 0x0 0x1 &ipic 23 0x8
+                                 0x9800 0x0 0x0 0x2 &ipic 20 0x8
+                                 0x9800 0x0 0x0 0x3 &ipic 21 0x8
+                                 0x9800 0x0 0x0 0x4 &ipic 22 0x8
 
                                 /* IDSEL 0x15 AD21*/
-                                 a800 0 0 1 &ipic 14 8
-                                 a800 0 0 2 &ipic 15 8
-                                 a800 0 0 3 &ipic 16 8
-                                 a800 0 0 4 &ipic 17 8
+                                 0xa800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0xa800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0xa800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0xa800 0x0 0x0 0x4 &ipic 23 0x8
 
                                 /* IDSEL 0x16 AD22*/
-                                 b000 0 0 1 &ipic 17 8
-                                 b000 0 0 2 &ipic 14 8
-                                 b000 0 0 3 &ipic 15 8
-                                 b000 0 0 4 &ipic 16 8
+                                 0xb000 0x0 0x0 0x1 &ipic 23 0x8
+                                 0xb000 0x0 0x0 0x2 &ipic 20 0x8
+                                 0xb000 0x0 0x0 0x3 &ipic 21 0x8
+                                 0xb000 0x0 0x0 0x4 &ipic 22 0x8
 
                                 /* IDSEL 0x17 AD23*/
-                                 b800 0 0 1 &ipic 16 8
-                                 b800 0 0 2 &ipic 17 8
-                                 b800 0 0 3 &ipic 14 8
-                                 b800 0 0 4 &ipic 15 8
+                                 0xb800 0x0 0x0 0x1 &ipic 22 0x8
+                                 0xb800 0x0 0x0 0x2 &ipic 23 0x8
+                                 0xb800 0x0 0x0 0x3 &ipic 20 0x8
+                                 0xb800 0x0 0x0 0x4 &ipic 21 0x8
 
                                 /* IDSEL 0x18 AD24*/
-                                 c000 0 0 1 &ipic 15 8
-                                 c000 0 0 2 &ipic 16 8
-                                 c000 0 0 3 &ipic 17 8
-                                 c000 0 0 4 &ipic 14 8>;
-                interrupt-parent = < &ipic >;
-                interrupts = <42 8>;
-                bus-range = <0 0>;
-                ranges = <02000000 0 90000000 90000000 0 10000000
-                          42000000 0 80000000 80000000 0 10000000
-                          01000000 0 00000000 d0000000 0 00100000>;
+                                 0xc000 0x0 0x0 0x1 &ipic 21 0x8
+                                 0xc000 0x0 0x0 0x2 &ipic 22 0x8
+                                 0xc000 0x0 0x0 0x3 &ipic 23 0x8
+                                 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
+                bus-range = <0x0 0x0>;
+                ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xd0000000 0x0 0x00100000>;
                 clock-frequency = <0>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <e0008500 100>;
+                reg = <0xe0008500 0x100>;
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
diff --git a/arch/powerpc/boot/dts/mpc832x_rdb.dts b/arch/powerpc/boot/dts/mpc832x_rdb.dts
index 388c8a7012e1..94f93d209de8 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -9,23 +9,33 @@
  * option) any later version.
  */
 
+/dts-v1/;
+
 / {
         model = "MPC8323ERDB";
         compatible = "MPC8323ERDB", "MPC832xRDB", "MPC83xxRDB";
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
                 PowerPC,8323@0 {
                         device_type = "cpu";
-                        reg = <0>;
-                        d-cache-line-size = <20>;       // 32 bytes
-                        i-cache-line-size = <20>;       // 32 bytes
-                        d-cache-size = <4000>;          // L1, 16K
-                        i-cache-size = <4000>;          // L1, 16K
+                        reg = <0x0>;
+                        d-cache-line-size = <0x20>;     // 32 bytes
+                        i-cache-line-size = <0x20>;     // 32 bytes
+                        d-cache-size = <16384>; // L1, 16K
+                        i-cache-size = <16384>; // L1, 16K
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
@@ -34,47 +44,51 @@
 
         memory {
                 device_type = "memory";
-                reg = <00000000 04000000>;
+                reg = <0x00000000 0x04000000>;
         };
 
         soc8323@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "soc";
-                ranges = <0 e0000000 00100000>;
-                reg = <e0000000 00000200>;
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x00000200>;
                 bus-frequency = <0>;
 
                 wdt@200 {
                         device_type = "watchdog";
                         compatible = "mpc83xx_wdt";
-                        reg = <200 100>;
+                        reg = <0x200 0x100>;
                 };
 
                 i2c@3000 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
-                        reg = <3000 100>;
-                        interrupts = <e 8>;
+                        reg = <0x3000 0x100>;
+                        interrupts = <14 0x8>;
                         interrupt-parent = <&pic>;
                         dfsrr;
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4500 100>;
+                        reg = <0x4500 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <9 8>;
+                        interrupts = <9 0x8>;
                         interrupt-parent = <&pic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4600 100>;
+                        reg = <0x4600 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <a 8>;
+                        interrupts = <10 0x8>;
                         interrupt-parent = <&pic>;
                 };
 
@@ -82,26 +96,26 @@
                         device_type = "crypto";
                         model = "SEC2";
                         compatible = "talitos";
-                        reg = <30000 7000>;
-                        interrupts = <b 8>;
+                        reg = <0x30000 0x7000>;
+                        interrupts = <11 0x8>;
                         interrupt-parent = <&pic>;
                         /* Rev. 2.2 */
                         num-channels = <1>;
-                        channel-fifo-len = <18>;
-                        exec-units-mask = <0000004c>;
-                        descriptor-types-mask = <0122003f>;
+                        channel-fifo-len = <24>;
+                        exec-units-mask = <0x0000004c>;
+                        descriptor-types-mask = <0x0122003f>;
                 };
 
                 pic:pic@700 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
-                        reg = <700 100>;
+                        reg = <0x700 0x100>;
                         device_type = "ipic";
                 };
 
                 par_io@1400 {
-                        reg = <1400 100>;
+                        reg = <0x1400 0x100>;
                         device_type = "par_io";
                         num-ports = <7>;
 
@@ -110,28 +124,28 @@
                         /* port  pin  dir  open_drain  assignment  has_irq */
                                         3  4  3  0  2  0        /* MDIO */
                                         3  5  1  0  2  0        /* MDC */
-                                        3 15  2  0  1  0        /* RX_CLK (CLK16) */
-                                        3 17  2  0  1  0        /* TX_CLK (CLK3) */
-                                        0 12  1  0  1  0        /* TxD0 */
-                                        0 13  1  0  1  0        /* TxD1 */
-                                        0 14  1  0  1  0        /* TxD2 */
-                                        0 15  1  0  1  0        /* TxD3 */
-                                        0 16  2  0  1  0        /* RxD0 */
-                                        0 17  2  0  1  0        /* RxD1 */
-                                        0 18  2  0  1  0        /* RxD2 */
-                                        0 19  2  0  1  0        /* RxD3 */
-                                        0 1a  2  0  1  0        /* RX_ER */
-                                        0 1b  1  0  1  0        /* TX_ER */
-                                        0 1c  2  0  1  0        /* RX_DV */
-                                        0 1d  2  0  1  0        /* COL */
-                                        0 1e  1  0  1  0        /* TX_EN */
-                                        0 1f  2  0  1  0>;      /* CRS */
+                                        3 21  2  0  1  0        /* RX_CLK (CLK16) */
+                                        3 23  2  0  1  0        /* TX_CLK (CLK3) */
+                                        0 18  1  0  1  0        /* TxD0 */
+                                        0 19  1  0  1  0        /* TxD1 */
+                                        0 20  1  0  1  0        /* TxD2 */
+                                        0 21  1  0  1  0        /* TxD3 */
+                                        0 22  2  0  1  0        /* RxD0 */
+                                        0 23  2  0  1  0        /* RxD1 */
+                                        0 24  2  0  1  0        /* RxD2 */
+                                        0 25  2  0  1  0        /* RxD3 */
+                                        0 26  2  0  1  0        /* RX_ER */
+                                        0 27  1  0  1  0        /* TX_ER */
+                                        0 28  2  0  1  0        /* RX_DV */
+                                        0 29  2  0  1  0        /* COL */
+                                        0 30  1  0  1  0        /* TX_EN */
+                                        0 31  2  0  1  0>;      /* CRS */
                         };
                         ucc3pio:ucc_pin@03 {
                                 pio-map = <
                         /* port  pin  dir  open_drain  assignment  has_irq */
-                                        0  d  2  0  1  0        /* RX_CLK (CLK9) */
-                                        3 18  2  0  1  0        /* TX_CLK (CLK10) */
+                                        0 13  2  0  1  0        /* RX_CLK (CLK9) */
+                                        3 24  2  0  1  0        /* TX_CLK (CLK10) */
                                         1  0  1  0  1  0        /* TxD0 */
                                         1  1  1  0  1  0        /* TxD1 */
                                         1  2  1  0  1  0        /* TxD2 */
@@ -142,10 +156,10 @@
                                         1  7  2  0  1  0        /* RxD3 */
                                         1  8  2  0  1  0        /* RX_ER */
                                         1  9  1  0  1  0        /* TX_ER */
-                                        1  a  2  0  1  0        /* RX_DV */
-                                        1  b  2  0  1  0        /* COL */
-                                        1  c  1  0  1  0        /* TX_EN */
-                                        1  d  2  0  1  0>;      /* CRS */
+                                        1 10  2  0  1  0        /* RX_DV */
+                                        1 11  2  0  1  0        /* COL */
+                                        1 12  1  0  1  0        /* TX_EN */
+                                        1 13  2  0  1  0>;      /* CRS */
                         };
                 };
         };
@@ -154,77 +168,71 @@
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "qe";
-                model = "QE";
-                ranges = <0 e0100000 00100000>;
-                reg = <e0100000 480>;
+                compatible = "fsl,qe";
+                ranges = <0x0 0xe0100000 0x00100000>;
+                reg = <0xe0100000 0x480>;
                 brg-frequency = <0>;
-                bus-frequency = <BCD3D80>;
+                bus-frequency = <198000000>;
 
                 muram@10000 {
-                        device_type = "muram";
-                        ranges = <0 00010000 00004000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
+                        ranges = <0x0 0x00010000 0x00004000>;
 
                         data-only@0 {
-                                reg = <0 4000>;
+                                compatible = "fsl,qe-muram-data",
+                                             "fsl,cpm-muram-data";
+                                reg = <0x0 0x4000>;
                         };
                 };
 
                 spi@4c0 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
-                        reg = <4c0 40>;
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
+                        reg = <0x4c0 0x40>;
                         interrupts = <2>;
                         interrupt-parent = <&qeic>;
                         mode = "cpu-qe";
                 };
 
                 spi@500 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
-                        reg = <500 40>;
+                        cell-index = <1>;
+                        compatible = "fsl,spi";
+                        reg = <0x500 0x40>;
                         interrupts = <1>;
                         interrupt-parent = <&qeic>;
                         mode = "cpu";
                 };
 
-                ucc@3000 {
+                enet0: ucc@3000 {
                         device_type = "network";
                         compatible = "ucc_geth";
                         model = "UCC";
+                        cell-index = <2>;
                         device-id = <2>;
-                        reg = <3000 200>;
-                        interrupts = <21>;
+                        reg = <0x3000 0x200>;
+                        interrupts = <33>;
                         interrupt-parent = <&qeic>;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <20>;
-                        tx-clock = <13>;
+                        rx-clock-name = "clk16";
+                        tx-clock-name = "clk3";
                         phy-handle = <&phy00>;
                         pio-handle = <&ucc2pio>;
                 };
 
-                ucc@2200 {
+                enet1: ucc@2200 {
                         device_type = "network";
                         compatible = "ucc_geth";
                         model = "UCC";
+                        cell-index = <3>;
                         device-id = <3>;
-                        reg = <2200 200>;
-                        interrupts = <22>;
+                        reg = <0x2200 0x200>;
+                        interrupts = <34>;
                         interrupt-parent = <&qeic>;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <19>;
-                        tx-clock = <1a>;
+                        rx-clock-name = "clk9";
+                        tx-clock-name = "clk10";
                         phy-handle = <&phy04>;
                         pio-handle = <&ucc3pio>;
                 };
@@ -232,65 +240,65 @@
                 mdio@3120 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        reg = <3120 18>;
-                        device_type = "mdio";
-                        compatible = "ucc_geth_phy";
+                        reg = <0x3120 0x18>;
+                        compatible = "fsl,ucc-mdio";
 
                         phy00:ethernet-phy@00 {
                                 interrupt-parent = <&pic>;
                                 interrupts = <0>;
-                                reg = <0>;
+                                reg = <0x0>;
                                 device_type = "ethernet-phy";
                         };
                         phy04:ethernet-phy@04 {
                                 interrupt-parent = <&pic>;
                                 interrupts = <0>;
-                                reg = <4>;
+                                reg = <0x4>;
                                 device_type = "ethernet-phy";
                         };
                 };
 
-                qeic:qeic@80 {
+                qeic:interrupt-controller@80 {
                         interrupt-controller;
-                        device_type = "qeic";
+                        compatible = "fsl,qe-ic";
                         #address-cells = <0>;
                         #interrupt-cells = <1>;
-                        reg = <80 80>;
+                        reg = <0x80 0x80>;
                         big-endian;
-                        interrupts = <20 8 21 8>; //high:32 low:33
+                        interrupts = <32 0x8 33 0x8>; //high:32 low:33
                         interrupt-parent = <&pic>;
                 };
         };
 
-        pci@e0008500 {
-                interrupt-map-mask = <f800 0 0 7>;
+        pci0: pci@e0008500 {
+                cell-index = <1>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                                 /* IDSEL 0x10 AD16 (USB) */
-                                 8000 0 0 1 &pic 11 8
+                                 0x8000 0x0 0x0 0x1 &pic 17 0x8
 
                                 /* IDSEL 0x11 AD17 (Mini1)*/
-                                 8800 0 0 1 &pic 12 8
-                                 8800 0 0 2 &pic 13 8
-                                 8800 0 0 3 &pic 14 8
-                                 8800 0 0 4 &pic 30 8
+                                 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
 
                                 /* IDSEL 0x12 AD18 (PCI/Mini2) */
-                                 9000 0 0 1 &pic 13 8
-                                 9000 0 0 2 &pic 14 8
-                                 9000 0 0 3 &pic 30 8
-                                 9000 0 0 4 &pic 11 8>;
+                                 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>;
 
                 interrupt-parent = <&pic>;
-                interrupts = <42 8>;
-                bus-range = <0 0>;
-                ranges = <42000000 0 80000000 80000000 0 10000000
-                          02000000 0 90000000 90000000 0 10000000
-                          01000000 0 d0000000 d0000000 0 04000000>;
+                interrupts = <66 0x8>;
+                bus-range = <0x0 0x0>;
+                ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                          0x01000000 0x0 0xd0000000 0xd0000000 0x0 0x04000000>;
                 clock-frequency = <0>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <e0008500 100>;
+                reg = <0xe0008500 0x100>;
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 5072f6d0a46d..9426676b0b7d 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -8,23 +8,35 @@
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  */
+
+/dts-v1/;
+
 / {
         model = "MPC8349EMITX";
         compatible = "MPC8349EMITX", "MPC834xMITX", "MPC83xxMITX";
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
                 PowerPC,8349@0 {
                         device_type = "cpu";
-                        reg = <0>;
-                        d-cache-line-size = <20>;
-                        i-cache-line-size = <20>;
-                        d-cache-size = <8000>;
-                        i-cache-size = <8000>;
+                        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
@@ -33,222 +45,223 @@
 
         memory {
                 device_type = "memory";
-                reg = <00000000 10000000>;
+                reg = <0x00000000 0x10000000>;
         };
 
         soc8349@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "soc";
-                ranges = <0 e0000000 00100000>;
-                reg = <e0000000 00000200>;
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x00000200>;
                 bus-frequency = <0>;                    // from bootloader
 
                 wdt@200 {
                         device_type = "watchdog";
                         compatible = "mpc83xx_wdt";
-                        reg = <200 100>;
+                        reg = <0x200 0x100>;
                 };
 
                 i2c@3000 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
-                        reg = <3000 100>;
-                        interrupts = <e 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x3000 0x100>;
+                        interrupts = <14 0x8>;
+                        interrupt-parent = <&ipic>;
                         dfsrr;
                 };
 
                 i2c@3100 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
                         compatible = "fsl-i2c";
-                        reg = <3100 100>;
-                        interrupts = <f 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x3100 0x100>;
+                        interrupts = <15 0x8>;
+                        interrupt-parent = <&ipic>;
                         dfsrr;
                 };
 
                 spi@7000 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
-                        reg = <7000 1000>;
-                        interrupts = <10 8>;
-                        interrupt-parent = < &ipic >;
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
+                        reg = <0x7000 0x1000>;
+                        interrupts = <16 0x8>;
+                        interrupt-parent = <&ipic>;
                         mode = "cpu";
                 };
 
                 usb@22000 {
-                        device_type = "usb";
                         compatible = "fsl-usb2-mph";
-                        reg = <22000 1000>;
+                        reg = <0x22000 0x1000>;
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <27 8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <39 0x8>;
                         phy_type = "ulpi";
                         port1;
                 };
 
                 usb@23000 {
-                        device_type = "usb";
                         compatible = "fsl-usb2-dr";
-                        reg = <23000 1000>;
+                        reg = <0x23000 0x1000>;
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <26 8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <38 0x8>;
                         dr_mode = "peripheral";
                         phy_type = "ulpi";
                 };
 
                 mdio@24520 {
-                        device_type = "mdio";
-                        compatible = "gianfar";
-                        reg = <24520 20>;
                         #address-cells = <1>;
                         #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
 
                         /* Vitesse 8201 */
                         phy1c: ethernet-phy@1c {
-                                interrupt-parent = < &ipic >;
-                                interrupts = <12 8>;
-                                reg = <1c>;
-                                device_type = "ethernet-phy";
-                        };
-
-                        /* Vitesse 7385 */
-                        phy1f: ethernet-phy@1f {
-                                interrupt-parent = < &ipic >;
-                                interrupts = <12 8>;
-                                reg = <1f>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <18 0x8>;
+                                reg = <0x1c>;
                                 device_type = "ethernet-phy";
                         };
                 };
 
-                ethernet@24000 {
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
-                        reg = <24000 1000>;
-                        /*
-                         * address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        address = [ 00 00 00 00 00 00 ];
+                        reg = <0x24000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <20 8 21 8 22 8>;
-                        interrupt-parent = < &ipic >;
-                        phy-handle = < &phy1c >;
+                        interrupts = <32 0x8 33 0x8 34 0x8>;
+                        interrupt-parent = <&ipic>;
+                        phy-handle = <&phy1c>;
                         linux,network-index = <0>;
                 };
 
-                ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
-                        reg = <25000 1000>;
-                        /*
-                         * address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        address = [ 00 00 00 00 00 00 ];
+                        reg = <0x25000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <23 8 24 8 25 8>;
-                        interrupt-parent = < &ipic >;
-                        phy-handle = < &phy1f >;
+                        interrupts = <35 0x8 36 0x8 37 0x8>;
+                        interrupt-parent = <&ipic>;
+                        /* Vitesse 7385 isn't on the MDIO bus */
+                        fixed-link = <1 1 1000 0 0>;
                         linux,network-index = <1>;
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4500 100>;
+                        reg = <0x4500 0x100>;
                         clock-frequency = <0>;          // from bootloader
-                        interrupts = <9 8>;
-                        interrupt-parent = < &ipic >;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4600 100>;
+                        reg = <0x4600 0x100>;
                         clock-frequency = <0>;          // from bootloader
-                        interrupts = <a 8>;
-                        interrupt-parent = < &ipic >;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = <&ipic>;
                 };
 
                 crypto@30000 {
                         device_type = "crypto";
                         model = "SEC2";
                         compatible = "talitos";
-                        reg = <30000 10000>;
-                        interrupts = <b 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x30000 0x10000>;
+                        interrupts = <11 0x8>;
+                        interrupt-parent = <&ipic>;
                         num-channels = <4>;
-                        channel-fifo-len = <18>;
-                        exec-units-mask = <0000007e>;
-                        descriptor-types-mask = <01010ebf>;
+                        channel-fifo-len = <24>;
+                        exec-units-mask = <0x0000007e>;
+                        descriptor-types-mask = <0x01010ebf>;
                 };
 
                 ipic: pic@700 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
-                        reg = <700 100>;
+                        reg = <0x700 0x100>;
                         device_type = "ipic";
                 };
         };
 
-        pci@e0008500 {
-                interrupt-map-mask = <f800 0 0 7>;
+        pci0: pci@e0008500 {
+                cell-index = <1>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                                 /* IDSEL 0x10 - SATA */
-                                8000 0 0 1 &ipic 16 8 /* SATA_INTA */
+                                0x8000 0x0 0x0 0x1 &ipic 22 0x8 /* SATA_INTA */
                                 >;
-                interrupt-parent = < &ipic >;
-                interrupts = <42 8>;
-                bus-range = <0 0>;
-                ranges = <42000000 0 80000000 80000000 0 10000000
-                          02000000 0 90000000 90000000 0 10000000
-                          01000000 0 00000000 e2000000 0 01000000>;
-                clock-frequency = <3f940aa>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
+                bus-range = <0x0 0x0>;
+                ranges = <0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x01000000>;
+                clock-frequency = <66666666>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <e0008500 100>;
+                reg = <0xe0008500 0x100>;
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
 
-        pci@e0008600 {
-                interrupt-map-mask = <f800 0 0 7>;
+        pci1: pci@e0008600 {
+                cell-index = <2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                                 /* IDSEL 0x0E - MiniPCI Slot */
-                                7000 0 0 1 &ipic 15 8 /* PCI_INTA */
+                                0x7000 0x0 0x0 0x1 &ipic 21 0x8 /* PCI_INTA */
 
                                 /* IDSEL 0x0F - PCI Slot */
-                                7800 0 0 1 &ipic 14 8 /* PCI_INTA */
-                                7800 0 0 2 &ipic 15 8 /* PCI_INTB */
-                                 >;
-                interrupt-parent = < &ipic >;
-                interrupts = <43 8>;
-                bus-range = <0 0>;
-                ranges = <42000000 0 a0000000 a0000000 0 10000000
-                          02000000 0 b0000000 b0000000 0 10000000
-                          01000000 0 00000000 e3000000 0 01000000>;
-                clock-frequency = <3f940aa>;
+                                0x7800 0x0 0x0 0x1 &ipic 20 0x8 /* PCI_INTA */
+                                0x7800 0x0 0x0 0x2 &ipic 21 0x8 /* PCI_INTB */
+                                >;
+                interrupt-parent = <&ipic>;
+                interrupts = <67 0x8>;
+                bus-range = <0x0 0x0>;
+                ranges = <0x42000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
+                          0x02000000 0x0 0xb0000000 0xb0000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe3000000 0x0 0x01000000>;
+                clock-frequency = <66666666>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <e0008600 100>;
+                reg = <0xe0008600 0x100>;
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
 
+        localbus@e0005000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8349e-localbus",
+                             "fsl,pq2pro-localbus";
+                reg = <0xe0005000 0xd8>;
+                ranges = <0x3 0x0 0xf0000000 0x210>;
 
-
+                pata@3,0 {
+                        compatible = "fsl,mpc8349emitx-pata", "ata-generic";
+                        reg = <0x3 0x0 0x10 0x3 0x20c 0x4>;
+                        reg-shift = <1>;
+                        pio-mode = <6>;
+                        interrupts = <23 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+        };
 };
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index 074f7a2ab7e4..f81d735e6e72 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -8,23 +8,33 @@
  * Free Software Foundation; either version 2 of the License, or (at your
  * option) any later version.
  */
+
+/dts-v1/;
+
 / {
         model = "MPC8349EMITXGP";
         compatible = "MPC8349EMITXGP", "MPC834xMITX", "MPC83xxMITX";
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
                 PowerPC,8349@0 {
                         device_type = "cpu";
-                        reg = <0>;
-                        d-cache-line-size = <20>;
-                        i-cache-line-size = <20>;
-                        d-cache-size = <8000>;
-                        i-cache-size = <8000>;
+                        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
@@ -33,148 +43,154 @@
 
         memory {
                 device_type = "memory";
-                reg = <00000000 10000000>;
+                reg = <0x00000000 0x10000000>;
         };
 
         soc8349@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "soc";
-                ranges = <0 e0000000 00100000>;
-                reg = <e0000000 00000200>;
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x00000200>;
                 bus-frequency = <0>;                    // from bootloader
 
                 wdt@200 {
                         device_type = "watchdog";
                         compatible = "mpc83xx_wdt";
-                        reg = <200 100>;
+                        reg = <0x200 0x100>;
                 };
 
                 i2c@3000 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
-                        reg = <3000 100>;
-                        interrupts = <e 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x3000 0x100>;
+                        interrupts = <14 0x8>;
+                        interrupt-parent = <&ipic>;
                         dfsrr;
                 };
 
                 i2c@3100 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
                         compatible = "fsl-i2c";
-                        reg = <3100 100>;
-                        interrupts = <f 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x3100 0x100>;
+                        interrupts = <15 0x8>;
+                        interrupt-parent = <&ipic>;
                         dfsrr;
                 };
 
                 spi@7000 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
-                        reg = <7000 1000>;
-                        interrupts = <10 8>;
-                        interrupt-parent = < &ipic >;
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
+                        reg = <0x7000 0x1000>;
+                        interrupts = <16 0x8>;
+                        interrupt-parent = <&ipic>;
                         mode = "cpu";
                 };
 
                 usb@23000 {
-                        device_type = "usb";
                         compatible = "fsl-usb2-dr";
-                        reg = <23000 1000>;
+                        reg = <0x23000 0x1000>;
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <26 8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <38 0x8>;
                         dr_mode = "otg";
                         phy_type = "ulpi";
                 };
 
                 mdio@24520 {
-                        device_type = "mdio";
-                        compatible = "gianfar";
-                        reg = <24520 20>;
                         #address-cells = <1>;
                         #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
 
                         /* Vitesse 8201 */
                         phy1c: ethernet-phy@1c {
-                                interrupt-parent = < &ipic >;
-                                interrupts = <12 8>;
-                                reg = <1c>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <18 0x8>;
+                                reg = <0x1c>;
                                 device_type = "ethernet-phy";
                         };
                 };
 
-                ethernet@24000 {
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
-                        reg = <24000 1000>;
+                        reg = <0x24000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <20 8 21 8 22 8>;
-                        interrupt-parent = < &ipic >;
-                        phy-handle = < &phy1c >;
+                        interrupts = <32 0x8 33 0x8 34 0x8>;
+                        interrupt-parent = <&ipic>;
+                        phy-handle = <&phy1c>;
                         linux,network-index = <0>;
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4500 100>;
+                        reg = <0x4500 0x100>;
                         clock-frequency = <0>;          // from bootloader
-                        interrupts = <9 8>;
-                        interrupt-parent = < &ipic >;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4600 100>;
+                        reg = <0x4600 0x100>;
                         clock-frequency = <0>;          // from bootloader
-                        interrupts = <a 8>;
-                        interrupt-parent = < &ipic >;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = <&ipic>;
                 };
 
                 crypto@30000 {
                         device_type = "crypto";
                         model = "SEC2";
                         compatible = "talitos";
-                        reg = <30000 10000>;
-                        interrupts = <b 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x30000 0x10000>;
+                        interrupts = <11 0x8>;
+                        interrupt-parent = <&ipic>;
                         num-channels = <4>;
-                        channel-fifo-len = <18>;
-                        exec-units-mask = <0000007e>;
-                        descriptor-types-mask = <01010ebf>;
+                        channel-fifo-len = <24>;
+                        exec-units-mask = <0x0000007e>;
+                        descriptor-types-mask = <0x01010ebf>;
                 };
 
                 ipic: pic@700 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
-                        reg = <700 100>;
+                        reg = <0x700 0x100>;
                         device_type = "ipic";
                 };
         };
 
-        pci@e0008600 {
-                interrupt-map-mask = <f800 0 0 7>;
+        pci0: pci@e0008600 {
+                cell-index = <2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
                                 /* IDSEL 0x0F - PCI Slot */
-                                7800 0 0 1 &ipic 14 8 /* PCI_INTA */
-                                7800 0 0 2 &ipic 15 8 /* PCI_INTB */
+                                0x7800 0x0 0x0 0x1 &ipic 20 0x8 /* PCI_INTA */
+                                0x7800 0x0 0x0 0x2 &ipic 21 0x8 /* PCI_INTB */
                                  >;
-                interrupt-parent = < &ipic >;
-                interrupts = <43 8>;
-                bus-range = <1 1>;
-                ranges = <42000000 0 a0000000 a0000000 0 10000000
-                          02000000 0 b0000000 b0000000 0 10000000
-                          01000000 0 00000000 e3000000 0 01000000>;
-                clock-frequency = <3f940aa>;
+                interrupt-parent = <&ipic>;
+                interrupts = <67 0x8>;
+                bus-range = <0x1 0x1>;
+                ranges = <0x42000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
+                          0x02000000 0x0 0xb0000000 0xb0000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe3000000 0x0 0x01000000>;
+                clock-frequency = <66666666>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <e0008600 100>;
+                reg = <0xe0008600 0x100>;
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
diff --git a/arch/powerpc/boot/dts/mpc834x_mds.dts b/arch/powerpc/boot/dts/mpc834x_mds.dts
index 49363f89cb71..7480edae85ed 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -9,23 +9,34 @@
  * option) any later version.
  */
 
+/dts-v1/;
+
 / {
         model = "MPC8349EMDS";
         compatible = "MPC8349EMDS", "MPC834xMDS", "MPC83xxMDS";
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
                 PowerPC,8349@0 {
                         device_type = "cpu";
-                        reg = <0>;
-                        d-cache-line-size = <20>;       // 32 bytes
-                        i-cache-line-size = <20>;       // 32 bytes
-                        d-cache-size = <8000>;          // L1, 32K
-                        i-cache-size = <8000>;          // L1, 32K
+                        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
@@ -34,164 +45,152 @@
 
         memory {
                 device_type = "memory";
-                reg = <00000000 10000000>;      // 256MB at 0
+                reg = <0x00000000 0x10000000>;  // 256MB at 0
         };
 
         bcsr@e2400000 {
                 device_type = "board-control";
-                reg = <e2400000 8000>;
+                reg = <0xe2400000 0x8000>;
         };
 
         soc8349@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "soc";
-                ranges = <0 e0000000 00100000>;
-                reg = <e0000000 00000200>;
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x00000200>;
                 bus-frequency = <0>;
 
                 wdt@200 {
                         device_type = "watchdog";
                         compatible = "mpc83xx_wdt";
-                        reg = <200 100>;
+                        reg = <0x200 0x100>;
                 };
 
                 i2c@3000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "i2c";
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
-                        reg = <3000 100>;
-                        interrupts = <e 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x3000 0x100>;
+                        interrupts = <14 0x8>;
+                        interrupt-parent = <&ipic>;
                         dfsrr;
 
                         rtc@68 {
                                 compatible = "dallas,ds1374";
-                                reg = <68>;
+                                reg = <0x68>;
                         };
                 };
 
                 i2c@3100 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "i2c";
+                        cell-index = <1>;
                         compatible = "fsl-i2c";
-                        reg = <3100 100>;
-                        interrupts = <f 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x3100 0x100>;
+                        interrupts = <15 0x8>;
+                        interrupt-parent = <&ipic>;
                         dfsrr;
                 };
 
                 spi@7000 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
-                        reg = <7000 1000>;
-                        interrupts = <10 8>;
-                        interrupt-parent = < &ipic >;
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
+                        reg = <0x7000 0x1000>;
+                        interrupts = <16 0x8>;
+                        interrupt-parent = <&ipic>;
                         mode = "cpu";
                 };
 
-                /* phy type (ULPI or SERIAL) are only types supportted for MPH */
+                /* phy type (ULPI or SERIAL) are only types supported for MPH */
                 /* port = 0 or 1 */
                 usb@22000 {
-                        device_type = "usb";
                         compatible = "fsl-usb2-mph";
-                        reg = <22000 1000>;
+                        reg = <0x22000 0x1000>;
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <27 8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <39 0x8>;
                         phy_type = "ulpi";
                         port1;
                 };
                 /* phy type (ULPI, UTMI, UTMI_WIDE, SERIAL) */
                 usb@23000 {
-                        device_type = "usb";
                         compatible = "fsl-usb2-dr";
-                        reg = <23000 1000>;
+                        reg = <0x23000 0x1000>;
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        interrupt-parent = < &ipic >;
-                        interrupts = <26 8>;
+                        interrupt-parent = <&ipic>;
+                        interrupts = <38 0x8>;
                         dr_mode = "otg";
                         phy_type = "ulpi";
                 };
 
                 mdio@24520 {
-                        device_type = "mdio";
-                        compatible = "gianfar";
-                        reg = <24520 20>;
                         #address-cells = <1>;
                         #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
                         phy0: ethernet-phy@0 {
-                                interrupt-parent = < &ipic >;
-                                interrupts = <11 8>;
-                                reg = <0>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <17 0x8>;
+                                reg = <0x0>;
                                 device_type = "ethernet-phy";
                         };
                         phy1: ethernet-phy@1 {
-                                interrupt-parent = < &ipic >;
-                                interrupts = <12 8>;
-                                reg = <1>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <18 0x8>;
+                                reg = <0x1>;
                                 device_type = "ethernet-phy";
                         };
                 };
 
-                ethernet@24000 {
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
-                        reg = <24000 1000>;
-                        /*
-                         * address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        address = [ 00 00 00 00 00 00 ];
+                        reg = <0x24000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <20 8 21 8 22 8>;
-                        interrupt-parent = < &ipic >;
-                        phy-handle = < &phy0 >;
+                        interrupts = <32 0x8 33 0x8 34 0x8>;
+                        interrupt-parent = <&ipic>;
+                        phy-handle = <&phy0>;
                         linux,network-index = <0>;
                 };
 
-                ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
-                        reg = <25000 1000>;
-                        /*
-                         * address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        address = [ 00 00 00 00 00 00 ];
+                        reg = <0x25000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <23 8 24 8 25 8>;
-                        interrupt-parent = < &ipic >;
-                        phy-handle = < &phy1 >;
+                        interrupts = <35 0x8 36 0x8 37 0x8>;
+                        interrupt-parent = <&ipic>;
+                        phy-handle = <&phy1>;
                         linux,network-index = <1>;
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4500 100>;
+                        reg = <0x4500 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <9 8>;
-                        interrupt-parent = < &ipic >;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4600 100>;
+                        reg = <0x4600 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <a 8>;
-                        interrupt-parent = < &ipic >;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = <&ipic>;
                 };
 
                 /* May need to remove if on a part without crypto engine */
@@ -199,15 +198,15 @@
                         device_type = "crypto";
                         model = "SEC2";
                         compatible = "talitos";
-                        reg = <30000 10000>;
-                        interrupts = <b 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x30000 0x10000>;
+                        interrupts = <11 0x8>;
+                        interrupt-parent = <&ipic>;
                         num-channels = <4>;
-                        channel-fifo-len = <18>;
-                        exec-units-mask = <0000007e>;
+                        channel-fifo-len = <24>;
+                        exec-units-mask = <0x0000007e>;
                         /* desc mask is for rev2.0,
                          * we need runtime fixup for >2.0 */
-                        descriptor-types-mask = <01010ebf>;
+                        descriptor-types-mask = <0x01010ebf>;
                 };
 
                 /* IPIC
@@ -220,127 +219,129 @@
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
-                        reg = <700 100>;
+                        reg = <0x700 0x100>;
                         device_type = "ipic";
                 };
         };
 
-        pci@e0008500 {
-                interrupt-map-mask = <f800 0 0 7>;
+        pci0: pci@e0008500 {
+                cell-index = <1>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
                                 /* IDSEL 0x11 */
-                                 8800 0 0 1 &ipic 14 8
-                                 8800 0 0 2 &ipic 15 8
-                                 8800 0 0 3 &ipic 16 8
-                                 8800 0 0 4 &ipic 17 8
+                                 0x8800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0x8800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0x8800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0x8800 0x0 0x0 0x4 &ipic 23 0x8
 
                                 /* IDSEL 0x12 */
-                                 9000 0 0 1 &ipic 16 8
-                                 9000 0 0 2 &ipic 17 8
-                                 9000 0 0 3 &ipic 14 8
-                                 9000 0 0 4 &ipic 15 8
+                                 0x9000 0x0 0x0 0x1 &ipic 22 0x8
+                                 0x9000 0x0 0x0 0x2 &ipic 23 0x8
+                                 0x9000 0x0 0x0 0x3 &ipic 20 0x8
+                                 0x9000 0x0 0x0 0x4 &ipic 21 0x8
 
                                 /* IDSEL 0x13 */
-                                 9800 0 0 1 &ipic 17 8
-                                 9800 0 0 2 &ipic 14 8
-                                 9800 0 0 3 &ipic 15 8
-                                 9800 0 0 4 &ipic 16 8
+                                 0x9800 0x0 0x0 0x1 &ipic 23 0x8
+                                 0x9800 0x0 0x0 0x2 &ipic 20 0x8
+                                 0x9800 0x0 0x0 0x3 &ipic 21 0x8
+                                 0x9800 0x0 0x0 0x4 &ipic 22 0x8
 
                                 /* IDSEL 0x15 */
-                                 a800 0 0 1 &ipic 14 8
-                                 a800 0 0 2 &ipic 15 8
-                                 a800 0 0 3 &ipic 16 8
-                                 a800 0 0 4 &ipic 17 8
+                                 0xa800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0xa800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0xa800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0xa800 0x0 0x0 0x4 &ipic 23 0x8
 
                                 /* IDSEL 0x16 */
-                                 b000 0 0 1 &ipic 17 8
-                                 b000 0 0 2 &ipic 14 8
-                                 b000 0 0 3 &ipic 15 8
-                                 b000 0 0 4 &ipic 16 8
+                                 0xb000 0x0 0x0 0x1 &ipic 23 0x8
+                                 0xb000 0x0 0x0 0x2 &ipic 20 0x8
+                                 0xb000 0x0 0x0 0x3 &ipic 21 0x8
+                                 0xb000 0x0 0x0 0x4 &ipic 22 0x8
 
                                 /* IDSEL 0x17 */
-                                 b800 0 0 1 &ipic 16 8
-                                 b800 0 0 2 &ipic 17 8
-                                 b800 0 0 3 &ipic 14 8
-                                 b800 0 0 4 &ipic 15 8
+                                 0xb800 0x0 0x0 0x1 &ipic 22 0x8
+                                 0xb800 0x0 0x0 0x2 &ipic 23 0x8
+                                 0xb800 0x0 0x0 0x3 &ipic 20 0x8
+                                 0xb800 0x0 0x0 0x4 &ipic 21 0x8
 
                                 /* IDSEL 0x18 */
-                                 c000 0 0 1 &ipic 15 8
-                                 c000 0 0 2 &ipic 16 8
-                                 c000 0 0 3 &ipic 17 8
-                                 c000 0 0 4 &ipic 14 8>;
-                interrupt-parent = < &ipic >;
-                interrupts = <42 8>;
+                                 0xc000 0x0 0x0 0x1 &ipic 21 0x8
+                                 0xc000 0x0 0x0 0x2 &ipic 22 0x8
+                                 0xc000 0x0 0x0 0x3 &ipic 23 0x8
+                                 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
                 bus-range = <0 0>;
-                ranges = <02000000 0 90000000 90000000 0 10000000
-                          42000000 0 80000000 80000000 0 10000000
-                          01000000 0 00000000 e2000000 0 00100000>;
-                clock-frequency = <3f940aa>;
+                ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
+                clock-frequency = <66666666>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <e0008500 100>;
+                reg = <0xe0008500 0x100>;
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
 
-        pci@e0008600 {
-                interrupt-map-mask = <f800 0 0 7>;
+        pci1: pci@e0008600 {
+                cell-index = <2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
                                 /* IDSEL 0x11 */
-                                 8800 0 0 1 &ipic 14 8
-                                 8800 0 0 2 &ipic 15 8
-                                 8800 0 0 3 &ipic 16 8
-                                 8800 0 0 4 &ipic 17 8
+                                 0x8800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0x8800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0x8800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0x8800 0x0 0x0 0x4 &ipic 23 0x8
 
                                 /* IDSEL 0x12 */
-                                 9000 0 0 1 &ipic 16 8
-                                 9000 0 0 2 &ipic 17 8
-                                 9000 0 0 3 &ipic 14 8
-                                 9000 0 0 4 &ipic 15 8
+                                 0x9000 0x0 0x0 0x1 &ipic 22 0x8
+                                 0x9000 0x0 0x0 0x2 &ipic 23 0x8
+                                 0x9000 0x0 0x0 0x3 &ipic 20 0x8
+                                 0x9000 0x0 0x0 0x4 &ipic 21 0x8
 
                                 /* IDSEL 0x13 */
-                                 9800 0 0 1 &ipic 17 8
-                                 9800 0 0 2 &ipic 14 8
-                                 9800 0 0 3 &ipic 15 8
-                                 9800 0 0 4 &ipic 16 8
+                                 0x9800 0x0 0x0 0x1 &ipic 23 0x8
+                                 0x9800 0x0 0x0 0x2 &ipic 20 0x8
+                                 0x9800 0x0 0x0 0x3 &ipic 21 0x8
+                                 0x9800 0x0 0x0 0x4 &ipic 22 0x8
 
                                 /* IDSEL 0x15 */
-                                 a800 0 0 1 &ipic 14 8
-                                 a800 0 0 2 &ipic 15 8
-                                 a800 0 0 3 &ipic 16 8
-                                 a800 0 0 4 &ipic 17 8
+                                 0xa800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0xa800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0xa800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0xa800 0x0 0x0 0x4 &ipic 23 0x8
 
                                 /* IDSEL 0x16 */
-                                 b000 0 0 1 &ipic 17 8
-                                 b000 0 0 2 &ipic 14 8
-                                 b000 0 0 3 &ipic 15 8
-                                 b000 0 0 4 &ipic 16 8
+                                 0xb000 0x0 0x0 0x1 &ipic 23 0x8
+                                 0xb000 0x0 0x0 0x2 &ipic 20 0x8
+                                 0xb000 0x0 0x0 0x3 &ipic 21 0x8
+                                 0xb000 0x0 0x0 0x4 &ipic 22 0x8
 
                                 /* IDSEL 0x17 */
-                                 b800 0 0 1 &ipic 16 8
-                                 b800 0 0 2 &ipic 17 8
-                                 b800 0 0 3 &ipic 14 8
-                                 b800 0 0 4 &ipic 15 8
+                                 0xb800 0x0 0x0 0x1 &ipic 22 0x8
+                                 0xb800 0x0 0x0 0x2 &ipic 23 0x8
+                                 0xb800 0x0 0x0 0x3 &ipic 20 0x8
+                                 0xb800 0x0 0x0 0x4 &ipic 21 0x8
 
                                 /* IDSEL 0x18 */
-                                 c000 0 0 1 &ipic 15 8
-                                 c000 0 0 2 &ipic 16 8
-                                 c000 0 0 3 &ipic 17 8
-                                 c000 0 0 4 &ipic 14 8>;
-                interrupt-parent = < &ipic >;
-                interrupts = <42 8>;
+                                 0xc000 0x0 0x0 0x1 &ipic 21 0x8
+                                 0xc000 0x0 0x0 0x2 &ipic 22 0x8
+                                 0xc000 0x0 0x0 0x3 &ipic 23 0x8
+                                 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
                 bus-range = <0 0>;
-                ranges = <02000000 0 b0000000 b0000000 0 10000000
-                          42000000 0 a0000000 a0000000 0 10000000
-                          01000000 0 00000000 e2100000 0 00100000>;
-                clock-frequency = <3f940aa>;
+                ranges = <0x02000000 0x0 0xb0000000 0xb0000000 0x0 0x10000000
+                          0x42000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2100000 0x0 0x00100000>;
+                clock-frequency = <66666666>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <e0008600 100>;
+                reg = <0xe0008600 0x100>;
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
diff --git a/arch/powerpc/boot/dts/mpc836x_mds.dts b/arch/powerpc/boot/dts/mpc836x_mds.dts
index 0b2d2b588daa..55f03e8dc97f 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -14,122 +14,134 @@
 /memreserve/    00000000 1000000;
 */
 
+/dts-v1/;
+
 / {
         model = "MPC8360MDS";
         compatible = "MPC8360EMDS", "MPC836xMDS", "MPC83xxMDS";
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
                 PowerPC,8360@0 {
                         device_type = "cpu";
-                        reg = <0>;
-                        d-cache-line-size = <20>;       // 32 bytes
-                        i-cache-line-size = <20>;       // 32 bytes
-                        d-cache-size = <8000>;          // L1, 32K
-                        i-cache-size = <8000>;          // L1, 32K
-                        timebase-frequency = <3EF1480>;
-                        bus-frequency = <FBC5200>;
-                        clock-frequency = <1F78A400>;
+                        reg = <0x0>;
+                        d-cache-line-size = <32>;       // 32 bytes
+                        i-cache-line-size = <32>;       // 32 bytes
+                        d-cache-size = <32768>;         // L1, 32K
+                        i-cache-size = <32768>;         // L1, 32K
+                        timebase-frequency = <66000000>;
+                        bus-frequency = <264000000>;
+                        clock-frequency = <528000000>;
                 };
         };
 
         memory {
                 device_type = "memory";
-                reg = <00000000 10000000>;
+                reg = <0x00000000 0x10000000>;
         };
 
         bcsr@f8000000 {
                 device_type = "board-control";
-                reg = <f8000000 8000>;
+                reg = <0xf8000000 0x8000>;
         };
 
         soc8360@e0000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "soc";
-                ranges = <0 e0000000 00100000>;
-                reg = <e0000000 00000200>;
-                bus-frequency = <FBC5200>;
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x00000200>;
+                bus-frequency = <264000000>;
 
                 wdt@200 {
                         device_type = "watchdog";
                         compatible = "mpc83xx_wdt";
-                        reg = <200 100>;
+                        reg = <0x200 0x100>;
                 };
 
                 i2c@3000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "i2c";
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
-                        reg = <3000 100>;
-                        interrupts = <e 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x3000 0x100>;
+                        interrupts = <14 0x8>;
+                        interrupt-parent = <&ipic>;
                         dfsrr;
 
                         rtc@68 {
                                 compatible = "dallas,ds1374";
-                                reg = <68>;
+                                reg = <0x68>;
                         };
                 };
 
                 i2c@3100 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "i2c";
+                        cell-index = <1>;
                         compatible = "fsl-i2c";
-                        reg = <3100 100>;
-                        interrupts = <f 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x3100 0x100>;
+                        interrupts = <15 0x8>;
+                        interrupt-parent = <&ipic>;
                         dfsrr;
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4500 100>;
-                        clock-frequency = <FBC5200>;
-                        interrupts = <9 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <264000000>;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4600 100>;
-                        clock-frequency = <FBC5200>;
-                        interrupts = <a 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <264000000>;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = <&ipic>;
                 };
 
                 crypto@30000 {
                         device_type = "crypto";
                         model = "SEC2";
                         compatible = "talitos";
-                        reg = <30000 10000>;
-                        interrupts = <b 8>;
-                        interrupt-parent = < &ipic >;
+                        reg = <0x30000 0x10000>;
+                        interrupts = <11 0x8>;
+                        interrupt-parent = <&ipic>;
                         num-channels = <4>;
-                        channel-fifo-len = <18>;
-                        exec-units-mask = <0000007e>;
+                        channel-fifo-len = <24>;
+                        exec-units-mask = <0x0000007e>;
                         /* desc mask is for rev1.x, we need runtime fixup for >=2.x */
-                        descriptor-types-mask = <01010ebf>;
+                        descriptor-types-mask = <0x01010ebf>;
                 };
 
                 ipic: pic@700 {
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
-                        reg = <700 100>;
+                        reg = <0x700 0x100>;
                         device_type = "ipic";
                 };
 
                 par_io@1400 {
-                        reg = <1400 100>;
+                        reg = <0x1400 0x100>;
                         device_type = "par_io";
                         num-ports = <7>;
 
@@ -143,19 +155,19 @@
                                         1  6  1  0  3  0        /* TxD4 */
                                         1  7  1  0  1  0        /* TxD5 */
                                         1  9  1  0  2  0        /* TxD6 */
-                                        1  a  1  0  2  0        /* TxD7 */
+                                        1  10 1  0  2  0        /* TxD7 */
                                         0  9  2  0  1  0        /* RxD0 */
-                                        0  a  2  0  1  0        /* RxD1 */
-                                        0  b  2  0  1  0        /* RxD2 */
-                                        0  c  2  0  1  0        /* RxD3 */
-                                        0  d  2  0  1  0        /* RxD4 */
+                                        0  10 2  0  1  0        /* RxD1 */
+                                        0  11 2  0  1  0        /* RxD2 */
+                                        0  12 2  0  1  0        /* RxD3 */
+                                        0  13 2  0  1  0        /* RxD4 */
                                         1  1  2  0  2  0        /* RxD5 */
                                         1  0  2  0  2  0        /* RxD6 */
                                         1  4  2  0  2  0        /* RxD7 */
                                         0  7  1  0  1  0        /* TX_EN */
                                         0  8  1  0  1  0        /* TX_ER */
-                                        0  f  2  0  1  0        /* RX_DV */
-                                        0  10 2  0  1  0        /* RX_ER */
+                                        0  15 2  0  1  0        /* RX_DV */
+                                        0  16 2  0  1  0        /* RX_ER */
                                         0  0  2  0  1  0        /* RX_CLK */
                                         2  9  1  0  3  0        /* GTX_CLK - CLK10 */
                                         2  8  2  0  1  0>;      /* GTX125 - CLK9 */
@@ -163,27 +175,27 @@
                         pio2: ucc_pin@02 {
                                 pio-map = <
                         /* port  pin  dir  open_drain  assignment  has_irq */
-                                        0  11 1  0  1  0   /* TxD0 */
-                                        0  12 1  0  1  0   /* TxD1 */
-                                        0  13 1  0  1  0   /* TxD2 */
-                                        0  14 1  0  1  0   /* TxD3 */
+                                        0  17 1  0  1  0   /* TxD0 */
+                                        0  18 1  0  1  0   /* TxD1 */
+                                        0  19 1  0  1  0   /* TxD2 */
+                                        0  20 1  0  1  0   /* TxD3 */
                                         1  2  1  0  1  0   /* TxD4 */
                                         1  3  1  0  2  0   /* TxD5 */
                                         1  5  1  0  3  0   /* TxD6 */
                                         1  8  1  0  3  0   /* TxD7 */
-                                        0  17 2  0  1  0   /* RxD0 */
-                                        0  18 2  0  1  0   /* RxD1 */
-                                        0  19 2  0  1  0   /* RxD2 */
-                                        0  1a 2  0  1  0   /* RxD3 */
-                                        0  1b 2  0  1  0   /* RxD4 */
-                                        1  c  2  0  2  0   /* RxD5 */
-                                        1  d  2  0  3  0   /* RxD6 */
-                                        1  b  2  0  2  0   /* RxD7 */
-                                        0  15 1  0  1  0   /* TX_EN */
-                                        0  16 1  0  1  0   /* TX_ER */
-                                        0  1d 2  0  1  0   /* RX_DV */
-                                        0  1e 2  0  1  0   /* RX_ER */
-                                        0  1f 2  0  1  0   /* RX_CLK */
+                                        0  23 2  0  1  0   /* RxD0 */
+                                        0  24 2  0  1  0   /* RxD1 */
+                                        0  25 2  0  1  0   /* RxD2 */
+                                        0  26 2  0  1  0   /* RxD3 */
+                                        0  27 2  0  1  0   /* RxD4 */
+                                        1  12 2  0  2  0   /* RxD5 */
+                                        1  13 2  0  3  0   /* RxD6 */
+                                        1  11 2  0  2  0   /* RxD7 */
+                                        0  21 1  0  1  0   /* TX_EN */
+                                        0  22 1  0  1  0   /* TX_ER */
+                                        0  29 2  0  1  0   /* RX_DV */
+                                        0  30 2  0  1  0   /* RX_ER */
+                                        0  31 2  0  1  0   /* RX_CLK */
                                         2  2  1  0  2  0   /* GTX_CLK - CLK10 */
                                         2  3  2  0  1  0   /* GTX125 - CLK4 */
                                         0  1  3  0  2  0   /* MDIO */
@@ -197,181 +209,174 @@
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "qe";
-                model = "QE";
-                ranges = <0 e0100000 00100000>;
-                reg = <e0100000 480>;
+                compatible = "fsl,qe";
+                ranges = <0x0 0xe0100000 0x00100000>;
+                reg = <0xe0100000 0x480>;
                 brg-frequency = <0>;
-                bus-frequency = <179A7B00>;
+                bus-frequency = <396000000>;
 
                 muram@10000 {
-                        device_type = "muram";
-                        ranges = <0 00010000 0000c000>;
-
-                        data-only@0{
-                                reg = <0 c000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
+                        ranges = <0x0 0x00010000 0x0000c000>;
+
+                        data-only@0 {
+                                compatible = "fsl,qe-muram-data",
+                                             "fsl,cpm-muram-data";
+                                reg = <0x0 0xc000>;
                         };
                 };
 
                 spi@4c0 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
-                        reg = <4c0 40>;
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
+                        reg = <0x4c0 0x40>;
                         interrupts = <2>;
-                        interrupt-parent = < &qeic >;
+                        interrupt-parent = <&qeic>;
                         mode = "cpu";
                 };
 
                 spi@500 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
-                        reg = <500 40>;
+                        cell-index = <1>;
+                        compatible = "fsl,spi";
+                        reg = <0x500 0x40>;
                         interrupts = <1>;
-                        interrupt-parent = < &qeic >;
+                        interrupt-parent = <&qeic>;
                         mode = "cpu";
                 };
 
                 usb@6c0 {
-                        device_type = "usb";
                         compatible = "qe_udc";
-                        reg = <6c0 40 8B00 100>;
-                        interrupts = <b>;
-                        interrupt-parent = < &qeic >;
+                        reg = <0x6c0 0x40 0x8b00 0x100>;
+                        interrupts = <11>;
+                        interrupt-parent = <&qeic>;
                         mode = "slave";
                 };
 
-                ucc@2000 {
+                enet0: ucc@2000 {
                         device_type = "network";
                         compatible = "ucc_geth";
                         model = "UCC";
+                        cell-index = <1>;
                         device-id = <1>;
-                        reg = <2000 200>;
-                        interrupts = <20>;
-                        interrupt-parent = < &qeic >;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
+                        reg = <0x2000 0x200>;
+                        interrupts = <32>;
+                        interrupt-parent = <&qeic>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <0>;
-                        tx-clock = <19>;
-                        phy-handle = < &phy0 >;
+                        rx-clock-name = "none";
+                        tx-clock-name = "clk9";
+                        phy-handle = <&phy0>;
                         phy-connection-type = "rgmii-id";
-                        pio-handle = < &pio1 >;
+                        pio-handle = <&pio1>;
                 };
 
-                ucc@3000 {
+                enet1: ucc@3000 {
                         device_type = "network";
                         compatible = "ucc_geth";
                         model = "UCC";
+                        cell-index = <2>;
                         device-id = <2>;
-                        reg = <3000 200>;
-                        interrupts = <21>;
-                        interrupt-parent = < &qeic >;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
+                        reg = <0x3000 0x200>;
+                        interrupts = <33>;
+                        interrupt-parent = <&qeic>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <0>;
-                        tx-clock = <14>;
-                        phy-handle = < &phy1 >;
+                        rx-clock-name = "none";
+                        tx-clock-name = "clk4";
+                        phy-handle = <&phy1>;
                         phy-connection-type = "rgmii-id";
-                        pio-handle = < &pio2 >;
+                        pio-handle = <&pio2>;
                 };
 
                 mdio@2120 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        reg = <2120 18>;
-                        device_type = "mdio";
-                        compatible = "ucc_geth_phy";
+                        reg = <0x2120 0x18>;
+                        compatible = "fsl,ucc-mdio";
 
                         phy0: ethernet-phy@00 {
-                                interrupt-parent = < &ipic >;
-                                interrupts = <11 8>;
-                                reg = <0>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <17 0x8>;
+                                reg = <0x0>;
                                 device_type = "ethernet-phy";
                         };
                         phy1: ethernet-phy@01 {
-                                interrupt-parent = < &ipic >;
-                                interrupts = <12 8>;
-                                reg = <1>;
+                                interrupt-parent = <&ipic>;
+                                interrupts = <18 0x8>;
+                                reg = <0x1>;
                                 device_type = "ethernet-phy";
                         };
                 };
 
-                qeic: qeic@80 {
+                qeic: interrupt-controller@80 {
                         interrupt-controller;
-                        device_type = "qeic";
+                        compatible = "fsl,qe-ic";
                         #address-cells = <0>;
                         #interrupt-cells = <1>;
-                        reg = <80 80>;
+                        reg = <0x80 0x80>;
                         big-endian;
-                        interrupts = <20 8 21 8>; //high:32 low:33
-                        interrupt-parent = < &ipic >;
+                        interrupts = <32 0x8 33 0x8>; // high:32 low:33
+                        interrupt-parent = <&ipic>;
                 };
         };
 
-        pci@e0008500 {
-                interrupt-map-mask = <f800 0 0 7>;
+        pci0: pci@e0008500 {
+                cell-index = <1>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
                 interrupt-map = <
 
                                 /* IDSEL 0x11 AD17 */
-                                 8800 0 0 1 &ipic 14 8
-                                 8800 0 0 2 &ipic 15 8
-                                 8800 0 0 3 &ipic 16 8
-                                 8800 0 0 4 &ipic 17 8
+                                 0x8800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0x8800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0x8800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0x8800 0x0 0x0 0x4 &ipic 23 0x8
 
                                 /* IDSEL 0x12 AD18 */
-                                 9000 0 0 1 &ipic 16 8
-                                 9000 0 0 2 &ipic 17 8
-                                 9000 0 0 3 &ipic 14 8
-                                 9000 0 0 4 &ipic 15 8
+                                 0x9000 0x0 0x0 0x1 &ipic 22 0x8
+                                 0x9000 0x0 0x0 0x2 &ipic 23 0x8
+                                 0x9000 0x0 0x0 0x3 &ipic 20 0x8
+                                 0x9000 0x0 0x0 0x4 &ipic 21 0x8
 
                                 /* IDSEL 0x13 AD19 */
-                                 9800 0 0 1 &ipic 17 8
-                                 9800 0 0 2 &ipic 14 8
-                                 9800 0 0 3 &ipic 15 8
-                                 9800 0 0 4 &ipic 16 8
+                                 0x9800 0x0 0x0 0x1 &ipic 23 0x8
+                                 0x9800 0x0 0x0 0x2 &ipic 20 0x8
+                                 0x9800 0x0 0x0 0x3 &ipic 21 0x8
+                                 0x9800 0x0 0x0 0x4 &ipic 22 0x8
 
                                 /* IDSEL 0x15 AD21*/
-                                 a800 0 0 1 &ipic 14 8
-                                 a800 0 0 2 &ipic 15 8
-                                 a800 0 0 3 &ipic 16 8
-                                 a800 0 0 4 &ipic 17 8
+                                 0xa800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0xa800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0xa800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0xa800 0x0 0x0 0x4 &ipic 23 0x8
 
                                 /* IDSEL 0x16 AD22*/
-                                 b000 0 0 1 &ipic 17 8
-                                 b000 0 0 2 &ipic 14 8
-                                 b000 0 0 3 &ipic 15 8
-                                 b000 0 0 4 &ipic 16 8
+                                 0xb000 0x0 0x0 0x1 &ipic 23 0x8
+                                 0xb000 0x0 0x0 0x2 &ipic 20 0x8
+                                 0xb000 0x0 0x0 0x3 &ipic 21 0x8
+                                 0xb000 0x0 0x0 0x4 &ipic 22 0x8
 
                                 /* IDSEL 0x17 AD23*/
-                                 b800 0 0 1 &ipic 16 8
-                                 b800 0 0 2 &ipic 17 8
-                                 b800 0 0 3 &ipic 14 8
-                                 b800 0 0 4 &ipic 15 8
+                                 0xb800 0x0 0x0 0x1 &ipic 22 0x8
+                                 0xb800 0x0 0x0 0x2 &ipic 23 0x8
+                                 0xb800 0x0 0x0 0x3 &ipic 20 0x8
+                                 0xb800 0x0 0x0 0x4 &ipic 21 0x8
 
                                 /* IDSEL 0x18 AD24*/
-                                 c000 0 0 1 &ipic 15 8
-                                 c000 0 0 2 &ipic 16 8
-                                 c000 0 0 3 &ipic 17 8
-                                 c000 0 0 4 &ipic 14 8>;
-                interrupt-parent = < &ipic >;
-                interrupts = <42 8>;
+                                 0xc000 0x0 0x0 0x1 &ipic 21 0x8
+                                 0xc000 0x0 0x0 0x2 &ipic 22 0x8
+                                 0xc000 0x0 0x0 0x3 &ipic 23 0x8
+                                 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
                 bus-range = <0 0>;
-                ranges = <02000000 0 a0000000 a0000000 0 10000000
-                          42000000 0 80000000 80000000 0 10000000
-                          01000000 0 00000000 e2000000 0 00100000>;
-                clock-frequency = <3f940aa>;
+                ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
+                          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
+                clock-frequency = <66666666>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <e0008500 100>;
+                reg = <0xe0008500 0x100>;
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
new file mode 100644
index 000000000000..a3637fff73cc
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -0,0 +1,280 @@
+/*
+ * MPC8377E MDS Device Tree Source
+ *
+ * Copyright 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 as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "fsl,mpc8377emds";
+        compatible = "fsl,mpc8377emds","fsl,mpc837xmds";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8377@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>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x20000000>;  // 512MB at 0
+        };
+
+        soc@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x00000200>;
+                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 0x8>;
+                        interrupt-parent = <&ipic>;
+                        dfsrr;
+                };
+
+                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";
+                };
+
+                /* 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>;
+                        phy_type = "utmi_wide";
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+                        phy2: ethernet-phy@2 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <17 0x8>;
+                                reg = <0x2>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy3: ethernet-phy@3 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <18 0x8>;
+                                reg = <0x3>;
+                                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 = <32 0x8 33 0x8 34 0x8>;
+                        phy-connection-type = "mii";
+                        interrupt-parent = <&ipic>;
+                        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 0x8 36 0x8 37 0x8>;
+                        phy-connection-type = "mii";
+                        interrupt-parent = <&ipic>;
+                        phy-handle = <&phy3>;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <10 0x8>;
+                        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";
+                        reg = <0x18000 0x1000>;
+                        interrupts = <44 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                sata@19000 {
+                        compatible = "fsl,mpc8379-sata";
+                        reg = <0x19000 0x1000>;
+                        interrupts = <45 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                /* 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 {
+                        compatible = "fsl,ipic";
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x700 0x100>;
+                };
+        };
+
+        pci0: pci@e0008500 {
+                cell-index = <0>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+
+                                /* IDSEL 0x11 */
+                                 0x8800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0x8800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0x8800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0x8800 0x0 0x0 0x4 &ipic 23 0x8
+
+                                /* IDSEL 0x12 */
+                                 0x9000 0x0 0x0 0x1 &ipic 22 0x8
+                                 0x9000 0x0 0x0 0x2 &ipic 23 0x8
+                                 0x9000 0x0 0x0 0x3 &ipic 20 0x8
+                                 0x9000 0x0 0x0 0x4 &ipic 21 0x8
+
+                                /* IDSEL 0x13 */
+                                 0x9800 0x0 0x0 0x1 &ipic 23 0x8
+                                 0x9800 0x0 0x0 0x2 &ipic 20 0x8
+                                 0x9800 0x0 0x0 0x3 &ipic 21 0x8
+                                 0x9800 0x0 0x0 0x4 &ipic 22 0x8
+
+                                /* IDSEL 0x15 */
+                                 0xa800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0xa800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0xa800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0xa800 0x0 0x0 0x4 &ipic 23 0x8
+
+                                /* IDSEL 0x16 */
+                                 0xb000 0x0 0x0 0x1 &ipic 23 0x8
+                                 0xb000 0x0 0x0 0x2 &ipic 20 0x8
+                                 0xb000 0x0 0x0 0x3 &ipic 21 0x8
+                                 0xb000 0x0 0x0 0x4 &ipic 22 0x8
+
+                                /* IDSEL 0x17 */
+                                 0xb800 0x0 0x0 0x1 &ipic 22 0x8
+                                 0xb800 0x0 0x0 0x2 &ipic 23 0x8
+                                 0xb800 0x0 0x0 0x3 &ipic 20 0x8
+                                 0xb800 0x0 0x0 0x4 &ipic 21 0x8
+
+                                /* IDSEL 0x18 */
+                                 0xc000 0x0 0x0 0x1 &ipic 21 0x8
+                                 0xc000 0x0 0x0 0x2 &ipic 22 0x8
+                                 0xc000 0x0 0x0 0x3 &ipic 23 0x8
+                                 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
+                bus-range = <0x0 0x0>;
+                ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>;
+                clock-frequency = <0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe0008500 0x100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc8377_rdb.dts b/arch/powerpc/boot/dts/mpc8377_rdb.dts
new file mode 100644
index 000000000000..440aa4dfab0c
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts
@@ -0,0 +1,296 @@
+/*
+ * MPC8377E RDB Device Tree Source
+ *
+ * Copyright 2007, 2008 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        compatible = "fsl,mpc8377rdb";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8377@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>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;  // 256MB at 0
+        };
+
+        localbus@e0005000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8377-elbc", "fsl,elbc", "simple-bus";
+                reg = <0xe0005000 0x1000>;
+                interrupts = <77 0x8>;
+                interrupt-parent = <&ipic>;
+
+                // CS0 and CS1 are swapped when
+                // booting from nand, but the
+                // addresses are the same.
+                ranges = <0x0 0x0 0xfe000000 0x00800000
+                          0x1 0x0 0xe0600000 0x00008000
+                          0x2 0x0 0xf0000000 0x00020000
+                          0x3 0x0 0xfa000000 0x00008000>;
+
+                flash@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x800000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+
+                nand@1,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8377-fcm-nand",
+                                     "fsl,elbc-fcm-nand";
+                        reg = <0x1 0x0 0x8000>;
+
+                        u-boot@0 {
+                                reg = <0x0 0x100000>;
+                                read-only;
+                        };
+
+                        kernel@100000 {
+                                reg = <0x100000 0x300000>;
+                        };
+                        fs@400000 {
+                                reg = <0x400000 0x1c00000>;
+                        };
+                };
+        };
+
+        immr@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "simple-bus";
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 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 {
+                                device_type = "rtc";
+                                compatible = "dallas,ds1339";
+                                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";
+                };
+
+                /* 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>;
+                        phy_type = "utmi";
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+                        phy2: ethernet-phy@2 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <17 0x8>;
+                                reg = <0x2>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy3: ethernet-phy@3 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <18 0x8>;
+                                reg = <0x3>;
+                                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 = <32 0x8 33 0x8 34 0x8>;
+                        phy-connection-type = "mii";
+                        interrupt-parent = <&ipic>;
+                        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 0x8 36 0x8 37 0x8>;
+                        phy-connection-type = "mii";
+                        interrupt-parent = <&ipic>;
+                        phy-handle = <&phy3>;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                crypto@30000 {
+                        model = "SEC3";
+                        device_type = "crypto";
+                        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>;
+                };
+
+                sata@18000 {
+                        compatible = "fsl,mpc8377-sata", "fsl,pq-sata";
+                        reg = <0x18000 0x1000>;
+                        interrupts = <44 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                sata@19000 {
+                        compatible = "fsl,mpc8377-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:
+                 * sense == 8: Level, low assertion
+                 * sense == 2: Edge, high-to-low change
+                 */
+                ipic: interrupt-controller@700 {
+                        compatible = "fsl,ipic";
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x700 0x100>;
+                };
+        };
+
+        pci0: pci@e0008500 {
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                                /* IRQ5 = 21 = 0x15, IRQ6 = 0x16, IRQ7 = 23 = 0x17 */
+
+                                /* IDSEL AD14 IRQ6 inta */
+                                 0x7000 0x0 0x0 0x1 &ipic 22 0x8
+
+                                /* IDSEL AD15 IRQ5 inta, IRQ6 intb, IRQ7 intd */
+                                 0x7800 0x0 0x0 0x1 &ipic 21 0x8
+                                 0x7800 0x0 0x0 0x2 &ipic 22 0x8
+                                 0x7800 0x0 0x0 0x4 &ipic 23 0x8
+
+                                /* IDSEL AD28 IRQ7 inta, IRQ5 intb IRQ6 intc*/
+                                 0xE000 0x0 0x0 0x1 &ipic 23 0x8
+                                 0xE000 0x0 0x0 0x2 &ipic 21 0x8
+                                 0xE000 0x0 0x0 0x3 &ipic 22 0x8>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
+                bus-range = <0 0>;
+                ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
+                clock-frequency = <66666666>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe0008500 0x100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc8378_mds.dts b/arch/powerpc/boot/dts/mpc8378_mds.dts
new file mode 100644
index 000000000000..533e9b06cc8f
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8378_mds.dts
@@ -0,0 +1,266 @@
+/*
+ * MPC8378E MDS Device Tree Source
+ *
+ * Copyright 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 as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "fsl,mpc8378emds";
+        compatible = "fsl,mpc8378emds","fsl,mpc837xmds";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8378@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>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x20000000>;  // 512MB at 0
+        };
+
+        soc@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x00000200>;
+                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 0x8>;
+                        interrupt-parent = <&ipic>;
+                        dfsrr;
+                };
+
+                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";
+                };
+
+                /* 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>;
+                        phy_type = "utmi_wide";
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+                        phy2: ethernet-phy@2 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <17 0x8>;
+                                reg = <0x2>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy3: ethernet-phy@3 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <18 0x8>;
+                                reg = <0x3>;
+                                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 = <32 0x8 33 0x8 34 0x8>;
+                        phy-connection-type = "mii";
+                        interrupt-parent = <&ipic>;
+                        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 0x8 36 0x8 37 0x8>;
+                        phy-connection-type = "mii";
+                        interrupt-parent = <&ipic>;
+                        phy-handle = <&phy3>;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <10 0x8>;
+                        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>;
+                };
+
+                /* 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 {
+                        compatible = "fsl,ipic";
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x700 0x100>;
+                };
+        };
+
+        pci0: pci@e0008500 {
+                cell-index = <0>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+
+                                /* IDSEL 0x11 */
+                                 0x8800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0x8800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0x8800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0x8800 0x0 0x0 0x4 &ipic 23 0x8
+
+                                /* IDSEL 0x12 */
+                                 0x9000 0x0 0x0 0x1 &ipic 22 0x8
+                                 0x9000 0x0 0x0 0x2 &ipic 23 0x8
+                                 0x9000 0x0 0x0 0x3 &ipic 20 0x8
+                                 0x9000 0x0 0x0 0x4 &ipic 21 0x8
+
+                                /* IDSEL 0x13 */
+                                 0x9800 0x0 0x0 0x1 &ipic 23 0x8
+                                 0x9800 0x0 0x0 0x2 &ipic 20 0x8
+                                 0x9800 0x0 0x0 0x3 &ipic 21 0x8
+                                 0x9800 0x0 0x0 0x4 &ipic 22 0x8
+
+                                /* IDSEL 0x15 */
+                                 0xa800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0xa800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0xa800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0xa800 0x0 0x0 0x4 &ipic 23 0x8
+
+                                /* IDSEL 0x16 */
+                                 0xb000 0x0 0x0 0x1 &ipic 23 0x8
+                                 0xb000 0x0 0x0 0x2 &ipic 20 0x8
+                                 0xb000 0x0 0x0 0x3 &ipic 21 0x8
+                                 0xb000 0x0 0x0 0x4 &ipic 22 0x8
+
+                                /* IDSEL 0x17 */
+                                 0xb800 0x0 0x0 0x1 &ipic 22 0x8
+                                 0xb800 0x0 0x0 0x2 &ipic 23 0x8
+                                 0xb800 0x0 0x0 0x3 &ipic 20 0x8
+                                 0xb800 0x0 0x0 0x4 &ipic 21 0x8
+
+                                /* IDSEL 0x18 */
+                                 0xc000 0x0 0x0 0x1 &ipic 21 0x8
+                                 0xc000 0x0 0x0 0x2 &ipic 22 0x8
+                                 0xc000 0x0 0x0 0x3 &ipic 23 0x8
+                                 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
+                bus-range = <0x0 0x0>;
+                ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>;
+                clock-frequency = <0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe0008500 0x100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc8378_rdb.dts b/arch/powerpc/boot/dts/mpc8378_rdb.dts
new file mode 100644
index 000000000000..92711534b179
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -0,0 +1,282 @@
+/*
+ * MPC8378E RDB Device Tree Source
+ *
+ * Copyright 2007, 2008 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        compatible = "fsl,mpc8378rdb";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8378@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>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;  // 256MB at 0
+        };
+
+        localbus@e0005000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8378-elbc", "fsl,elbc", "simple-bus";
+                reg = <0xe0005000 0x1000>;
+                interrupts = <77 0x8>;
+                interrupt-parent = <&ipic>;
+
+                // CS0 and CS1 are swapped when
+                // booting from nand, but the
+                // addresses are the same.
+                ranges = <0x0 0x0 0xfe000000 0x00800000
+                          0x1 0x0 0xe0600000 0x00008000
+                          0x2 0x0 0xf0000000 0x00020000
+                          0x3 0x0 0xfa000000 0x00008000>;
+
+                flash@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x800000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+
+                nand@1,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8378-fcm-nand",
+                                     "fsl,elbc-fcm-nand";
+                        reg = <0x1 0x0 0x8000>;
+
+                        u-boot@0 {
+                                reg = <0x0 0x100000>;
+                                read-only;
+                        };
+
+                        kernel@100000 {
+                                reg = <0x100000 0x300000>;
+                        };
+                        fs@400000 {
+                                reg = <0x400000 0x1c00000>;
+                        };
+                };
+        };
+
+        immr@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "simple-bus";
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 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 {
+                                device_type = "rtc";
+                                compatible = "dallas,ds1339";
+                                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";
+                };
+
+                /* 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>;
+                        phy_type = "utmi";
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+                        phy2: ethernet-phy@2 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <17 0x8>;
+                                reg = <0x2>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy3: ethernet-phy@3 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <18 0x8>;
+                                reg = <0x3>;
+                                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 = <32 0x8 33 0x8 34 0x8>;
+                        phy-connection-type = "mii";
+                        interrupt-parent = <&ipic>;
+                        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 0x8 36 0x8 37 0x8>;
+                        phy-connection-type = "mii";
+                        interrupt-parent = <&ipic>;
+                        phy-handle = <&phy3>;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                crypto@30000 {
+                        model = "SEC3";
+                        device_type = "crypto";
+                        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>;
+                };
+
+                /* 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: interrupt-controller@700 {
+                        compatible = "fsl,ipic";
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x700 0x100>;
+                };
+        };
+
+        pci0: pci@e0008500 {
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                                /* IRQ5 = 21 = 0x15, IRQ6 = 0x16, IRQ7 = 23 = 0x17 */
+
+                                /* IDSEL AD14 IRQ6 inta */
+                                 0x7000 0x0 0x0 0x1 &ipic 22 0x8
+
+                                /* IDSEL AD15 IRQ5 inta, IRQ6 intb, IRQ7 intd */
+                                 0x7800 0x0 0x0 0x1 &ipic 21 0x8
+                                 0x7800 0x0 0x0 0x2 &ipic 22 0x8
+                                 0x7800 0x0 0x0 0x4 &ipic 23 0x8
+
+                                /* IDSEL AD28 IRQ7 inta, IRQ5 intb IRQ6 intc*/
+                                 0xE000 0x0 0x0 0x1 &ipic 23 0x8
+                                 0xE000 0x0 0x0 0x2 &ipic 21 0x8
+                                 0xE000 0x0 0x0 0x3 &ipic 22 0x8>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
+                bus-range = <0 0>;
+                ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
+                clock-frequency = <66666666>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe0008500 0x100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc8379_mds.dts b/arch/powerpc/boot/dts/mpc8379_mds.dts
new file mode 100644
index 000000000000..c270685bbde4
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8379_mds.dts
@@ -0,0 +1,294 @@
+/*
+ * MPC8379E MDS Device Tree Source
+ *
+ * Copyright 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 as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "fsl,mpc8379emds";
+        compatible = "fsl,mpc8379emds","fsl,mpc837xmds";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8379@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>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x20000000>;  // 512MB at 0
+        };
+
+        soc@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x00000200>;
+                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 0x8>;
+                        interrupt-parent = <&ipic>;
+                        dfsrr;
+                };
+
+                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";
+                };
+
+                /* 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>;
+                        phy_type = "utmi_wide";
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+                        phy2: ethernet-phy@2 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <17 0x8>;
+                                reg = <0x2>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy3: ethernet-phy@3 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <18 0x8>;
+                                reg = <0x3>;
+                                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 = <32 0x8 33 0x8 34 0x8>;
+                        phy-connection-type = "mii";
+                        interrupt-parent = <&ipic>;
+                        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 0x8 36 0x8 37 0x8>;
+                        phy-connection-type = "mii";
+                        interrupt-parent = <&ipic>;
+                        phy-handle = <&phy3>;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <10 0x8>;
+                        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";
+                        reg = <0x18000 0x1000>;
+                        interrupts = <44 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                sata@19000 {
+                        compatible = "fsl,mpc8379-sata";
+                        reg = <0x19000 0x1000>;
+                        interrupts = <45 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                sata@1a000 {
+                        compatible = "fsl,mpc8379-sata";
+                        reg = <0x1a000 0x1000>;
+                        interrupts = <46 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                sata@1b000 {
+                        compatible = "fsl,mpc8379-sata";
+                        reg = <0x1b000 0x1000>;
+                        interrupts = <47 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                /* 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 {
+                        compatible = "fsl,ipic";
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x700 0x100>;
+                };
+        };
+
+        pci0: pci@e0008500 {
+                cell-index = <0>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+
+                                /* IDSEL 0x11 */
+                                 0x8800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0x8800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0x8800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0x8800 0x0 0x0 0x4 &ipic 23 0x8
+
+                                /* IDSEL 0x12 */
+                                 0x9000 0x0 0x0 0x1 &ipic 22 0x8
+                                 0x9000 0x0 0x0 0x2 &ipic 23 0x8
+                                 0x9000 0x0 0x0 0x3 &ipic 20 0x8
+                                 0x9000 0x0 0x0 0x4 &ipic 21 0x8
+
+                                /* IDSEL 0x13 */
+                                 0x9800 0x0 0x0 0x1 &ipic 23 0x8
+                                 0x9800 0x0 0x0 0x2 &ipic 20 0x8
+                                 0x9800 0x0 0x0 0x3 &ipic 21 0x8
+                                 0x9800 0x0 0x0 0x4 &ipic 22 0x8
+
+                                /* IDSEL 0x15 */
+                                 0xa800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0xa800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0xa800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0xa800 0x0 0x0 0x4 &ipic 23 0x8
+
+                                /* IDSEL 0x16 */
+                                 0xb000 0x0 0x0 0x1 &ipic 23 0x8
+                                 0xb000 0x0 0x0 0x2 &ipic 20 0x8
+                                 0xb000 0x0 0x0 0x3 &ipic 21 0x8
+                                 0xb000 0x0 0x0 0x4 &ipic 22 0x8
+
+                                /* IDSEL 0x17 */
+                                 0xb800 0x0 0x0 0x1 &ipic 22 0x8
+                                 0xb800 0x0 0x0 0x2 &ipic 23 0x8
+                                 0xb800 0x0 0x0 0x3 &ipic 20 0x8
+                                 0xb800 0x0 0x0 0x4 &ipic 21 0x8
+
+                                /* IDSEL 0x18 */
+                                 0xc000 0x0 0x0 0x1 &ipic 21 0x8
+                                 0xc000 0x0 0x0 0x2 &ipic 22 0x8
+                                 0xc000 0x0 0x0 0x3 &ipic 23 0x8
+                                 0xc000 0x0 0x0 0x4 &ipic 20 0x8>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
+                bus-range = <0x0 0x0>;
+                ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe0300000 0x0 0x00100000>;
+                clock-frequency = <0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe0008500 0x100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc8379_rdb.dts b/arch/powerpc/boot/dts/mpc8379_rdb.dts
new file mode 100644
index 000000000000..0dda2fc558f8
--- /dev/null
+++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
@@ -0,0 +1,310 @@
+/*
+ * MPC8379E RDB Device Tree Source
+ *
+ * Copyright 2007, 2008 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        compatible = "fsl,mpc8379rdb";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8379@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>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;  // 256MB at 0
+        };
+
+        localbus@e0005000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8379-elbc", "fsl,elbc", "simple-bus";
+                reg = <0xe0005000 0x1000>;
+                interrupts = <77 0x8>;
+                interrupt-parent = <&ipic>;
+
+                // CS0 and CS1 are swapped when
+                // booting from nand, but the
+                // addresses are the same.
+                ranges = <0x0 0x0 0xfe000000 0x00800000
+                          0x1 0x0 0xe0600000 0x00008000
+                          0x2 0x0 0xf0000000 0x00020000
+                          0x3 0x0 0xfa000000 0x00008000>;
+
+                flash@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x800000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+
+                nand@1,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8379-fcm-nand",
+                                     "fsl,elbc-fcm-nand";
+                        reg = <0x1 0x0 0x8000>;
+
+                        u-boot@0 {
+                                reg = <0x0 0x100000>;
+                                read-only;
+                        };
+
+                        kernel@100000 {
+                                reg = <0x100000 0x300000>;
+                        };
+                        fs@400000 {
+                                reg = <0x400000 0x1c00000>;
+                        };
+                };
+        };
+
+        immr@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "simple-bus";
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 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 {
+                                device_type = "rtc";
+                                compatible = "dallas,ds1339";
+                                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";
+                };
+
+                /* 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>;
+                        phy_type = "utmi";
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+                        phy2: ethernet-phy@2 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <17 0x8>;
+                                reg = <0x2>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy3: ethernet-phy@3 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <18 0x8>;
+                                reg = <0x3>;
+                                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 = <32 0x8 33 0x8 34 0x8>;
+                        phy-connection-type = "mii";
+                        interrupt-parent = <&ipic>;
+                        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 0x8 36 0x8 37 0x8>;
+                        phy-connection-type = "mii";
+                        interrupt-parent = <&ipic>;
+                        phy-handle = <&phy3>;
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                crypto@30000 {
+                        model = "SEC3";
+                        device_type = "crypto";
+                        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>;
+                };
+
+                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>;
+                };
+
+                sata@1a000 {
+                        compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
+                        reg = <0x1a000 0x1000>;
+                        interrupts = <46 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                sata@1b000 {
+                        compatible = "fsl,mpc8379-sata", "fsl,pq-sata";
+                        reg = <0x1b000 0x1000>;
+                        interrupts = <47 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                /* 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: interrupt-controller@700 {
+                        compatible = "fsl,ipic";
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x700 0x100>;
+                };
+        };
+
+        pci0: pci@e0008500 {
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                                /* IRQ5 = 21 = 0x15, IRQ6 = 0x16, IRQ7 = 23 = 0x17 */
+
+                                /* IDSEL AD14 IRQ6 inta */
+                                 0x7000 0x0 0x0 0x1 &ipic 22 0x8
+
+                                /* IDSEL AD15 IRQ5 inta, IRQ6 intb, IRQ7 intd */
+                                 0x7800 0x0 0x0 0x1 &ipic 21 0x8
+                                 0x7800 0x0 0x0 0x2 &ipic 22 0x8
+                                 0x7800 0x0 0x0 0x4 &ipic 23 0x8
+
+                                /* IDSEL AD28 IRQ7 inta, IRQ5 intb IRQ6 intc*/
+                                 0xE000 0x0 0x0 0x1 &ipic 23 0x8
+                                 0xE000 0x0 0x0 0x2 &ipic 21 0x8
+                                 0xE000 0x0 0x0 0x3 &ipic 22 0x8>;
+                interrupt-parent = <&ipic>;
+                interrupts = <66 0x8>;
+                bus-range = <0x0 0x0>;
+                ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
+                clock-frequency = <66666666>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe0008500 0x100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc8540ads.dts b/arch/powerpc/boot/dts/mpc8540ads.dts
index 6442a717ec3b..975248491b7b 100644
--- a/arch/powerpc/boot/dts/mpc8540ads.dts
+++ b/arch/powerpc/boot/dts/mpc8540ads.dts
@@ -16,6 +16,15 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -63,7 +72,9 @@
                 };
 
                 i2c@3000 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
                         reg = <3000 100>;
                         interrupts = <2b 2>;
@@ -74,9 +85,9 @@
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "mdio";
-                        compatible = "gianfar";
+                        compatible = "fsl,gianfar-mdio";
                         reg = <24520 20>;
+
                         phy0: ethernet-phy@0 {
                                 interrupt-parent = <&mpic>;
                                 interrupts = <5 1>;
@@ -97,64 +108,44 @@
                         };
                 };
 
-                ethernet@24000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <24000 1000>;
-                        /*
-                         * address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <1d 2 1e 2 22 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy0>;
                 };
 
-                ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <25000 1000>;
-                        /*
-                         * address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <23 2 24 2 28 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy1>;
                 };
 
-                ethernet@26000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet2: ethernet@26000 {
+                        cell-index = <2>;
                         device_type = "network";
                         model = "FEC";
                         compatible = "gianfar";
                         reg = <26000 1000>;
-                        /*
-                         * address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <29 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy3>;
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4500 100>;       // reg base, size
@@ -163,7 +154,8 @@
                         interrupt-parent = <&mpic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4600 100>;       // reg base, size
@@ -183,7 +175,8 @@
                 };
         };
 
-        pci@e0008000 {
+        pci0: pci@e0008000 {
+                cell-index = <0>;
                 interrupt-map-mask = <f800 0 0 7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc8541cds.dts b/arch/powerpc/boot/dts/mpc8541cds.dts
index f3f4d79deb63..fa8d9aaad157 100644
--- a/arch/powerpc/boot/dts/mpc8541cds.dts
+++ b/arch/powerpc/boot/dts/mpc8541cds.dts
@@ -16,6 +16,15 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -63,7 +72,9 @@
                 };
 
                 i2c@3000 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
                         reg = <3000 100>;
                         interrupts = <2b 2>;
@@ -74,9 +85,9 @@
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "mdio";
-                        compatible = "gianfar";
+                        compatible = "fsl,gianfar-mdio";
                         reg = <24520 20>;
+
                         phy0: ethernet-phy@0 {
                                 interrupt-parent = <&mpic>;
                                 interrupts = <5 1>;
@@ -91,9 +102,8 @@
                         };
                 };
 
-                ethernet@24000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
@@ -104,9 +114,8 @@
                         phy-handle = <&phy0>;
                 };
 
-                ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
@@ -117,7 +126,8 @@
                         phy-handle = <&phy1>;
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4500 100>;       // reg base, size
@@ -126,7 +136,8 @@
                         interrupt-parent = <&mpic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4600 100>;       // reg base, size
@@ -183,7 +194,8 @@
                 };
         };
 
-        pci1: pci@e0008000 {
+        pci0: pci@e0008000 {
+                cell-index = <0>;
                 interrupt-map-mask = <1f800 0 0 7>;
                 interrupt-map = <
 
@@ -250,11 +262,12 @@
                         #interrupt-cells = <2>;
                         compatible = "chrp,iic";
                         interrupts = <1>;
-                        interrupt-parent = <&pci1>;
+                        interrupt-parent = <&pci0>;
                 };
         };
 
-        pci@e0009000 {
+        pci1: pci@e0009000 {
+                cell-index = <1>;
                 interrupt-map-mask = <f800 0 0 7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc8544ds.dts b/arch/powerpc/boot/dts/mpc8544ds.dts
index 6c608de1fc1b..688af9d06382 100644
--- a/arch/powerpc/boot/dts/mpc8544ds.dts
+++ b/arch/powerpc/boot/dts/mpc8544ds.dts
@@ -15,6 +15,17 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+                pci2 = &pci2;
+                pci3 = &pci3;
+        };
+
         cpus {
                 #cpus = <1>;
                 #address-cells = <1>;
@@ -64,7 +75,9 @@
                 };
 
                 i2c@3000 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
                         reg = <3000 100>;
                         interrupts = <2b 2>;
@@ -72,12 +85,23 @@
                         dfsrr;
                 };
 
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <3100 100>;
+                        interrupts = <2b 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "mdio";
-                        compatible = "gianfar";
+                        compatible = "fsl,gianfar-mdio";
                         reg = <24520 20>;
+
                         phy0: ethernet-phy@0 {
                                 interrupt-parent = <&mpic>;
                                 interrupts = <a 1>;
@@ -92,9 +116,8 @@
                         };
                 };
 
-                ethernet@24000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
@@ -106,9 +129,8 @@
                         phy-connection-type = "rgmii-id";
                 };
 
-                ethernet@26000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet1: ethernet@26000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
@@ -120,7 +142,8 @@
                         phy-connection-type = "rgmii-id";
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4500 100>;
@@ -129,7 +152,8 @@
                         interrupt-parent = <&mpic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4600 100>;
@@ -156,7 +180,8 @@
                 };
         };
 
-        pci@e0008000 {
+        pci0: pci@e0008000 {
+                cell-index = <0>;
                 compatible = "fsl,mpc8540-pci";
                 device_type = "pci";
                 interrupt-map-mask = <f800 0 0 7>;
@@ -187,7 +212,8 @@
                 reg = <e0008000 1000>;
         };
 
-        pcie@e0009000 {
+        pci1: pcie@e0009000 {
+                cell-index = <1>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -223,7 +249,8 @@
                 };
         };
 
-        pcie@e000a000 {
+        pci2: pcie@e000a000 {
+                cell-index = <2>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -259,7 +286,8 @@
                 };
         };
 
-        pcie@e000b000 {
+        pci3: pcie@e000b000 {
+                cell-index = <3>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -276,9 +304,9 @@
                 interrupt-map = <
                         // IDSEL 0x1c  USB
                         e000 0 0 1 &i8259 c 2
-                        e100 0 0 1 &i8259 9 2
-                        e200 0 0 1 &i8259 a 2
-                        e300 0 0 1 &i8259 b 2
+                        e100 0 0 2 &i8259 9 2
+                        e200 0 0 3 &i8259 a 2
+                        e300 0 0 4 &i8259 b 2
 
                         // IDSEL 0x1d  Audio
                         e800 0 0 1 &i8259 6 2
@@ -369,6 +397,5 @@
                                 };
                         };
                 };
-
         };
 };
diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts
index 69ca5025d972..1f470c6a1c63 100644
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -16,6 +16,20 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+/*
+                ethernet2 = &enet2;
+                ethernet3 = &enet3;
+*/
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+                pci2 = &pci2;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -63,7 +77,9 @@
                 };
 
                 i2c@3000 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
                         reg = <3000 100>;
                         interrupts = <2b 2>;
@@ -71,12 +87,23 @@
                         dfsrr;
                 };
 
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <3100 100>;
+                        interrupts = <2b 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "mdio";
-                        compatible = "gianfar";
+                        compatible = "fsl,gianfar-mdio";
                         reg = <24520 20>;
+
                         phy0: ethernet-phy@0 {
                                 interrupt-parent = <&mpic>;
                                 interrupts = <5 1>;
@@ -103,9 +130,8 @@
                         };
                 };
 
-                ethernet@24000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
@@ -116,9 +142,8 @@
                         phy-handle = <&phy0>;
                 };
 
-                ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
@@ -130,9 +155,8 @@
                 };
 
 /* eTSEC 3/4 are currently broken
-                ethernet@26000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet2: ethernet@26000 {
+                        cell-index = <2>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
@@ -143,9 +167,8 @@
                         phy-handle = <&phy2>;
                 };
 
-                ethernet@27000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet3: ethernet@27000 {
+                        cell-index = <3>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
@@ -157,7 +180,8 @@
                 };
  */
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4500 100>;       // reg base, size
@@ -166,7 +190,8 @@
                         interrupt-parent = <&mpic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4600 100>;       // reg base, size
@@ -193,7 +218,8 @@
                 };
         };
 
-        pci@e0008000 {
+        pci0: pci@e0008000 {
+                cell-index = <0>;
                 interrupt-map-mask = <f800 0 0 7>;
                 interrupt-map = <
                         /* IDSEL 0x4 (PCIX Slot 2) */
@@ -342,7 +368,8 @@
                 };
         };
 
-        pci@e0009000 {
+        pci1: pci@e0009000 {
+                cell-index = <1>;
                 interrupt-map-mask = <f800 0 0 7>;
                 interrupt-map = <
 
@@ -366,7 +393,8 @@
                 device_type = "pci";
         };
 
-        pcie@e000a000 {
+        pci2: pcie@e000a000 {
+                cell-index = <2>;
                 interrupt-map-mask = <f800 0 0 7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc8555cds.dts b/arch/powerpc/boot/dts/mpc8555cds.dts
index 57029cca32b2..4538f3c38862 100644
--- a/arch/powerpc/boot/dts/mpc8555cds.dts
+++ b/arch/powerpc/boot/dts/mpc8555cds.dts
@@ -16,6 +16,15 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -63,7 +72,9 @@
                 };
 
                 i2c@3000 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
                         reg = <3000 100>;
                         interrupts = <2b 2>;
@@ -74,9 +85,9 @@
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "mdio";
-                        compatible = "gianfar";
+                        compatible = "fsl,gianfar-mdio";
                         reg = <24520 20>;
+
                         phy0: ethernet-phy@0 {
                                 interrupt-parent = <&mpic>;
                                 interrupts = <5 1>;
@@ -91,9 +102,8 @@
                         };
                 };
 
-                ethernet@24000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
@@ -104,9 +114,8 @@
                         phy-handle = <&phy0>;
                 };
 
-                ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
@@ -117,7 +126,8 @@
                         phy-handle = <&phy1>;
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4500 100>;       // reg base, size
@@ -126,7 +136,8 @@
                         interrupt-parent = <&mpic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4600 100>;       // reg base, size
@@ -183,7 +194,8 @@
                 };
         };
 
-        pci1: pci@e0008000 {
+        pci0: pci@e0008000 {
+                cell-index = <0>;
                 interrupt-map-mask = <1f800 0 0 7>;
                 interrupt-map = <
 
@@ -250,11 +262,12 @@
                         #interrupt-cells = <2>;
                         compatible = "chrp,iic";
                         interrupts = <1>;
-                        interrupt-parent = <&pci1>;
+                        interrupt-parent = <&pci0>;
                 };
         };
 
-        pci@e0009000 {
+        pci1: pci@e0009000 {
+                cell-index = <1>;
                 interrupt-map-mask = <f800 0 0 7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc8560ads.dts b/arch/powerpc/boot/dts/mpc8560ads.dts
index 6b362f8222c1..639ce8a709a6 100644
--- a/arch/powerpc/boot/dts/mpc8560ads.dts
+++ b/arch/powerpc/boot/dts/mpc8560ads.dts
@@ -16,6 +16,16 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                ethernet3 = &enet3;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -63,11 +73,11 @@
                 };
 
                 mdio@24520 {
-                        device_type = "mdio";
-                        compatible = "gianfar";
-                        reg = <24520 20>;
                         #address-cells = <1>;
                         #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <24520 20>;
+
                         phy0: ethernet-phy@0 {
                                 interrupt-parent = <&mpic>;
                                 interrupts = <5 1>;
@@ -94,36 +104,24 @@
                         };
                 };
 
-                ethernet@24000 {
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <24000 1000>;
-                        /*
-                         * address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <1d 2 1e 2 22 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy0>;
                 };
 
-                ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
                         reg = <25000 1000>;
-                        /*
-                         * address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <23 2 24 2 28 2>;
                         interrupt-parent = <&mpic>;
@@ -174,7 +172,7 @@
                                 compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
                         };
 
-                        serial@91a00 {
+                        serial0: serial@91a00 {
                                 device_type = "serial";
                                 compatible = "fsl,mpc8560-scc-uart",
                                              "fsl,cpm2-scc-uart";
@@ -186,7 +184,7 @@
                                 interrupt-parent = <&cpmpic>;
                         };
 
-                        serial@91a20 {
+                        serial1: serial@91a20 {
                                 device_type = "serial";
                                 compatible = "fsl,mpc8560-scc-uart",
                                              "fsl,cpm2-scc-uart";
@@ -198,17 +196,11 @@
                                 interrupt-parent = <&cpmpic>;
                         };
 
-                        ethernet@91320 {
+                        enet2: ethernet@91320 {
                                 device_type = "network";
                                 compatible = "fsl,mpc8560-fcc-enet",
                                              "fsl,cpm2-fcc-enet";
                                 reg = <91320 20 88500 100 913b0 1>;
-                                /*
-                                 * mac-address is deprecated and will be removed
-                                 * in 2.6.25.  Only recent versions of
-                                 * U-Boot support local-mac-address, however.
-                                 */
-                                mac-address = [ 00 00 00 00 00 00 ];
                                 local-mac-address = [ 00 00 00 00 00 00 ];
                                 fsl,cpm-command = <16200300>;
                                 interrupts = <21 8>;
@@ -216,17 +208,11 @@
                                 phy-handle = <&phy2>;
                         };
 
-                        ethernet@91340 {
+                        enet3: ethernet@91340 {
                                 device_type = "network";
                                 compatible = "fsl,mpc8560-fcc-enet",
                                              "fsl,cpm2-fcc-enet";
                                 reg = <91340 20 88600 100 913d0 1>;
-                                /*
-                                 * mac-address is deprecated and will be removed
-                                 * in 2.6.25.  Only recent versions of
-                                 * U-Boot support local-mac-address, however.
-                                 */
-                                mac-address = [ 00 00 00 00 00 00 ];
                                 local-mac-address = [ 00 00 00 00 00 00 ];
                                 fsl,cpm-command = <1a400300>;
                                 interrupts = <22 8>;
@@ -236,7 +222,8 @@
                 };
         };
 
-        pci@e0008000 {
+        pci0: pci@e0008000 {
+                cell-index = <0>;
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index 54394372b12a..97bc048f2158 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -20,6 +20,17 @@
         #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>;
@@ -74,7 +85,7 @@
                 i2c@3000 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "i2c";
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
                         reg = <3000 100>;
                         interrupts = <2b 2>;
@@ -90,7 +101,7 @@
                 i2c@3100 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "i2c";
+                        cell-index = <1>;
                         compatible = "fsl-i2c";
                         reg = <3100 100>;
                         interrupts = <2b 2>;
@@ -101,9 +112,9 @@
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "mdio";
-                        compatible = "gianfar";
+                        compatible = "fsl,gianfar-mdio";
                         reg = <24520 20>;
+
                         phy0: ethernet-phy@7 {
                                 interrupt-parent = <&mpic>;
                                 interrupts = <1 1>;
@@ -130,45 +141,32 @@
                         };
                 };
 
-                ethernet@24000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
                         reg = <24000 1000>;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <1d 2 1e 2 22 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy2>;
                 };
 
-                ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
                         reg = <25000 1000>;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <23 2 24 2 28 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy3>;
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4500 100>;
@@ -183,7 +181,8 @@
                         fsl,has-rstcr;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4600 100>;
@@ -285,24 +284,28 @@
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "qe";
-                model = "QE";
+                compatible = "fsl,qe";
                 ranges = <0 e0080000 00040000>;
                 reg = <e0080000 480>;
                 brg-frequency = <0>;
                 bus-frequency = <179A7B00>;
 
                 muram@10000 {
-                        device_type = "muram";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,qe-muram", "fsl,cpm-muram";
                         ranges = <0 00010000 0000c000>;
 
-                        data-only@0{
+                        data-only@0 {
+                                compatible = "fsl,qe-muram-data",
+                                             "fsl,cpm-muram-data";
                                 reg = <0 c000>;
                         };
                 };
 
                 spi@4c0 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <0>;
+                        compatible = "fsl,spi";
                         reg = <4c0 40>;
                         interrupts = <2>;
                         interrupt-parent = <&qeic>;
@@ -310,53 +313,43 @@
                 };
 
                 spi@500 {
-                        device_type = "spi";
-                        compatible = "fsl_spi";
+                        cell-index = <1>;
+                        compatible = "fsl,spi";
                         reg = <500 40>;
                         interrupts = <1>;
                         interrupt-parent = <&qeic>;
                         mode = "cpu";
                 };
 
-                ucc@2000 {
+                enet2: ucc@2000 {
                         device_type = "network";
                         compatible = "ucc_geth";
                         model = "UCC";
+                        cell-index = <1>;
                         device-id = <1>;
                         reg = <2000 200>;
                         interrupts = <20>;
                         interrupt-parent = <&qeic>;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <0>;
-                        tx-clock = <20>;
+                        rx-clock-name = "none";
+                        tx-clock-name = "clk16";
                         pio-handle = <&pio1>;
                         phy-handle = <&phy0>;
                         phy-connection-type = "rgmii-id";
                 };
 
-                ucc@3000 {
+                enet3: ucc@3000 {
                         device_type = "network";
                         compatible = "ucc_geth";
                         model = "UCC";
+                        cell-index = <2>;
                         device-id = <2>;
                         reg = <3000 200>;
                         interrupts = <21>;
                         interrupt-parent = <&qeic>;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        rx-clock = <0>;
-                        tx-clock = <20>;
+                        rx-clock-name = "none";
+                        tx-clock-name = "clk16";
                         pio-handle = <&pio2>;
                         phy-handle = <&phy1>;
                         phy-connection-type = "rgmii-id";
@@ -366,8 +359,7 @@
                         #address-cells = <1>;
                         #size-cells = <0>;
                         reg = <2120 18>;
-                        device_type = "mdio";
-                        compatible = "ucc_geth_phy";
+                        compatible = "fsl,ucc-mdio";
 
                         /* These are the same PHYs as on
                          * gianfar's MDIO bus */
@@ -397,9 +389,9 @@
                         };
                 };
 
-                qeic: qeic@80 {
+                qeic: interrupt-controller@80 {
                         interrupt-controller;
-                        device_type = "qeic";
+                        compatible = "fsl,qe-ic";
                         #address-cells = <0>;
                         #interrupt-cells = <1>;
                         reg = <80 80>;
@@ -410,7 +402,8 @@
 
         };
 
-        pci@e0008000 {
+        pci0: pci@e0008000 {
+                cell-index = <0>;
                 interrupt-map-mask = <f800 0 0 7>;
                 interrupt-map = <
                         /* IDSEL 0x12 AD18 */
@@ -440,7 +433,8 @@
         };
 
         /* PCI Express */
-        pcie@e000a000 {
+        pci1: pcie@e000a000 {
+                cell-index = <2>;
                 interrupt-map-mask = <f800 0 0 7>;
                 interrupt-map = <
 
diff --git a/arch/powerpc/boot/dts/mpc8572ds.dts b/arch/powerpc/boot/dts/mpc8572ds.dts
index 0eb44fb9647d..813c259abbe5 100644
--- a/arch/powerpc/boot/dts/mpc8572ds.dts
+++ b/arch/powerpc/boot/dts/mpc8572ds.dts
@@ -15,6 +15,18 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                ethernet3 = &enet3;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+                pci2 = &pci2;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -69,7 +81,9 @@
                 };
 
                 i2c@3000 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
                         reg = <3000 100>;
                         interrupts = <2b 2>;
@@ -78,7 +92,9 @@
                 };
 
                 i2c@3100 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
                         compatible = "fsl-i2c";
                         reg = <3100 100>;
                         interrupts = <2b 2>;
@@ -89,9 +105,9 @@
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "mdio";
-                        compatible = "gianfar";
+                        compatible = "fsl,gianfar-mdio";
                         reg = <24520 20>;
+
                         phy0: ethernet-phy@0 {
                                 interrupt-parent = <&mpic>;
                                 interrupts = <a 1>;
@@ -114,9 +130,8 @@
                         };
                 };
 
-                ethernet@24000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
@@ -128,9 +143,8 @@
                         phy-connection-type = "rgmii-id";
                 };
 
-                ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
@@ -142,9 +156,8 @@
                         phy-connection-type = "rgmii-id";
                 };
 
-                ethernet@26000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet2: ethernet@26000 {
+                        cell-index = <2>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
@@ -156,9 +169,8 @@
                         phy-connection-type = "rgmii-id";
                 };
 
-                ethernet@27000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet3: ethernet@27000 {
+                        cell-index = <3>;
                         device_type = "network";
                         model = "eTSEC";
                         compatible = "gianfar";
@@ -170,7 +182,8 @@
                         phy-connection-type = "rgmii-id";
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4500 100>;
@@ -179,7 +192,8 @@
                         interrupt-parent = <&mpic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
                         reg = <4600 100>;
@@ -206,7 +220,8 @@
                 };
         };
 
-        pcie@ffe08000 {
+        pci0: pcie@ffe08000 {
+                cell-index = <0>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -319,9 +334,9 @@
 
                         // IDSEL 0x1c  USB
                         e000 0 0 1 &i8259 c 2
-                        e100 0 0 1 &i8259 9 2
-                        e200 0 0 1 &i8259 a 2
-                        e300 0 0 1 &i8259 b 2
+                        e100 0 0 2 &i8259 9 2
+                        e200 0 0 3 &i8259 a 2
+                        e300 0 0 4 &i8259 b 2
 
                         // IDSEL 0x1d  Audio
                         e800 0 0 1 &i8259 6 2
@@ -415,7 +430,8 @@
 
         };
 
-        pcie@ffe09000 {
+        pci1: pcie@ffe09000 {
+                cell-index = <1>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -451,7 +467,8 @@
                 };
         };
 
-        pcie@ffe0a000 {
+        pci2: pcie@ffe0a000 {
+                cell-index = <2>;
                 compatible = "fsl,mpc8548-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
@@ -464,6 +481,7 @@
                 clock-frequency = <1fca055>;
                 interrupt-parent = <&mpic>;
                 interrupts = <1b 2>;
+                interrupt-map-mask = <f800 0 0 7>;
                 interrupt-map = <
                         /* IDSEL 0x0 */
                         0000 0 0 1 &mpic 0 1
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index 966edf1161a6..16c947b8a721 100644
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -1,13 +1,14 @@
 /*
  * MPC8610 HPCD Device Tree Source
  *
- * Copyright 2007 Freescale Semiconductor Inc.
+ * Copyright 2007-2008 Freescale Semiconductor Inc.
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under the terms of the GNU General Public License Version 2 as published
  * by the Free Software Foundation.
  */
 
+/dts-v1/;
 
 / {
         model = "MPC8610HPCD";
@@ -15,6 +16,13 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                pci1 = &pci1;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -22,11 +30,11 @@
                 PowerPC,8610@0 {
                         device_type = "cpu";
                         reg = <0>;
-                        d-cache-line-size = <d# 32>;    // bytes
-                        i-cache-line-size = <d# 32>;    // bytes
-                        d-cache-size = <8000>;          // L1, 32K
-                        i-cache-size = <8000>;          // L1, 32K
-                        timebase-frequency = <0>;       // 33 MHz, from uboot
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <32768>;         // L1
+                        i-cache-size = <32768>;         // L1
+                        timebase-frequency = <0>;       // From uboot
                         bus-frequency = <0>;            // From uboot
                         clock-frequency = <0>;          // From uboot
                 };
@@ -34,7 +42,7 @@
 
         memory {
                 device_type = "memory";
-                reg = <00000000 20000000>;      // 512M at 0x0
+                reg = <0x00000000 0x20000000>;  // 512M at 0x0
         };
 
         soc@e0000000 {
@@ -42,57 +50,66 @@
                 #size-cells = <1>;
                 #interrupt-cells = <2>;
                 device_type = "soc";
-                ranges = <0 e0000000 00100000>;
-                reg = <e0000000 1000>;
+                compatible = "fsl,mpc8610-immr", "simple-bus";
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x1000>;
                 bus-frequency = <0>;
 
                 i2c@3000 {
-                        device_type = "i2c";
-                        compatible = "fsl-i2c";
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        reg = <3000 100>;
-                        interrupts = <2b 2>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
                         interrupt-parent = <&mpic>;
                         dfsrr;
+
+                        cs4270:codec@4f {
+                                compatible = "cirrus,cs4270";
+                                reg = <0x4f>;
+                                /* MCLK source is a stand-alone oscillator */
+                                clock-frequency = <12288000>;
+                        };
                 };
 
                 i2c@3100 {
-                        device_type = "i2c";
-                        compatible = "fsl-i2c";
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        reg = <3100 100>;
-                        interrupts = <2b 2>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <43 2>;
                         interrupt-parent = <&mpic>;
                         dfsrr;
                 };
 
-                serial@4500 {
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4500 100>;
+                        reg = <0x4500 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <2a 2>;
+                        interrupts = <42 2>;
                         interrupt-parent = <&mpic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4600 100>;
+                        reg = <0x4600 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <1c 2>;
+                        interrupts = <28 2>;
                         interrupt-parent = <&mpic>;
                 };
 
-
                 mpic: interrupt-controller@40000 {
                         clock-frequency = <0>;
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
-                        reg = <40000 40000>;
+                        reg = <0x40000 0x40000>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
                         big-endian;
@@ -100,68 +117,173 @@
 
                 global-utilities@e0000 {
                         compatible = "fsl,mpc8610-guts";
-                        reg = <e0000 1000>;
+                        reg = <0xe0000 0x1000>;
                         fsl,has-rstcr;
                 };
+
+                i2s@16000 {
+                        compatible = "fsl,mpc8610-ssi";
+                        cell-index = <0>;
+                        reg = <0x16000 0x100>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <62 2>;
+                        fsl,mode = "i2s-slave";
+                        codec-handle = <&cs4270>;
+                };
+
+                ssi@16100 {
+                        compatible = "fsl,mpc8610-ssi";
+                        cell-index = <1>;
+                        reg = <0x16100 0x100>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <63 2>;
+                };
+
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8610-dma", "fsl,eloplus-dma";
+                        cell-index = <0>;
+                        reg = <0x21300 0x4>; /* DMA general status register */
+                        ranges = <0x0 0x21100 0x200>;
+
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8610-dma-channel",
+                                        "fsl,eloplus-dma-channel";
+                                cell-index = <0>;
+                                reg = <0x0 0x80>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@1 {
+                                compatible = "fsl,mpc8610-dma-channel",
+                                        "fsl,eloplus-dma-channel";
+                                cell-index = <1>;
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@2 {
+                                compatible = "fsl,mpc8610-dma-channel",
+                                        "fsl,eloplus-dma-channel";
+                                cell-index = <2>;
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@3 {
+                                compatible = "fsl,mpc8610-dma-channel",
+                                        "fsl,eloplus-dma-channel";
+                                cell-index = <3>;
+                                reg = <0x180 0x80>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
+                dma@c300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8610-dma", "fsl,mpc8540-dma";
+                        cell-index = <1>;
+                        reg = <0xc300 0x4>; /* DMA general status register */
+                        ranges = <0x0 0xc100 0x200>;
+
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8610-dma-channel",
+                                        "fsl,mpc8540-dma-channel";
+                                cell-index = <0>;
+                                reg = <0x0 0x80>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <60 2>;
+                        };
+                        dma-channel@1 {
+                                compatible = "fsl,mpc8610-dma-channel",
+                                        "fsl,mpc8540-dma-channel";
+                                cell-index = <1>;
+                                reg = <0x80 0x80>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <61 2>;
+                        };
+                        dma-channel@2 {
+                                compatible = "fsl,mpc8610-dma-channel",
+                                        "fsl,mpc8540-dma-channel";
+                                cell-index = <2>;
+                                reg = <0x100 0x80>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <62 2>;
+                        };
+                        dma-channel@3 {
+                                compatible = "fsl,mpc8610-dma-channel",
+                                        "fsl,mpc8540-dma-channel";
+                                cell-index = <3>;
+                                reg = <0x180 0x80>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <63 2>;
+                        };
+                };
+
         };
 
-        pci@e0008000 {
+        pci0: pci@e0008000 {
+                cell-index = <0>;
                 compatible = "fsl,mpc8610-pci";
                 device_type = "pci";
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <e0008000 1000>;
+                reg = <0xe0008000 0x1000>;
                 bus-range = <0 0>;
-                ranges = <02000000 0 80000000 80000000 0 10000000
-                          01000000 0 00000000 e1000000 0 00100000>;
-                clock-frequency = <1fca055>;
+                ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe1000000 0x0 0x00100000>;
+                clock-frequency = <33333333>;
                 interrupt-parent = <&mpic>;
-                interrupts = <18 2>;
-                interrupt-map-mask = <f800 0 0 7>;
+                interrupts = <24 2>;
+                interrupt-map-mask = <0xf800 0 0 7>;
                 interrupt-map = <
                         /* IDSEL 0x11 */
-                        8800 0 0 1 &mpic 4 1
-                        8800 0 0 2 &mpic 5 1
-                        8800 0 0 3 &mpic 6 1
-                        8800 0 0 4 &mpic 7 1
+                        0x8800 0 0 1 &mpic 4 1
+                        0x8800 0 0 2 &mpic 5 1
+                        0x8800 0 0 3 &mpic 6 1
+                        0x8800 0 0 4 &mpic 7 1
 
                         /* IDSEL 0x12 */
-                        9000 0 0 1 &mpic 5 1
-                        9000 0 0 2 &mpic 6 1
-                        9000 0 0 3 &mpic 7 1
-                        9000 0 0 4 &mpic 4 1
+                        0x9000 0 0 1 &mpic 5 1
+                        0x9000 0 0 2 &mpic 6 1
+                        0x9000 0 0 3 &mpic 7 1
+                        0x9000 0 0 4 &mpic 4 1
                         >;
         };
 
-        pcie@e000a000 {
+        pci1: pcie@e000a000 {
+                cell-index = <1>;
                 compatible = "fsl,mpc8641-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <e000a000 1000>;
+                reg = <0xe000a000 0x1000>;
                 bus-range = <1 3>;
-                ranges = <02000000 0 a0000000 a0000000 0 10000000
-                          01000000 0 00000000 e3000000 0 00100000>;
-                clock-frequency = <1fca055>;
+                ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe3000000 0x0 0x00100000>;
+                clock-frequency = <33333333>;
                 interrupt-parent = <&mpic>;
-                interrupts = <1a 2>;
-                interrupt-map-mask = <f800 0 0 7>;
+                interrupts = <26 2>;
+                interrupt-map-mask = <0xf800 0 0 7>;
 
                 interrupt-map = <
                         /* IDSEL 0x1b */
-                        d800 0 0 1 &mpic 2 1
+                        0xd800 0 0 1 &mpic 2 1
 
                         /* IDSEL 0x1c*/
-                        e000 0 0 1 &mpic 1 1
-                        e000 0 0 2 &mpic 1 1
-                        e000 0 0 3 &mpic 1 1
-                        e000 0 0 4 &mpic 1 1
+                        0xe000 0 0 1 &mpic 1 1
+                        0xe000 0 0 2 &mpic 1 1
+                        0xe000 0 0 3 &mpic 1 1
+                        0xe000 0 0 4 &mpic 1 1
 
                         /* IDSEL 0x1f */
-                        f800 0 0 1 &mpic 3 0
-                        f800 0 0 2 &mpic 0 1
+                        0xf800 0 0 1 &mpic 3 0
+                        0xf800 0 0 2 &mpic 0 1
                 >;
 
                 pcie@0 {
@@ -169,22 +291,22 @@
                         #size-cells = <2>;
                         #address-cells = <3>;
                         device_type = "pci";
-                        ranges = <02000000 0 a0000000
-                                  02000000 0 a0000000
-                                  0 10000000
-                                  01000000 0 00000000
-                                  01000000 0 00000000
-                                  0 00100000>;
+                        ranges = <0x02000000 0x0 0xa0000000
+                                  0x02000000 0x0 0xa0000000
+                                  0x0 0x10000000
+                                  0x01000000 0x0 0x00000000
+                                  0x01000000 0x0 0x00000000
+                                  0x0 0x00100000>;
                         uli1575@0 {
                                 reg = <0 0 0 0 0>;
                                 #size-cells = <2>;
                                 #address-cells = <3>;
-                                ranges = <02000000 0 a0000000
-                                          02000000 0 a0000000
-                                          0 10000000
-                                          01000000 0 00000000
-                                          01000000 0 00000000
-                                          0 00100000>;
+                                ranges = <0x02000000 0x0 0xa0000000
+                                          0x02000000 0x0 0xa0000000
+                                          0x0 0x10000000
+                                          0x01000000 0x0 0x00000000
+                                          0x01000000 0x0 0x00000000
+                                          0x0 0x00100000>;
                         };
                 };
         };
diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index abb26dc42558..79385bcd5c5f 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -9,6 +9,7 @@
  * option) any later version.
  */
 
+/dts-v1/;
 
 / {
         model = "MPC8641HPCN";
@@ -16,6 +17,17 @@
         #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>;
@@ -23,22 +35,22 @@
                 PowerPC,8641@0 {
                         device_type = "cpu";
                         reg = <0>;
-                        d-cache-line-size = <20>;       // 32 bytes
-                        i-cache-line-size = <20>;       // 32 bytes
-                        d-cache-size = <8000>;          // L1, 32K
-                        i-cache-size = <8000>;          // L1, 32K
-                        timebase-frequency = <0>;       // 33 MHz, from uboot
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <32768>;         // L1
+                        i-cache-size = <32768>;         // L1
+                        timebase-frequency = <0>;       // From uboot
                         bus-frequency = <0>;            // From uboot
                         clock-frequency = <0>;          // From uboot
                 };
                 PowerPC,8641@1 {
                         device_type = "cpu";
                         reg = <1>;
-                        d-cache-line-size = <20>;       // 32 bytes
-                        i-cache-line-size = <20>;       // 32 bytes
-                        d-cache-size = <8000>;          // L1, 32K
-                        i-cache-size = <8000>;          // L1, 32K
-                        timebase-frequency = <0>;       // 33 MHz, from uboot
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <32768>;
+                        i-cache-size = <32768>;
+                        timebase-frequency = <0>;       // From uboot
                         bus-frequency = <0>;            // From uboot
                         clock-frequency = <0>;          // From uboot
                 };
@@ -46,31 +58,77 @@
 
         memory {
                 device_type = "memory";
-                reg = <00000000 40000000>;      // 1G at 0x0
+                reg = <0x00000000 0x40000000>;  // 1G at 0x0
+        };
+
+        localbus@f8005000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8641-localbus", "simple-bus";
+                reg = <0xf8005000 0x1000>;
+                interrupts = <19 2>;
+                interrupt-parent = <&mpic>;
+
+                ranges = <0 0 0xff800000 0x00800000
+                          1 0 0xfe000000 0x01000000
+                          2 0 0xf8200000 0x00100000
+                          3 0 0xf8100000 0x00100000>;
+
+                flash@0,0 {
+                        compatible = "cfi-flash";
+                        reg = <0 0 0x00800000>;
+                        bank-width = <2>;
+                        device-width = <2>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        partition@0 {
+                                label = "kernel";
+                                reg = <0x00000000 0x00300000>;
+                        };
+                        partition@300000 {
+                                label = "firmware b";
+                                reg = <0x00300000 0x00100000>;
+                                read-only;
+                        };
+                        partition@400000 {
+                                label = "fs";
+                                reg = <0x00400000 0x00300000>;
+                        };
+                        partition@700000 {
+                                label = "firmware a";
+                                reg = <0x00700000 0x00100000>;
+                                read-only;
+                        };
+                };
         };
 
         soc8641@f8000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "soc";
-                ranges = <00000000 f8000000 00100000>;
-                reg = <f8000000 00001000>;      // CCSRBAR
+                compatible = "simple-bus";
+                ranges = <0x00000000 0xf8000000 0x00100000>;
+                reg = <0xf8000000 0x00001000>;  // CCSRBAR
                 bus-frequency = <0>;
 
                 i2c@3000 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
                         compatible = "fsl-i2c";
-                        reg = <3000 100>;
-                        interrupts = <2b 2>;
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
                         interrupt-parent = <&mpic>;
                         dfsrr;
                 };
 
                 i2c@3100 {
-                        device_type = "i2c";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
                         compatible = "fsl-i2c";
-                        reg = <3100 100>;
-                        interrupts = <2b 2>;
+                        reg = <0x3100 0x100>;
+                        interrupts = <43 2>;
                         interrupt-parent = <&mpic>;
                         dfsrr;
                 };
@@ -78,129 +136,104 @@
                 mdio@24520 {
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        device_type = "mdio";
-                        compatible = "gianfar";
-                        reg = <24520 20>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
                         phy0: ethernet-phy@0 {
                                 interrupt-parent = <&mpic>;
-                                interrupts = <a 1>;
+                                interrupts = <10 1>;
                                 reg = <0>;
                                 device_type = "ethernet-phy";
                         };
                         phy1: ethernet-phy@1 {
                                 interrupt-parent = <&mpic>;
-                                interrupts = <a 1>;
+                                interrupts = <10 1>;
                                 reg = <1>;
                                 device_type = "ethernet-phy";
                         };
                         phy2: ethernet-phy@2 {
                                 interrupt-parent = <&mpic>;
-                                interrupts = <a 1>;
+                                interrupts = <10 1>;
                                 reg = <2>;
                                 device_type = "ethernet-phy";
                         };
                         phy3: ethernet-phy@3 {
                                 interrupt-parent = <&mpic>;
-                                interrupts = <a 1>;
+                                interrupts = <10 1>;
                                 reg = <3>;
                                 device_type = "ethernet-phy";
                         };
                 };
 
-                ethernet@24000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
-                        reg = <24000 1000>;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
+                        reg = <0x24000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <1d 2 1e 2 22 2>;
+                        interrupts = <29 2 30  2 34 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy0>;
                         phy-connection-type = "rgmii-id";
                 };
 
-                ethernet@25000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
-                        reg = <25000 1000>;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
+                        reg = <0x25000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <23 2 24 2 28 2>;
+                        interrupts = <35 2 36 2 40 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy1>;
                         phy-connection-type = "rgmii-id";
                 };
                 
-                ethernet@26000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet2: ethernet@26000 {
+                        cell-index = <2>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
-                        reg = <26000 1000>;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
+                        reg = <0x26000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <1F 2 20 2 21 2>;
+                        interrupts = <31 2 32 2 33 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy2>;
                         phy-connection-type = "rgmii-id";
                 };
 
-                ethernet@27000 {
-                        #address-cells = <1>;
-                        #size-cells = <0>;
+                enet3: ethernet@27000 {
+                        cell-index = <3>;
                         device_type = "network";
                         model = "TSEC";
                         compatible = "gianfar";
-                        reg = <27000 1000>;
-                        /*
-                         * mac-address is deprecated and will be removed
-                         * in 2.6.25.  Only recent versions of
-                         * U-Boot support local-mac-address, however.
-                         */
-                        mac-address = [ 00 00 00 00 00 00 ];
+                        reg = <0x27000 0x1000>;
                         local-mac-address = [ 00 00 00 00 00 00 ];
-                        interrupts = <25 2 26 2 27 2>;
+                        interrupts = <37 2 38 2 39 2>;
                         interrupt-parent = <&mpic>;
                         phy-handle = <&phy3>;
                         phy-connection-type = "rgmii-id";
                 };
-                serial@4500 {
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4500 100>;
+                        reg = <0x4500 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <2a 2>;
+                        interrupts = <42 2>;
                         interrupt-parent = <&mpic>;
                 };
 
-                serial@4600 {
+                serial1: serial@4600 {
+                        cell-index = <1>;
                         device_type = "serial";
                         compatible = "ns16550";
-                        reg = <4600 100>;
+                        reg = <0x4600 0x100>;
                         clock-frequency = <0>;
-                        interrupts = <1c 2>;
+                        interrupts = <28 2>;
                         interrupt-parent = <&mpic>;
                 };
 
@@ -209,7 +242,7 @@
                         interrupt-controller;
                         #address-cells = <0>;
                         #interrupt-cells = <2>;
-                        reg = <40000 40000>;
+                        reg = <0x40000 0x40000>;
                         compatible = "chrp,open-pic";
                         device_type = "open-pic";
                         big-endian;
@@ -217,138 +250,139 @@
 
                 global-utilities@e0000 {
                         compatible = "fsl,mpc8641-guts";
-                        reg = <e0000 1000>;
+                        reg = <0xe0000 0x1000>;
                         fsl,has-rstcr;
                 };
         };
 
-        pcie@f8008000 {
+        pci0: pcie@f8008000 {
+                cell-index = <0>;
                 compatible = "fsl,mpc8641-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <f8008000 1000>;
-                bus-range = <0 ff>;
-                ranges = <02000000 0 80000000 80000000 0 20000000
-                          01000000 0 00000000 e2000000 0 00100000>;
-                clock-frequency = <1fca055>;
+                reg = <0xf8008000 0x1000>;
+                bus-range = <0x0 0xff>;
+                ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x20000000
+                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
+                clock-frequency = <33333333>;
                 interrupt-parent = <&mpic>;
-                interrupts = <18 2>;
-                interrupt-map-mask = <ff00 0 0 7>;
+                interrupts = <24 2>;
+                interrupt-map-mask = <0xff00 0 0 7>;
                 interrupt-map = <
                         /* IDSEL 0x11 func 0 - PCI slot 1 */
-                        8800 0 0 1 &mpic 2 1
-                        8800 0 0 2 &mpic 3 1
-                        8800 0 0 3 &mpic 4 1
-                        8800 0 0 4 &mpic 1 1
+                        0x8800 0 0 1 &mpic 2 1
+                        0x8800 0 0 2 &mpic 3 1
+                        0x8800 0 0 3 &mpic 4 1
+                        0x8800 0 0 4 &mpic 1 1
 
                         /* IDSEL 0x11 func 1 - PCI slot 1 */
-                        8900 0 0 1 &mpic 2 1
-                        8900 0 0 2 &mpic 3 1
-                        8900 0 0 3 &mpic 4 1
-                        8900 0 0 4 &mpic 1 1
+                        0x8900 0 0 1 &mpic 2 1
+                        0x8900 0 0 2 &mpic 3 1
+                        0x8900 0 0 3 &mpic 4 1
+                        0x8900 0 0 4 &mpic 1 1
 
                         /* IDSEL 0x11 func 2 - PCI slot 1 */
-                        8a00 0 0 1 &mpic 2 1
-                        8a00 0 0 2 &mpic 3 1
-                        8a00 0 0 3 &mpic 4 1
-                        8a00 0 0 4 &mpic 1 1
+                        0x8a00 0 0 1 &mpic 2 1
+                        0x8a00 0 0 2 &mpic 3 1
+                        0x8a00 0 0 3 &mpic 4 1
+                        0x8a00 0 0 4 &mpic 1 1
 
                         /* IDSEL 0x11 func 3 - PCI slot 1 */
-                        8b00 0 0 1 &mpic 2 1
-                        8b00 0 0 2 &mpic 3 1
-                        8b00 0 0 3 &mpic 4 1
-                        8b00 0 0 4 &mpic 1 1
+                        0x8b00 0 0 1 &mpic 2 1
+                        0x8b00 0 0 2 &mpic 3 1
+                        0x8b00 0 0 3 &mpic 4 1
+                        0x8b00 0 0 4 &mpic 1 1
 
                         /* IDSEL 0x11 func 4 - PCI slot 1 */
-                        8c00 0 0 1 &mpic 2 1
-                        8c00 0 0 2 &mpic 3 1
-                        8c00 0 0 3 &mpic 4 1
-                        8c00 0 0 4 &mpic 1 1
+                        0x8c00 0 0 1 &mpic 2 1
+                        0x8c00 0 0 2 &mpic 3 1
+                        0x8c00 0 0 3 &mpic 4 1
+                        0x8c00 0 0 4 &mpic 1 1
 
                         /* IDSEL 0x11 func 5 - PCI slot 1 */
-                        8d00 0 0 1 &mpic 2 1
-                        8d00 0 0 2 &mpic 3 1
-                        8d00 0 0 3 &mpic 4 1
-                        8d00 0 0 4 &mpic 1 1
+                        0x8d00 0 0 1 &mpic 2 1
+                        0x8d00 0 0 2 &mpic 3 1
+                        0x8d00 0 0 3 &mpic 4 1
+                        0x8d00 0 0 4 &mpic 1 1
 
                         /* IDSEL 0x11 func 6 - PCI slot 1 */
-                        8e00 0 0 1 &mpic 2 1
-                        8e00 0 0 2 &mpic 3 1
-                        8e00 0 0 3 &mpic 4 1
-                        8e00 0 0 4 &mpic 1 1
+                        0x8e00 0 0 1 &mpic 2 1
+                        0x8e00 0 0 2 &mpic 3 1
+                        0x8e00 0 0 3 &mpic 4 1
+                        0x8e00 0 0 4 &mpic 1 1
 
                         /* IDSEL 0x11 func 7 - PCI slot 1 */
-                        8f00 0 0 1 &mpic 2 1
-                        8f00 0 0 2 &mpic 3 1
-                        8f00 0 0 3 &mpic 4 1
-                        8f00 0 0 4 &mpic 1 1
+                        0x8f00 0 0 1 &mpic 2 1
+                        0x8f00 0 0 2 &mpic 3 1
+                        0x8f00 0 0 3 &mpic 4 1
+                        0x8f00 0 0 4 &mpic 1 1
 
                         /* IDSEL 0x12 func 0 - PCI slot 2 */
-                        9000 0 0 1 &mpic 3 1
-                        9000 0 0 2 &mpic 4 1
-                        9000 0 0 3 &mpic 1 1
-                        9000 0 0 4 &mpic 2 1
+                        0x9000 0 0 1 &mpic 3 1
+                        0x9000 0 0 2 &mpic 4 1
+                        0x9000 0 0 3 &mpic 1 1
+                        0x9000 0 0 4 &mpic 2 1
 
                         /* IDSEL 0x12 func 1 - PCI slot 2 */
-                        9100 0 0 1 &mpic 3 1
-                        9100 0 0 2 &mpic 4 1
-                        9100 0 0 3 &mpic 1 1
-                        9100 0 0 4 &mpic 2 1
+                        0x9100 0 0 1 &mpic 3 1
+                        0x9100 0 0 2 &mpic 4 1
+                        0x9100 0 0 3 &mpic 1 1
+                        0x9100 0 0 4 &mpic 2 1
 
                         /* IDSEL 0x12 func 2 - PCI slot 2 */
-                        9200 0 0 1 &mpic 3 1
-                        9200 0 0 2 &mpic 4 1
-                        9200 0 0 3 &mpic 1 1
-                        9200 0 0 4 &mpic 2 1
+                        0x9200 0 0 1 &mpic 3 1
+                        0x9200 0 0 2 &mpic 4 1
+                        0x9200 0 0 3 &mpic 1 1
+                        0x9200 0 0 4 &mpic 2 1
 
                         /* IDSEL 0x12 func 3 - PCI slot 2 */
-                        9300 0 0 1 &mpic 3 1
-                        9300 0 0 2 &mpic 4 1
-                        9300 0 0 3 &mpic 1 1
-                        9300 0 0 4 &mpic 2 1
+                        0x9300 0 0 1 &mpic 3 1
+                        0x9300 0 0 2 &mpic 4 1
+                        0x9300 0 0 3 &mpic 1 1
+                        0x9300 0 0 4 &mpic 2 1
 
                         /* IDSEL 0x12 func 4 - PCI slot 2 */
-                        9400 0 0 1 &mpic 3 1
-                        9400 0 0 2 &mpic 4 1
-                        9400 0 0 3 &mpic 1 1
-                        9400 0 0 4 &mpic 2 1
+                        0x9400 0 0 1 &mpic 3 1
+                        0x9400 0 0 2 &mpic 4 1
+                        0x9400 0 0 3 &mpic 1 1
+                        0x9400 0 0 4 &mpic 2 1
 
                         /* IDSEL 0x12 func 5 - PCI slot 2 */
-                        9500 0 0 1 &mpic 3 1
-                        9500 0 0 2 &mpic 4 1
-                        9500 0 0 3 &mpic 1 1
-                        9500 0 0 4 &mpic 2 1
+                        0x9500 0 0 1 &mpic 3 1
+                        0x9500 0 0 2 &mpic 4 1
+                        0x9500 0 0 3 &mpic 1 1
+                        0x9500 0 0 4 &mpic 2 1
 
                         /* IDSEL 0x12 func 6 - PCI slot 2 */
-                        9600 0 0 1 &mpic 3 1
-                        9600 0 0 2 &mpic 4 1
-                        9600 0 0 3 &mpic 1 1
-                        9600 0 0 4 &mpic 2 1
+                        0x9600 0 0 1 &mpic 3 1
+                        0x9600 0 0 2 &mpic 4 1
+                        0x9600 0 0 3 &mpic 1 1
+                        0x9600 0 0 4 &mpic 2 1
 
                         /* IDSEL 0x12 func 7 - PCI slot 2 */
-                        9700 0 0 1 &mpic 3 1
-                        9700 0 0 2 &mpic 4 1
-                        9700 0 0 3 &mpic 1 1
-                        9700 0 0 4 &mpic 2 1
+                        0x9700 0 0 1 &mpic 3 1
+                        0x9700 0 0 2 &mpic 4 1
+                        0x9700 0 0 3 &mpic 1 1
+                        0x9700 0 0 4 &mpic 2 1
 
                         // IDSEL 0x1c  USB
-                        e000 0 0 1 &i8259 c 2
-                        e100 0 0 1 &i8259 9 2
-                        e200 0 0 1 &i8259 a 2
-                        e300 0 0 1 &i8259 b 2
+                        0xe000 0 0 1 &i8259 12 2
+                        0xe100 0 0 2 &i8259 9 2
+                        0xe200 0 0 3 &i8259 10 2
+                        0xe300 0 0 4 &i8259 112
 
                         // IDSEL 0x1d  Audio
-                        e800 0 0 1 &i8259 6 2
+                        0xe800 0 0 1 &i8259 6 2
 
                         // IDSEL 0x1e Legacy
-                        f000 0 0 1 &i8259 7 2
-                        f100 0 0 1 &i8259 7 2
+                        0xf000 0 0 1 &i8259 7 2
+                        0xf100 0 0 1 &i8259 7 2
 
                         // IDSEL 0x1f IDE/SATA
-                        f800 0 0 1 &i8259 e 2
-                        f900 0 0 1 &i8259 5 2
+                        0xf800 0 0 1 &i8259 14 2
+                        0xf900 0 0 1 &i8259 5 2
                         >;
 
                 pcie@0 {
@@ -356,37 +390,37 @@
                         #size-cells = <2>;
                         #address-cells = <3>;
                         device_type = "pci";
-                        ranges = <02000000 0 80000000
-                                  02000000 0 80000000
-                                  0 20000000
+                        ranges = <0x02000000 0x0 0x80000000
+                                  0x02000000 0x0 0x80000000
+                                  0x0 0x20000000
 
-                                  01000000 0 00000000
-                                  01000000 0 00000000
-                                  0 00100000>;
+                                  0x01000000 0x0 0x00000000
+                                  0x01000000 0x0 0x00000000
+                                  0x0 0x00100000>;
                         uli1575@0 {
                                 reg = <0 0 0 0 0>;
                                 #size-cells = <2>;
                                 #address-cells = <3>;
-                                ranges = <02000000 0 80000000
-                                          02000000 0 80000000
-                                          0 20000000
-                                          01000000 0 00000000
-                                          01000000 0 00000000
-                                          0 00100000>;
+                                ranges = <0x02000000 0x0 0x80000000
+                                          0x02000000 0x0 0x80000000
+                                          0x0 0x20000000
+                                          0x01000000 0x0 0x00000000
+                                          0x01000000 0x0 0x00000000
+                                          0x0 0x00100000>;
                                 isa@1e {
                                         device_type = "isa";
                                         #interrupt-cells = <2>;
                                         #size-cells = <1>;
                                         #address-cells = <2>;
-                                        reg = <f000 0 0 0 0>;
-                                        ranges = <1 0 01000000 0 0
-                                                  00001000>;
+                                        reg = <0xf000 0 0 0 0>;
+                                        ranges = <1 0 0x01000000 0 0
+                                                  0x00001000>;
                                         interrupt-parent = <&i8259>;
 
                                         i8259: interrupt-controller@20 {
-                                                reg = <1 20 2
-                                                       1 a0 2
-                                                       1 4d0 2>;
+                                                reg = <1 0x20 2
+                                                       1 0xa0 2
+                                                       1 0x4d0 2>;
                                                 interrupt-controller;
                                                 device_type = "interrupt-controller";
                                                 #address-cells = <0>;
@@ -399,8 +433,8 @@
                                         i8042@60 {
                                                 #size-cells = <0>;
                                                 #address-cells = <1>;
-                                                reg = <1 60 1 1 64 1>;
-                                                interrupts = <1 3 c 3>;
+                                                reg = <1 0x60 1 1 0x64 1>;
+                                                interrupts = <1 3 12 3>;
                                                 interrupt-parent =
                                                         <&i8259>;
 
@@ -418,11 +452,11 @@
                                         rtc@70 {
                                                 compatible =
                                                         "pnpPNP,b00";
-                                                reg = <1 70 2>;
+                                                reg = <1 0x70 2>;
                                         };
 
                                         gpio@400 {
-                                                reg = <1 400 80>;
+                                                reg = <1 0x400 0x80>;
                                         };
                                 };
                         };
@@ -430,39 +464,40 @@
 
         };
 
-        pcie@f8009000 {
+        pci1: pcie@f8009000 {
+                cell-index = <1>;
                 compatible = "fsl,mpc8641-pcie";
                 device_type = "pci";
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <f8009000 1000>;
-                bus-range = <0 ff>;
-                ranges = <02000000 0 a0000000 a0000000 0 20000000
-                          01000000 0 00000000 e3000000 0 00100000>;
-                clock-frequency = <1fca055>;
+                reg = <0xf8009000 0x1000>;
+                bus-range = <0 0xff>;
+                ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
+                          0x01000000 0x0 0x00000000 0xe3000000 0x0 0x00100000>;
+                clock-frequency = <33333333>;
                 interrupt-parent = <&mpic>;
-                interrupts = <19 2>;
-                interrupt-map-mask = <f800 0 0 7>;
+                interrupts = <25 2>;
+                interrupt-map-mask = <0xf800 0 0 7>;
                 interrupt-map = <
                         /* IDSEL 0x0 */
-                        0000 0 0 1 &mpic 4 1
-                        0000 0 0 2 &mpic 5 1
-                        0000 0 0 3 &mpic 6 1
-                        0000 0 0 4 &mpic 7 1
+                        0x0000 0 0 1 &mpic 4 1
+                        0x0000 0 0 2 &mpic 5 1
+                        0x0000 0 0 3 &mpic 6 1
+                        0x0000 0 0 4 &mpic 7 1
                         >;
                 pcie@0 {
                         reg = <0 0 0 0 0>;
                         #size-cells = <2>;
                         #address-cells = <3>;
                         device_type = "pci";
-                        ranges = <02000000 0 a0000000
-                                  02000000 0 a0000000
-                                  0 20000000
+                        ranges = <0x02000000 0x0 0xa0000000
+                                  0x02000000 0x0 0xa0000000
+                                  0x0 0x20000000
 
-                                  01000000 0 00000000
-                                  01000000 0 00000000
-                                  0 00100000>;
+                                  0x01000000 0x0 0x00000000
+                                  0x01000000 0x0 0x00000000
+                                  0x0 0x00100000>;
                 };
         };
 };
diff --git a/arch/powerpc/boot/dts/mpc866ads.dts b/arch/powerpc/boot/dts/mpc866ads.dts
index 90f2293ed3cd..daf9433e906b 100644
--- a/arch/powerpc/boot/dts/mpc866ads.dts
+++ b/arch/powerpc/boot/dts/mpc866ads.dts
@@ -12,7 +12,7 @@
 
 / {
         model = "MPC866ADS";
-        compatible = "mpc8xx";
+        compatible = "fsl,mpc866ads";
         #address-cells = <1>;
         #size-cells = <1>;
 
@@ -23,15 +23,15 @@
                 PowerPC,866@0 {
                         device_type = "cpu";
                         reg = <0>;
-                        d-cache-line-size = <20>;       // 32 bytes
-                        i-cache-line-size = <20>;       // 32 bytes
+                        d-cache-line-size = <10>;       // 16 bytes
+                        i-cache-line-size = <10>;       // 16 bytes
                         d-cache-size = <2000>;          // L1, 8K
                         i-cache-size = <4000>;          // L1, 16K
                         timebase-frequency = <0>;
                         bus-frequency = <0>;
                         clock-frequency = <0>;
                         interrupts = <f 2>;     // decrementer interrupt
-                        interrupt-parent = <&Mpc8xx_pic>;
+                        interrupt-parent = <&PIC>;
                 };
         };
 
@@ -40,107 +40,139 @@
                 reg = <00000000 800000>;
         };
 
-        soc866@ff000000 {
+        localbus@ff000100 {
+                compatible = "fsl,mpc866-localbus", "fsl,pq1-localbus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <ff000100 40>;
+
+                ranges = <
+                        1 0 ff080000 00008000
+                        5 0 ff0a0000 00008000
+                >;
+
+                board-control@1,0 {
+                        reg = <1 0 20 5 300 4>;
+                        compatible = "fsl,mpc866ads-bcsr";
+                };
+        };
+
+        soc@ff000000 {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 device_type = "soc";
                 ranges = <0 ff000000 00100000>;
                 reg = <ff000000 00000200>;
                 bus-frequency = <0>;
-                mdio@e80 {
-                        device_type = "mdio";
-                        compatible = "fs_enet";
-                        reg = <e80 8>;
+
+                mdio@e00 {
+                        compatible = "fsl,mpc866-fec-mdio", "fsl,pq1-fec-mdio";
+                        reg = <e00 188>;
                         #address-cells = <1>;
                         #size-cells = <0>;
-                        phy: ethernet-phy@f {
+                        PHY: ethernet-phy@f {
                                 reg = <f>;
                                 device_type = "ethernet-phy";
                         };
                 };
 
-                fec@e00 {
+                ethernet@e00 {
                         device_type = "network";
-                        compatible = "fs_enet";
-                        model = "FEC";
-                        device-id = <1>;
+                        compatible = "fsl,mpc866-fec-enet",
+                                     "fsl,pq1-fec-enet";
                         reg = <e00 188>;
-                        mac-address = [ 00 00 0C 00 01 FD ];
+                        local-mac-address = [ 00 00 00 00 00 00 ];
                         interrupts = <3 1>;
-                        interrupt-parent = <&Mpc8xx_pic>;
-                        phy-handle = <&Phy>;
+                        interrupt-parent = <&PIC>;
+                        phy-handle = <&PHY>;
+                        linux,network-index = <0>;
                 };
 
-                mpc8xx_pic: pic@ff000000 {
+                PIC: pic@0 {
                         interrupt-controller;
-                        #address-cells = <0>;
                         #interrupt-cells = <2>;
                         reg = <0 24>;
-                        device_type = "mpc8xx-pic";
-                        compatible = "CPM";
+                        compatible = "fsl,mpc866-pic", "fsl,pq1-pic";
                 };
 
-                cpm@ff000000 {
+                cpm@9c0 {
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        device_type = "cpm";
-                        model = "CPM";
-                        ranges = <0 0 4000>;
-                        reg = <860 f0>;
-                        command-proc = <9c0>;
+                        compatible = "fsl,mpc866-cpm", "fsl,cpm1";
+                        ranges;
+                        reg = <9c0 40>;
                         brg-frequency = <0>;
                         interrupts = <0 2>;     // cpm error interrupt
-                        interrupt-parent = <&Cpm_pic>;
+                        interrupt-parent = <&CPM_PIC>;
 
-                        cpm_pic: pic@930 {
+                        muram@2000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 2000 2000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 1c00>;
+                                };
+                        };
+
+                        brg@9f0 {
+                                compatible = "fsl,mpc866-brg",
+                                             "fsl,cpm1-brg",
+                                             "fsl,cpm-brg";
+                                reg = <9f0 10>;
+                                clock-frequency = <0>;
+                        };
+
+                        CPM_PIC: pic@930 {
                                 interrupt-controller;
                                 #address-cells = <0>;
-                                #interrupt-cells = <2>;
+                                #interrupt-cells = <1>;
                                 interrupts = <5 2 0 2>;
-                                interrupt-parent = <&Mpc8xx_pic>;
+                                interrupt-parent = <&PIC>;
                                 reg = <930 20>;
-                                device_type = "cpm-pic";
-                                compatible = "CPM";
+                                compatible = "fsl,mpc866-cpm-pic",
+                                             "fsl,cpm1-pic";
                         };
 
-                        smc@a80 {
+
+                        serial@a80 {
                                 device_type = "serial";
-                                compatible = "cpm_uart";
-                                model = "SMC";
-                                device-id = <1>;
+                                compatible = "fsl,mpc866-smc-uart",
+                                             "fsl,cpm1-smc-uart";
                                 reg = <a80 10 3e80 40>;
-                                clock-setup = <00ffffff 0>;
-                                rx-clock = <1>;
-                                tx-clock = <1>;
-                                current-speed = <0>;
-                                interrupts = <4 3>;
-                                interrupt-parent = <&Cpm_pic>;
+                                interrupts = <4>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-brg = <1>;
+                                fsl,cpm-command = <0090>;
                         };
 
-                        smc@a90 {
+                        serial@a90 {
                                 device_type = "serial";
-                                compatible = "cpm_uart";
-                                model = "SMC";
-                                device-id = <2>;
-                                reg = <a90 20 3f80 40>;
-                                clock-setup = <ff00ffff 90000>;
-                                rx-clock = <2>;
-                                tx-clock = <2>;
-                                current-speed = <0>;
-                                interrupts = <3 3>;
-                                interrupt-parent = <&Cpm_pic>;
+                                compatible = "fsl,mpc866-smc-uart",
+                                             "fsl,cpm1-smc-uart";
+                                reg = <a90 10 3f80 40>;
+                                interrupts = <3>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-brg = <2>;
+                                fsl,cpm-command = <00d0>;
                         };
 
-                        scc@a00 {
+                        ethernet@a00 {
                                 device_type = "network";
-                                compatible = "fs_enet";
-                                model = "SCC";
-                                device-id = <1>;
-                                reg = <a00 18 3c00 80>;
-                                mac-address = [ 00 00 0C 00 03 FD ];
-                                interrupts = <1e 3>;
-                                interrupt-parent = <&Cpm_pic>;
+                                compatible = "fsl,mpc866-scc-enet",
+                                             "fsl,cpm1-scc-enet";
+                                reg = <a00 18 3c00 100>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                                interrupts = <1e>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-command = <0000>;
+                                linux,network-index = <1>;
                         };
                 };
         };
+
+        chosen {
+                linux,stdout-path = "/soc/cpm/serial@a80";
+        };
 };
diff --git a/arch/powerpc/boot/dts/rainier.dts b/arch/powerpc/boot/dts/rainier.dts
new file mode 100644
index 000000000000..d3c2ac394ce9
--- /dev/null
+++ b/arch/powerpc/boot/dts/rainier.dts
@@ -0,0 +1,353 @@
+/*
+ * Device Tree Source for AMCC Rainier
+ *
+ * Based on Sequoia code
+ * Copyright (c) 2007 MontaVista Software, Inc.
+ *
+ * FIXME: Draft only!
+ *
+ * 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.
+ *
+ */
+
+/ {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        model = "amcc,rainier";
+        compatible = "amcc,rainier";
+        dcr-parent = <&/cpus/cpu@0>;
+
+        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,440GRx";
+                        reg = <0>;
+                        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>;
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0 0>; /* Filled in by zImage */
+        };
+
+        UIC0: interrupt-controller0 {
+                compatible = "ibm,uic-440grx","ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0c0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+
+        UIC1: interrupt-controller1 {
+                compatible = "ibm,uic-440grx","ibm,uic";
+                interrupt-controller;
+                cell-index = <1>;
+                dcr-reg = <0d0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        UIC2: interrupt-controller2 {
+                compatible = "ibm,uic-440grx","ibm,uic";
+                interrupt-controller;
+                cell-index = <2>;
+                dcr-reg = <0e0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1c 4 1d 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        SDR0: sdr {
+                compatible = "ibm,sdr-440grx", "ibm,sdr-440ep";
+                dcr-reg = <00e 002>;
+        };
+
+        CPR0: cpr {
+                compatible = "ibm,cpr-440grx", "ibm,cpr-440ep";
+                dcr-reg = <00c 002>;
+        };
+
+        plb {
+                compatible = "ibm,plb-440grx", "ibm,plb4";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by zImage */
+
+                SDRAM0: sdram {
+                        compatible = "ibm,sdram-440grx", "ibm,sdram-44x-ddr2denali";
+                        dcr-reg = <010 2>;
+                };
+
+                DMA0: dma {
+                        compatible = "ibm,dma-440grx", "ibm,dma-4xx";
+                        dcr-reg = <100 027>;
+                };
+
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-440grx", "ibm,mcmal2";
+                        dcr-reg = <180 62>;
+                        num-tx-chans = <2>;
+                        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 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>;
+                };
+
+                POB0: opb {
+                        compatible = "ibm,opb-440grx", "ibm,opb";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <00000000 1 00000000 80000000
+                                  80000000 1 80000000 80000000>;
+                        interrupt-parent = <&UIC1>;
+                        interrupts = <7 4>;
+                        clock-frequency = <0>; /* Filled in by zImage */
+
+                        EBC0: ebc {
+                                compatible = "ibm,ebc-440grx", "ibm,ebc";
+                                dcr-reg = <012 2>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                interrupts = <5 1>;
+                                interrupt-parent = <&UIC1>;
+
+                                nor_flash@0,0 {
+                                        compatible = "amd,s29gl256n", "cfi-flash";
+                                        bank-width = <2>;
+                                        reg = <0 000000 4000000>;
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+                                        partition@0 {
+                                                label = "Kernel";
+                                                reg = <0 180000>;
+                                        };
+                                        partition@180000 {
+                                                label = "ramdisk";
+                                                reg = <180000 200000>;
+                                        };
+                                        partition@380000 {
+                                                label = "file system";
+                                                reg = <380000 3aa0000>;
+                                        };
+                                        partition@3e20000 {
+                                                label = "kozio";
+                                                reg = <3e20000 140000>;
+                                        };
+                                        partition@3f60000 {
+                                                label = "env";
+                                                reg = <3f60000 40000>;
+                                        };
+                                        partition@3fa0000 {
+                                                label = "u-boot";
+                                                reg = <3fa0000 60000>;
+                                        };
+                                };
+
+                        };
+
+                        UART0: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600300 8>;
+                                virtual-reg = <ef600300>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                current-speed = <1c200>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <0 4>;
+                        };
+
+                        UART1: serial@ef600400 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600400 8>;
+                                virtual-reg = <ef600400>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+
+                        UART2: serial@ef600500 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600500 8>;
+                                virtual-reg = <ef600500>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <3 4>;
+                        };
+
+                        UART3: serial@ef600600 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600600 8>;
+                                virtual-reg = <ef600600>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <4 4>;
+                        };
+
+                        IIC0: i2c@ef600700 {
+                                device_type = "i2c";
+                                compatible = "ibm,iic-440grx", "ibm,iic";
+                                reg = <ef600700 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+
+                        IIC1: i2c@ef600800 {
+                                device_type = "i2c";
+                                compatible = "ibm,iic-440grx", "ibm,iic";
+                                reg = <ef600800 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <7 4>;
+                        };
+
+                        ZMII0: emac-zmii@ef600d00 {
+                                device_type = "zmii-interface";
+                                compatible = "ibm,zmii-440grx", "ibm,zmii";
+                                reg = <ef600d00 c>;
+                        };
+
+                        RGMII0: emac-rgmii@ef601000 {
+                                device_type = "rgmii-interface";
+                                compatible = "ibm,rgmii-440grx", "ibm,rgmii";
+                                reg = <ef601000 8>;
+                                has-mdio;
+                        };
+
+                        EMAC0: ethernet@ef600e00 {
+                                linux,network-index = <0>;
+                                device_type = "network";
+                                compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4";
+                                interrupt-parent = <&EMAC0>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC0 18 4
+                                                /*Wake*/  1 &UIC1 1d 4>;
+                                reg = <ef600e00 70>;
+                                local-mac-address = [000000000000];
+                                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>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000000>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <0>;
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <0>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                        };
+
+                        EMAC1: ethernet@ef600f00 {
+                                linux,network-index = <1>;
+                                device_type = "network";
+                                compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4";
+                                interrupt-parent = <&EMAC1>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC0 19 4
+                                                /*Wake*/  1 &UIC1 1f 4>;
+                                reg = <ef600f00 70>;
+                                local-mac-address = [000000000000];
+                                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>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000000>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <1>;
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <1>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                        };
+                };
+
+                PCI0: pci@1ec000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #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 */
+
+                        /* 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>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+
+                        /* All PCI interrupts are routed to IRQ 67 */
+                        interrupt-map-mask = <0000 0 0 0>;
+                        interrupt-map = < 0000 0 0 0 &UIC2 3 8 >;
+                };
+        };
+
+        chosen {
+                linux,stdout-path = "/plb/opb/serial@ef600300";
+                bootargs = "console=ttyS0,115200";
+        };
+};
diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts
new file mode 100644
index 000000000000..3839d4b7d6a7
--- /dev/null
+++ b/arch/powerpc/boot/dts/sbc8349.dts
@@ -0,0 +1,244 @@
+/*
+ * SBC8349E Device Tree Source
+ *
+ * Copyright 2007 Wind River Inc.
+ *
+ * Paul Gortmaker (see MAINTAINERS for contact information)
+ *
+ *      -based largely on the Freescale MPC834x_MDS dts.
+ *
+ * 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 = "SBC8349E";
+        compatible = "SBC834xE";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8349@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 0x10000000>;  // 256MB at 0
+        };
+
+        soc8349@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x00000200>;
+                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 0x8>;
+                        interrupt-parent = <&ipic>;
+                        dfsrr;
+                };
+
+                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";
+                };
+
+                /* 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 {
+                        device_type = "usb";
+                        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@19 {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <20 0x8>;
+                                reg = <0x19>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy1: ethernet-phy@1a {
+                                interrupt-parent = <&ipic>;
+                                interrupts = <21 0x8>;
+                                reg = <0x1a>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <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 00 00 00 00 00 ];
+                        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 = <0>;
+                        interrupts = <9 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <10 0x8>;
+                        interrupt-parent = <&ipic>;
+                };
+
+                /* May need to remove if on a part without crypto engine */
+                crypto@30000 {
+                        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";
+                };
+        };
+
+        pci0: pci@e0008500 {
+                cell-index = <1>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+
+                                /* IDSEL 0x11 */
+                                 0x8800 0x0 0x0 0x1 &ipic 20 0x8
+                                 0x8800 0x0 0x0 0x2 &ipic 21 0x8
+                                 0x8800 0x0 0x0 0x3 &ipic 22 0x8
+                                 0x8800 0x0 0x0 0x4 &ipic 23 0x8>;
+
+                interrupt-parent = <&ipic>;
+                interrupts = <0x42 0x8>;
+                bus-range = <0 0>;
+                ranges = <0x02000000 0x0 0x90000000 0x90000000 0x0 0x10000000
+                          0x42000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
+                clock-frequency = <66666666>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe0008500 0x100>;
+                compatible = "fsl,mpc8349-pci";
+                device_type = "pci";
+        };
+};
diff --git a/arch/powerpc/boot/dts/sbc8548.dts b/arch/powerpc/boot/dts/sbc8548.dts
new file mode 100644
index 000000000000..14be38ad5d4b
--- /dev/null
+++ b/arch/powerpc/boot/dts/sbc8548.dts
@@ -0,0 +1,244 @@
+/*
+ * SBC8548 Device Tree Source
+ *
+ * Copyright 2007 Wind River Systems Inc.
+ *
+ * Paul Gortmaker (see MAINTAINERS for contact information)
+ *
+ * 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 = "SBC8548";
+        compatible = "SBC8548";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+                /* pci1 doesn't have a corresponding physical connector */
+                pci2 = &pci2;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8548@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <0x20>;     // 32 bytes
+                        i-cache-line-size = <0x20>;     // 32 bytes
+                        d-cache-size = <0x8000>;        // L1, 32K
+                        i-cache-size = <0x8000>;        // L1, 32K
+                        timebase-frequency = <0>;       // From uboot
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        soc8548@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x00000000 0xe0000000 0x00100000>;
+                reg = <0xe0000000 0x00001000>;  // CCSRBAR
+                bus-frequency = <0>;
+
+                memory-controller@2000 {
+                        compatible = "fsl,8548-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <0x12 0x2>;
+                };
+
+                l2-cache-controller@20000 {
+                        compatible = "fsl,8548-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <0x20>;       // 32 bytes
+                        cache-size = <0x80000>; // L2, 512K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <0x10 0x2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <0x2b 0x2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <0x2b 0x2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
+                        phy0: ethernet-phy@19 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <0x6 0x1>;
+                                reg = <0x19>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy1: ethernet-phy@1a {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <0x7 0x1>;
+                                reg = <0x1a>;
+                                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 = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy0>;
+                };
+
+                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 = <0x23 0x2 0x24 0x2 0x28 0x2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy1>;
+                };
+
+                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?
+                        interrupts = <0x2a 0x2>;
+                        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?
+                        interrupts = <0x2a 0x2>;
+                        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>;
+                        #size-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                        big-endian;
+                };
+        };
+
+        pci0: pci@e0008000 {
+                cell-index = <0>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        /* IDSEL 0x01 (PCI-X slot) */
+                        0x0800 0x0 0x0 0x1 &mpic 0x0 0x1
+                        0x0800 0x0 0x0 0x2 &mpic 0x1 0x1
+                        0x0800 0x0 0x0 0x3 &mpic 0x2 0x1
+                        0x0800 0x0 0x0 0x4 &mpic 0x3 0x1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <0x18 0x2>;
+                bus-range = <0 0>;
+                ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x10000000
+                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00800000>;
+                clock-frequency = <66666666>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xe0008000 0x1000>;
+                compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+                device_type = "pci";
+        };
+
+        pci2: pcie@e000a000 {
+                cell-index = <2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+
+                        /* IDSEL 0x0 (PEX) */
+                        0x0000 0x0 0x0 0x1 &mpic 0x0 0x1
+                        0x0000 0x0 0x0 0x2 &mpic 0x1 0x1
+                        0x0000 0x0 0x0 0x3 &mpic 0x2 0x1
+                        0x0000 0x0 0x0 0x4 &mpic 0x3 0x1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <0x1a 0x2>;
+                bus-range = <0x0 0xff>;
+                ranges = <0x02000000 0x0 0xa0000000 0xa0000000 0x0 0x20000000
+                          0x01000000 0x0 0x00000000 0xe3000000 0x0 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 = <0x0 0x0 0x0 0x0 0x0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x02000000 0x0 0xa0000000
+                                  0x02000000 0x0 0xa0000000
+                                  0x0 0x20000000
+
+                                  0x01000000 0x0 0x00000000
+                                  0x01000000 0x0 0x00000000
+                                  0x0 0x08000000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/sbc8560.dts b/arch/powerpc/boot/dts/sbc8560.dts
new file mode 100644
index 000000000000..0476802fba60
--- /dev/null
+++ b/arch/powerpc/boot/dts/sbc8560.dts
@@ -0,0 +1,330 @@
+/*
+ * SBC8560 Device Tree Source
+ *
+ * Copyright 2007 Wind River Systems Inc.
+ *
+ * Paul Gortmaker (see MAINTAINERS for contact information)
+ *
+ * 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 = "SBC8560";
+        compatible = "SBC8560";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                ethernet3 = &enet3;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8560@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <0x20>;     // 32 bytes
+                        i-cache-line-size = <0x20>;     // 32 bytes
+                        d-cache-size = <0x8000>;        // L1, 32K
+                        i-cache-size = <0x8000>;        // L1, 32K
+                        timebase-frequency = <0>;       // From uboot
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x20000000>;
+        };
+
+        soc@ff700000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xff700000 0x00100000>;
+                reg = <0xff700000 0x00100000>;
+                clock-frequency = <0>;
+
+                memory-controller@2000 {
+                        compatible = "fsl,8560-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <0x12 0x2>;
+                };
+
+                l2-cache-controller@20000 {
+                        compatible = "fsl,8560-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <0x20>;       // 32 bytes
+                        cache-size = <0x40000>;         // L2, 256K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <0x10 0x2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <0x2b 0x2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <1>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <0x2b 0x2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+                        phy0: ethernet-phy@19 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <0x6 0x1>;
+                                reg = <0x19>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy1: ethernet-phy@1a {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <0x7 0x1>;
+                                reg = <0x1a>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy2: ethernet-phy@1b {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <0x8 0x1>;
+                                reg = <0x1b>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy3: ethernet-phy@1c {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <0x8 0x1>;
+                                reg = <0x1c>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy0>;
+                };
+
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x25000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy1>;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        device_type = "open-pic";
+                };
+
+                cpm@919c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8560-cpm", "fsl,cpm2";
+                        reg = <0x919c0 0x30>;
+                        ranges;
+
+                        muram@80000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0x0 0x80000 0x10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0x0 0x4000 0x9000 0x2000>;
+                                };
+                        };
+
+                        brg@919f0 {
+                                compatible = "fsl,mpc8560-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <0x919f0 0x10 0x915f0 0x10>;
+                                clock-frequency = <165000000>;
+                        };
+
+                        cpmpic: pic@90c00 {
+                                interrupt-controller;
+                                #address-cells = <0>;
+                                #interrupt-cells = <2>;
+                                interrupts = <0x2e 0x2>;
+                                interrupt-parent = <&mpic>;
+                                reg = <0x90c00 0x80>;
+                                compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
+                        };
+
+                        enet2: ethernet@91320 {
+                                device_type = "network";
+                                compatible = "fsl,mpc8560-fcc-enet",
+                                             "fsl,cpm2-fcc-enet";
+                                reg = <0x91320 0x20 0x88500 0x100 0x913b0 0x1>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                                fsl,cpm-command = <0x16200300>;
+                                interrupts = <0x21 0x8>;
+                                interrupt-parent = <&cpmpic>;
+                                phy-handle = <&phy2>;
+                        };
+
+                        enet3: ethernet@91340 {
+                                device_type = "network";
+                                compatible = "fsl,mpc8560-fcc-enet",
+                                             "fsl,cpm2-fcc-enet";
+                                reg = <0x91340 0x20 0x88600 0x100 0x913d0 0x1>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                                fsl,cpm-command = <0x1a400300>;
+                                interrupts = <0x22 0x8>;
+                                interrupt-parent = <&cpmpic>;
+                                phy-handle = <&phy3>;
+                        };
+                };
+
+                global-utilities@e0000 {
+                        compatible = "fsl,mpc8560-guts";
+                        reg = <0xe0000 0x1000>;
+                        fsl,has-rstcr;
+                };
+        };
+
+        pci0: pci@ff708000 {
+                cell-index = <0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+                device_type = "pci";
+                reg = <0xff708000 0x1000>;
+                clock-frequency = <66666666>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+
+                        /* IDSEL 0x02 */
+                        0x1000 0x0 0x0 0x1 &mpic 0x2 0x1
+                        0x1000 0x0 0x0 0x2 &mpic 0x3 0x1
+                        0x1000 0x0 0x0 0x3 &mpic 0x4 0x1
+                        0x1000 0x0 0x0 0x4 &mpic 0x5 0x1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <0x18 0x2>;
+                bus-range = <0x0 0x0>;
+                ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x20000000
+                          0x01000000 0x0 0x00000000 0xe2000000 0x0 0x00100000>;
+        };
+
+        localbus@ff705000 {
+                compatible = "fsl,mpc8560-localbus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <0xff705000 0x100>;       // BRx, ORx, etc.
+
+                ranges = <
+                        0x0 0x0 0xff800000 0x0800000    // 8MB boot flash
+                        0x1 0x0 0xe4000000 0x4000000    // 64MB flash
+                        0x3 0x0 0x20000000 0x4000000    // 64MB SDRAM
+                        0x4 0x0 0x24000000 0x4000000    // 64MB SDRAM
+                        0x5 0x0 0xfc000000 0x0c00000    // EPLD
+                        0x6 0x0 0xe0000000 0x4000000    // 64MB flash
+                        0x7 0x0 0x80000000 0x0200000    // ATM1,2
+                >;
+
+                epld@5,0 {
+                        compatible = "wrs,epld-localbus";
+                        #address-cells = <2>;
+                        #size-cells = <1>;
+                        reg = <0x5 0x0 0xc00000>;
+                        ranges = <
+                                0x0 0x0 0x5 0x000000 0x1fff     // LED disp.
+                                0x1 0x0 0x5 0x100000 0x1fff     // switches
+                                0x2 0x0 0x5 0x200000 0x1fff     // ID reg.
+                                0x3 0x0 0x5 0x300000 0x1fff     // status reg.
+                                0x4 0x0 0x5 0x400000 0x1fff     // reset reg.
+                                0x5 0x0 0x5 0x500000 0x1fff     // Wind port
+                                0x7 0x0 0x5 0x700000 0x1fff     // UART #1
+                                0x8 0x0 0x5 0x800000 0x1fff     // UART #2
+                                0x9 0x0 0x5 0x900000 0x1fff     // RTC
+                                0xb 0x0 0x5 0xb00000 0x1fff     // EEPROM
+                        >;
+
+                        bidr@2,0 {
+                                compatible = "wrs,sbc8560-bidr";
+                                reg = <0x2 0x0 0x10>;
+                        };
+
+                        bcsr@3,0 {
+                                compatible = "wrs,sbc8560-bcsr";
+                                reg = <0x3 0x0 0x10>;
+                        };
+
+                        brstcr@4,0 {
+                                compatible = "wrs,sbc8560-brstcr";
+                                reg = <0x4 0x0 0x10>;
+                        };
+
+                        serial0: serial@7,0 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <0x7 0x0 0x100>;
+                                clock-frequency = <1843200>;
+                                interrupts = <0x9 0x2>;
+                                interrupt-parent = <&mpic>;
+                        };
+
+                        serial1: serial@8,0 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <0x8 0x0 0x100>;
+                                clock-frequency = <1843200>;
+                                interrupts = <0xa 0x2>;
+                                interrupt-parent = <&mpic>;
+                        };
+
+                        rtc@9,0 {
+                                compatible = "m48t59";
+                                reg = <0x9 0x0 0x1fff>;
+                        };
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 10784ff45dd6..d9046c1adcbe 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -17,14 +17,24 @@
         #size-cells = <1>;
         model = "amcc,sequoia";
         compatible = "amcc,sequoia";
-        dcr-parent = <&/cpus/PowerPC,440EPx@0>;
+        dcr-parent = <&/cpus/cpu@0>;
+
+        aliases {
+                ethernet0 = &EMAC0;
+                ethernet1 = &EMAC1;
+                serial0 = &UART0;
+                serial1 = &UART1;
+                serial2 = &UART2;
+                serial3 = &UART3;
+        };
 
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
-                PowerPC,440EPx@0 {
+                cpu@0 {
                         device_type = "cpu";
+                        model = "PowerPC,440EPx";
                         reg = <0>;
                         clock-frequency = <0>; /* Filled in by zImage */
                         timebase-frequency = <0>; /* Filled in by zImage */
@@ -94,7 +104,6 @@
                 clock-frequency = <0>; /* Filled in by zImage */
 
                 SDRAM0: sdram {
-                        device_type = "memory-controller";
                         compatible = "ibm,sdram-440epx", "ibm,sdram-44x-ddr2denali";
                         dcr-reg = <010 2>;
                 };
@@ -122,6 +131,13 @@
                         interrupt-map-mask = <ffffffff>;
                 };
 
+                USB1: usb@e0000400 {
+                        compatible = "ohci-be";
+                        reg = <0 e0000400 60>;
+                        interrupt-parent = <&UIC0>;
+                        interrupts = <15 8>;
+                };
+
                 POB0: opb {
                         compatible = "ibm,opb-440epx", "ibm,opb";
                         #address-cells = <1>;
@@ -308,6 +324,33 @@
                                 has-new-stacr-staopc;
                         };
                 };
+
+                PCI0: pci@1ec000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #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 */
+
+                        /* 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>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+
+                        /* All PCI interrupts are routed to IRQ 67 */
+                        interrupt-map-mask = <0000 0 0 0>;
+                        interrupt-map = < 0000 0 0 0 &UIC2 3 8 >;
+                };
         };
 
         chosen {
diff --git a/arch/powerpc/boot/dts/storcenter.dts b/arch/powerpc/boot/dts/storcenter.dts
new file mode 100644
index 000000000000..2204874ac5f3
--- /dev/null
+++ b/arch/powerpc/boot/dts/storcenter.dts
@@ -0,0 +1,141 @@
+/*
+ * Device Tree Source for IOMEGA StorCenter
+ *
+ * Copyright 2007 Oyvind Repvik
+ * Copyright 2007 Jon Loeliger
+ *
+ * Based on the Kurobox DTS by G. Liakhovetski <g.liakhovetski@gmx.de>
+ *
+ * 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/;
+
+/ {
+        model = "StorCenter";
+        compatible = "storcenter";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8241@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        clock-frequency = <200000000>;
+                        timebase-frequency = <25000000>;
+                        bus-frequency = <0>;    /* from bootwrapper */
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <16384>;
+                        d-cache-size = <16384>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x04000000>;  /* 64MB @ 0x0 */
+        };
+
+        soc@fc000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                compatible = "fsl,mpc8241", "mpc10x";
+                store-gathering = <0>; /* 0 == off, !0 == on */
+                ranges = <0x0 0xfc000000 0x100000>;
+                reg = <0xfc000000 0x100000>;    /* EUMB */
+                bus-frequency = <0>;            /* fixed by loader */
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <5 2>;
+                        interrupt-parent = <&mpic>;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1337";
+                                reg = <68>;
+                        };
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x20>;
+                        clock-frequency = <97553800>; /* Hz */
+                        current-speed = <115200>;
+                        interrupts = <9 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x20>;
+                        clock-frequency = <97553800>; /* Hz */
+                        current-speed = <9600>;
+                        interrupts = <10 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                mpic: interrupt-controller@40000 {
+                        #interrupt-cells = <2>;
+                        device_type = "open-pic";
+                        compatible = "chrp,open-pic";
+                        interrupt-controller;
+                        reg = <0x40000 0x40000>;
+                };
+
+        };
+
+        pci0: pci@fe800000 {
+                #address-cells = <3>;
+                #size-cells = <2>;
+                #interrupt-cells = <1>;
+                device_type = "pci";
+                compatible = "mpc10x-pci";
+                reg = <0xfe800000 0x1000>;
+                ranges = <0x01000000 0x0        0x0 0xfe000000 0x0 0x00c00000
+                          0x02000000 0x0 0x80000000 0x80000000 0x0 0x70000000>;
+                bus-range = <0 0xff>;
+                clock-frequency = <97553800>;
+                interrupt-parent = <&mpic>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 13 - IDE */
+                        0x6800 0 0 1 &mpic 0 1
+                        0x6800 0 0 2 &mpic 0 1
+                        0x6800 0 0 3 &mpic 0 1
+                        0x6800 0 0 4 &mpic 0 1
+                        /* IDSEL 14 - USB */
+                        0x7000 0 0 1 &mpic 0 1
+                        0x7000 0 0 2 &mpic 0 1
+                        0x7000 0 0 3 &mpic 0 1
+                        0x7000 0 0 4 &mpic 0 1
+                        /* IDSEL 15 - ETH */
+                        0x7800 0 0 1 &mpic 0 1
+                        0x7800 0 0 2 &mpic 0 1
+                        0x7800 0 0 3 &mpic 0 1
+                        0x7800 0 0 4 &mpic 0 1
+                >;
+        };
+
+        chosen {
+                linux,stdout-path = "/soc/serial@4500";
+        };
+};
diff --git a/arch/powerpc/boot/dts/stx_gp3_8560.dts b/arch/powerpc/boot/dts/stx_gp3_8560.dts
new file mode 100644
index 000000000000..f81fd7fdb29e
--- /dev/null
+++ b/arch/powerpc/boot/dts/stx_gp3_8560.dts
@@ -0,0 +1,228 @@
+/*
+ * STX GP3 - 8560 ADS Device Tree Source
+ *
+ * Copyright 2008 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "stx,gp3";
+        compatible = "stx,gp3-8560", "stx,gp3";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8560@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <32768>;
+                        i-cache-size = <32768>;
+                        timebase-frequency = <0>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        soc@fdf00000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0 0xfdf00000 0x100000>;
+                reg = <0xfdf00000 0x1000>;
+                bus-frequency = <0>;
+                compatible = "fsl,mpc8560-immr", "simple-bus";
+
+                memory-controller@2000 {
+                        compatible = "fsl,8540-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <18 2>;
+                };
+
+                l2-cache-controller@20000 {
+                        compatible = "fsl,8540-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <32>;
+                        cache-size = <0x40000>; // L2, 256K
+                        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;
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
+                        phy2: ethernet-phy@2 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <5 4>;
+                                reg = <2>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy4: ethernet-phy@4 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <5 4>;
+                                reg = <4>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2 30 2 34 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy2>;
+                };
+
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "TSEC";
+                        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 = <&phy4>;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        device_type = "open-pic";
+                };
+
+                cpm@919c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8560-cpm", "fsl,cpm2", "simple-bus";
+                        reg = <0x919c0 0x30>;
+                        ranges;
+
+                        muram@80000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0x80000 0x10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 0x4000 0x9000 0x2000>;
+                                };
+                        };
+
+                        brg@919f0 {
+                                compatible = "fsl,mpc8560-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <0x919f0 0x10 0x915f0 0x10>;
+                                clock-frequency = <0>;
+                        };
+
+                        cpmpic: pic@90c00 {
+                                interrupt-controller;
+                                #address-cells = <0>;
+                                #interrupt-cells = <2>;
+                                interrupts = <46 2>;
+                                interrupt-parent = <&mpic>;
+                                reg = <0x90c00 0x80>;
+                                compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
+                        };
+
+                        serial0: serial@91a20 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc8560-scc-uart",
+                                             "fsl,cpm2-scc-uart";
+                                reg = <0x91a20 0x20 0x88100 0x100>;
+                                fsl,cpm-brg = <2>;
+                                fsl,cpm-command = <0x4a00000>;
+                                interrupts = <41 8>;
+                                interrupt-parent = <&cpmpic>;
+                        };
+                };
+        };
+
+        pci0: pci@fdf08000 {
+                cell-index = <0>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+
+                        /* IDSEL 0x0c */
+                        0x6000 0 0 1 &mpic 1 1
+                        0x6000 0 0 2 &mpic 2 1
+                        0x6000 0 0 3 &mpic 3 1
+                        0x6000 0 0 4 &mpic 4 1
+
+                        /* IDSEL 0x0d */
+                        0x6800 0 0 1 &mpic 4 1
+                        0x6800 0 0 2 &mpic 1 1
+                        0x6800 0 0 3 &mpic 2 1
+                        0x6800 0 0 4 &mpic 3 1
+
+                        /* IDSEL 0x0e */
+                        0x7000 0 0 1 &mpic 3 1
+                        0x7000 0 0 2 &mpic 4 1
+                        0x7000 0 0 3 &mpic 1 1
+                        0x7000 0 0 4 &mpic 2 1
+
+                        /* IDSEL 0x0f */
+                        0x7800 0 0 1 &mpic 2 1
+                        0x7800 0 0 2 &mpic 3 1
+                        0x7800 0 0 3 &mpic 4 1
+                        0x7800 0 0 4 &mpic 1 1>;
+
+                interrupt-parent = <&mpic>;
+                interrupts = <24 2>;
+                bus-range = <0 0>;
+                ranges = <0x02000000 0 0x80000000 0x80000000 0 0x20000000
+                          0x01000000 0 0x00000000 0xe2000000 0 0x00100000>;
+                clock-frequency = <66666666>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xfdf08000 0x1000>;
+                compatible = "fsl,mpc8540-pcix", "fsl,mpc8540-pci";
+                device_type = "pci";
+        };
+};
diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts
new file mode 100644
index 000000000000..0706a4a13b9f
--- /dev/null
+++ b/arch/powerpc/boot/dts/taishan.dts
@@ -0,0 +1,383 @@
+/*
+ * Device Tree Source for IBM/AMCC Taishan
+ *
+ * Copyright 2007 IBM Corp.
+ * Hugh Blemings <hugh@au.ibm.com> based off code by
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>, David Gibson <dwg@au1.ibm.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.
+ */
+
+/ {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        model = "amcc,taishan";
+        compatible = "amcc,taishan";
+        dcr-parent = <&/cpus/cpu@0>;
+
+        aliases {
+                ethernet0 = &EMAC2;
+                ethernet1 = &EMAC3;
+                serial0 = &UART0;
+                serial1 = &UART1;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        model = "PowerPC,440GX";
+                        reg = <0>;
+                        clock-frequency = <2FAF0800>; // 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 */
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0 0>; // Filled in by zImage
+        };
+
+
+        UICB0: interrupt-controller-base {
+                compatible = "ibm,uic-440gx", "ibm,uic";
+                interrupt-controller;
+                cell-index = <3>;
+                dcr-reg = <200 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+
+
+        UIC0: interrupt-controller0 {
+                compatible = "ibm,uic-440gx", "ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0c0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <01 4 00 4>; /* cascade - first non-critical */
+                interrupt-parent = <&UICB0>;
+
+        };
+
+        UIC1: interrupt-controller1 {
+                compatible = "ibm,uic-440gx", "ibm,uic";
+                interrupt-controller;
+                cell-index = <1>;
+                dcr-reg = <0d0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <03 4 02 4>; /* cascade */
+                interrupt-parent = <&UICB0>;
+        };
+
+        UIC2: interrupt-controller2 {
+                compatible = "ibm,uic-440gx", "ibm,uic";
+                interrupt-controller;
+                cell-index = <2>; /* was 1 */
+                dcr-reg = <210 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <05 4 04 4>; /* cascade */
+                interrupt-parent = <&UICB0>;
+        };
+
+
+        CPC0: cpc {
+                compatible = "ibm,cpc-440gp";
+                dcr-reg = <0b0 003 0e0 010>;
+                // FIXME: anything else?
+        };
+
+        plb {
+                compatible = "ibm,plb-440gx", "ibm,plb4";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <9896800>; // 160MHz
+
+                SDRAM0: memory-controller {
+                        compatible = "ibm,sdram-440gp";
+                        dcr-reg = <010 2>;
+                        // FIXME: anything else?
+                };
+
+                SRAM0: sram {
+                        compatible = "ibm,sram-440gp";
+                        dcr-reg = <020 8 00a 1>;
+                };
+
+                DMA0: dma {
+                        // FIXME: ???
+                        compatible = "ibm,dma-440gp";
+                        dcr-reg = <100 027>;
+                };
+
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-440gx", "ibm,mcmal2";
+                        dcr-reg = <180 62>;
+                        num-tx-chans = <4>;
+                        num-rx-chans = <4>;
+                        interrupt-parent = <&MAL0>;
+                        interrupts = <0 1 2 3 4>;
+                        #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>;
+                };
+
+                POB0: opb {
+                        compatible = "ibm,opb-440gx", "ibm,opb";
+                        #address-cells = <1>;
+                        #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>;
+                        interrupt-parent = <&UIC1>;
+                        interrupts = <7 4>;
+                        clock-frequency = <4C4B400>; // 80MHz
+
+
+                        EBC0: ebc {
+                                compatible = "ibm,ebc-440gx", "ibm,ebc";
+                                dcr-reg = <012 2>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <4C4B400>; // 80MHz
+
+                                /* ranges property is supplied by zImage
+                                 * based on firmware's configuration of the
+                                 * EBC bridge */
+
+                                interrupts = <5 4>;
+                                interrupt-parent = <&UIC1>;
+
+                                /* TODO: Add other EBC devices */
+                        };
+
+
+
+                        UART0: serial@40000200 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <40000200 8>;
+                                virtual-reg = <e0000200>;
+                                clock-frequency = <A8C000>;
+                                current-speed = <1C200>; /* 115200 */
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <0 4>;
+                        };
+
+                        UART1: serial@40000300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <40000300 8>;
+                                virtual-reg = <e0000300>;
+                                clock-frequency = <A8C000>;
+                                current-speed = <1C200>; /* 115200 */
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+
+                        IIC0: i2c@40000400 {
+                                /* FIXME */
+                                device_type = "i2c";
+                                compatible = "ibm,iic-440gp", "ibm,iic";
+                                reg = <40000400 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+                        IIC1: i2c@40000500 {
+                                /* FIXME */
+                                device_type = "i2c";
+                                compatible = "ibm,iic-440gp", "ibm,iic";
+                                reg = <40000500 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <3 4>;
+                        };
+
+                        GPIO0: gpio@40000700 {
+                                /* FIXME */
+                                compatible = "ibm,gpio-440gp";
+                                reg = <40000700 20>;
+                        };
+
+                        ZMII0: emac-zmii@40000780 {
+                                device_type = "zgmii-interface";
+                                compatible = "ibm,zmii-440gx", "ibm,zmii";
+                                reg = <40000780 c>;
+                        };
+
+                        RGMII0: emac-rgmii@40000790 {
+                                device_type = "rgmii-interface";
+                                compatible = "ibm,rgmii";
+                                reg = <40000790 8>;
+                        };
+
+
+                        EMAC0: ethernet@40000800 {
+                                unused = <1>;
+                                linux,network-index = <2>;
+                                device_type = "network";
+                                compatible = "ibm,emac-440gx", "ibm,emac4";
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <1c 4 1d 4>;
+                                reg = <40000800 70>;
+                                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>;
+                                phy-mode = "rmii";
+                                phy-map = <00000001>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <0>;
+                        };
+                        EMAC1: ethernet@40000900 {
+                                unused = <1>;
+                                linux,network-index = <3>;
+                                device_type = "network";
+                                compatible = "ibm,emac-440gx", "ibm,emac4";
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <1e 4 1f 4>;
+                                reg = <40000900 70>;
+                                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>;
+                                phy-mode = "rmii";
+                                phy-map = <00000001>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <1>;
+                        };
+
+                        EMAC2: ethernet@40000c00 {
+                                linux,network-index = <0>;
+                                device_type = "network";
+                                compatible = "ibm,emac-440gx", "ibm,emac4";
+                                interrupt-parent = <&UIC2>;
+                                interrupts = <0 4 1 4>;
+                                reg = <40000c00 70>;
+                                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 = <5dc>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000001>;
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <0>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <2>;
+                        };
+
+                        EMAC3: ethernet@40000e00 {
+                                linux,network-index = <1>;
+                                device_type = "network";
+                                compatible = "ibm,emac-440gx", "ibm,emac4";
+                                interrupt-parent = <&UIC2>;
+                                interrupts = <2 4 3 4>;
+                                reg = <40000e00 70>;
+                                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 = <5dc>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000003>;
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <1>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <3>;
+                        };
+
+
+                        GPT0: gpt@40000a00 {
+                                /* FIXME */
+                                reg = <40000a00 d4>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <12 4 13 4 14 4 15 4 16 4>;
+                        };
+
+                };
+
+                PCIX0: pci@20ec00000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "ibm,plb440gp-pcix", "ibm,plb-pcix";
+                        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 */
+
+                        /* 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>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+
+                        interrupt-map-mask = <f800 0 0 7>;
+                        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
+
+                                /* 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
+                        >;
+                };
+        };
+
+        chosen {
+                linux,stdout-path = "/plb/opb/serial@40000300";
+        };
+};
diff --git a/arch/powerpc/boot/dts/tqm5200.dts b/arch/powerpc/boot/dts/tqm5200.dts
new file mode 100644
index 000000000000..c86464f007da
--- /dev/null
+++ b/arch/powerpc/boot/dts/tqm5200.dts
@@ -0,0 +1,177 @@
+/*
+ * TQM5200 board Device Tree Source
+ *
+ * Copyright (C) 2007 Semihalf
+ * Marian Balakowicz <m8@semihalf.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.
+ */
+
+/ {
+        model = "tqc,tqm5200";
+        compatible = "tqc,tqm5200";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,5200@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <20>;
+                        i-cache-line-size = <20>;
+                        d-cache-size = <4000>;          // L1, 16K
+                        i-cache-size = <4000>;          // L1, 16K
+                        timebase-frequency = <0>;       // from bootloader
+                        bus-frequency = <0>;            // from bootloader
+                        clock-frequency = <0>;          // from bootloader
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <00000000 04000000>;      // 64MB
+        };
+
+        soc5200@f0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc5200-immr";
+                ranges = <0 f0000000 0000c000>;
+                reg = <f0000000 00000100>;
+                bus-frequency = <0>;            // from bootloader
+                system-frequency = <0>;         // from bootloader
+
+                cdm@200 {
+                        compatible = "fsl,mpc5200-cdm";
+                        reg = <200 38>;
+                };
+
+                mpc5200_pic: interrupt-controller@500 {
+                        // 5200 interrupts are encoded into two levels;
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        compatible = "fsl,mpc5200-pic";
+                        reg = <500 80>;
+                };
+
+                timer@600 {     // General Purpose Timer
+                        compatible = "fsl,mpc5200-gpt";
+                        reg = <600 10>;
+                        interrupts = <1 9 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                        fsl,has-wdt;
+                };
+
+                gpio@b00 {
+                        compatible = "fsl,mpc5200-gpio";
+                        reg = <b00 40>;
+                        interrupts = <1 7 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                usb@1000 {
+                        compatible = "fsl,mpc5200-ohci","ohci-be";
+                        reg = <1000 ff>;
+                        interrupts = <2 6 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                dma-controller@1200 {
+                        compatible = "fsl,mpc5200-bestcomm";
+                        reg = <1200 80>;
+                        interrupts = <3 0 0  3 1 0  3 2 0  3 3 0
+                                      3 4 0  3 5 0  3 6 0  3 7 0
+                                      3 8 0  3 9 0  3 a 0  3 b 0
+                                      3 c 0  3 d 0  3 e 0  3 f 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                xlb@1f00 {
+                        compatible = "fsl,mpc5200-xlb";
+                        reg = <1f00 100>;
+                };
+
+                serial@2000 {           // PSC1
+                        device_type = "serial";
+                        compatible = "fsl,mpc5200-psc-uart";
+                        port-number = <0>;  // Logical port assignment
+                        reg = <2000 100>;
+                        interrupts = <2 1 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                serial@2200 {           // PSC2
+                        device_type = "serial";
+                        compatible = "fsl,mpc5200-psc-uart";
+                        port-number = <1>;  // Logical port assignment
+                        reg = <2200 100>;
+                        interrupts = <2 2 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                serial@2400 {           // PSC3
+                        device_type = "serial";
+                        compatible = "fsl,mpc5200-psc-uart";
+                        port-number = <2>;  // Logical port assignment
+                        reg = <2400 100>;
+                        interrupts = <2 3 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                ethernet@3000 {
+                        device_type = "network";
+                        compatible = "fsl,mpc5200-fec";
+                        reg = <3000 800>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <2 5 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                ata@3a00 {
+                        compatible = "fsl,mpc5200-ata";
+                        reg = <3a00 100>;
+                        interrupts = <2 7 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                };
+
+                i2c@3d40 {
+                        compatible = "fsl,mpc5200-i2c","fsl-i2c";
+                        reg = <3d40 40>;
+                        interrupts = <2 10 0>;
+                        interrupt-parent = <&mpc5200_pic>;
+                        fsl5200-clocking;
+                };
+
+                sram@8000 {
+                        compatible = "fsl,mpc5200-sram";
+                        reg = <8000 4000>;
+                };
+        };
+
+        pci@f0000d00 {
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                device_type = "pci";
+                compatible = "fsl,mpc5200-pci";
+                reg = <f0000d00 100>;
+                interrupt-map-mask = <f800 0 0 7>;
+                interrupt-map = <c000 0 0 1 &mpc5200_pic 0 0 3
+                                 c000 0 0 2 &mpc5200_pic 0 0 3
+                                 c000 0 0 3 &mpc5200_pic 0 0 3
+                                 c000 0 0 4 &mpc5200_pic 0 0 3>;
+                clock-frequency = <0>; // From boot loader
+                interrupts = <2 8 0 2 9 0 2 a 0>;
+                interrupt-parent = <&mpc5200_pic>;
+                bus-range = <0 0>;
+                ranges = <42000000 0 80000000 80000000 0 10000000
+                          02000000 0 90000000 90000000 0 10000000
+                          01000000 0 00000000 a0000000 0 01000000>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/tqm8540.dts b/arch/powerpc/boot/dts/tqm8540.dts
new file mode 100644
index 000000000000..1addb3ae719e
--- /dev/null
+++ b/arch/powerpc/boot/dts/tqm8540.dts
@@ -0,0 +1,204 @@
+/*
+ * TQM 8540 Device Tree Source
+ *
+ * Copyright 2008 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "tqm,8540";
+        compatible = "tqm,8540", "tqm,85xx";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8540@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <32768>;
+                        i-cache-size = <32768>;
+                        timebase-frequency = <0>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        soc@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xe0000000 0x100000>;
+                reg = <0xe0000000 0x200>;
+                bus-frequency = <0>;
+                compatible = "fsl,mpc8540-immr", "simple-bus";
+
+                memory-controller@2000 {
+                        compatible = "fsl,8540-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <18 2>;
+                };
+
+                l2-cache-controller@20000 {
+                        compatible = "fsl,8540-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <32>;
+                        cache-size = <0x40000>; // L2, 256K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <16 2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1337";
+                                reg = <0x68>;
+                        };
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
+                        phy1: ethernet-phy@1 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <1>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy2: ethernet-phy@2 {
+                                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";
+                        };
+                };
+
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2 30 2 34 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy2>;
+                };
+
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "TSEC";
+                        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 = "FEC";
+                        compatible = "gianfar";
+                        reg = <0x26000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <41 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy3>;
+                };
+
+                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?
+                        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?
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        device_type = "open-pic";
+                };
+        };
+
+        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 = <66666666>;
+                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>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/tqm8541.dts b/arch/powerpc/boot/dts/tqm8541.dts
new file mode 100644
index 000000000000..9e01093f496e
--- /dev/null
+++ b/arch/powerpc/boot/dts/tqm8541.dts
@@ -0,0 +1,228 @@
+/*
+ * TQM 8541 Device Tree Source
+ *
+ * Copyright 2008 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "tqm,8541";
+        compatible = "tqm,8541", "tqm,85xx";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8541@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <32768>;
+                        i-cache-size = <32768>;
+                        timebase-frequency = <0>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        soc@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xe0000000 0x100000>;
+                reg = <0xe0000000 0x200>;
+                bus-frequency = <0>;
+                compatible = "fsl,mpc8541-immr", "simple-bus";
+
+                memory-controller@2000 {
+                        compatible = "fsl,8540-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <18 2>;
+                };
+
+                l2-cache-controller@20000 {
+                        compatible = "fsl,8540-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <32>;
+                        cache-size = <0x40000>; // L2, 256K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <16 2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1337";
+                                reg = <0x68>;
+                        };
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
+                        phy1: ethernet-phy@1 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <1>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy2: ethernet-phy@2 {
+                                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";
+                        };
+                };
+
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2 30 2 34 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy2>;
+                };
+
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "TSEC";
+                        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>;
+                };
+
+                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?
+                        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?
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        device_type = "open-pic";
+                };
+
+                cpm@919c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8541-cpm", "fsl,cpm2", "simple-bus";
+                        reg = <0x919c0 0x30>;
+                        ranges;
+
+                        muram@80000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0x80000 0x10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 0x2000 0x9000 0x1000>;
+                                };
+                        };
+
+                        brg@919f0 {
+                                compatible = "fsl,mpc8541-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <0x919f0 0x10 0x915f0 0x10>;
+                                clock-frequency = <0>;
+                        };
+
+                        cpmpic: pic@90c00 {
+                                interrupt-controller;
+                                #address-cells = <0>;
+                                #interrupt-cells = <2>;
+                                interrupts = <46 2>;
+                                interrupt-parent = <&mpic>;
+                                reg = <0x90c00 0x80>;
+                                compatible = "fsl,mpc8541-cpm-pic", "fsl,cpm2-pic";
+                        };
+                };
+        };
+
+        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 = <66666666>;
+                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>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/tqm8555.dts b/arch/powerpc/boot/dts/tqm8555.dts
new file mode 100644
index 000000000000..a20eb06c482f
--- /dev/null
+++ b/arch/powerpc/boot/dts/tqm8555.dts
@@ -0,0 +1,228 @@
+/*
+ * TQM 8555 Device Tree Source
+ *
+ * Copyright 2008 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "tqm,8555";
+        compatible = "tqm,8555", "tqm,85xx";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8555@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <32768>;
+                        i-cache-size = <32768>;
+                        timebase-frequency = <0>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        soc@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xe0000000 0x100000>;
+                reg = <0xe0000000 0x200>;
+                bus-frequency = <0>;
+                compatible = "fsl,mpc8555-immr", "simple-bus";
+
+                memory-controller@2000 {
+                        compatible = "fsl,8540-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <18 2>;
+                };
+
+                l2-cache-controller@20000 {
+                        compatible = "fsl,8540-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <32>;
+                        cache-size = <0x40000>; // L2, 256K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <16 2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1337";
+                                reg = <0x68>;
+                        };
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
+                        phy1: ethernet-phy@1 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <1>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy2: ethernet-phy@2 {
+                                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";
+                        };
+                };
+
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2 30 2 34 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy2>;
+                };
+
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "TSEC";
+                        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>;
+                };
+
+                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?
+                        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?
+                        interrupts = <42 2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        device_type = "open-pic";
+                };
+
+                cpm@919c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8555-cpm", "fsl,cpm2", "simple-bus";
+                        reg = <0x919c0 0x30>;
+                        ranges;
+
+                        muram@80000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0x80000 0x10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 0x2000 0x9000 0x1000>;
+                                };
+                        };
+
+                        brg@919f0 {
+                                compatible = "fsl,mpc8555-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <0x919f0 0x10 0x915f0 0x10>;
+                                clock-frequency = <0>;
+                        };
+
+                        cpmpic: pic@90c00 {
+                                interrupt-controller;
+                                #address-cells = <0>;
+                                #interrupt-cells = <2>;
+                                interrupts = <46 2>;
+                                interrupt-parent = <&mpic>;
+                                reg = <0x90c00 0x80>;
+                                compatible = "fsl,mpc8555-cpm-pic", "fsl,cpm2-pic";
+                        };
+                };
+        };
+
+        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 = <66666666>;
+                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>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/tqm8560.dts b/arch/powerpc/boot/dts/tqm8560.dts
new file mode 100644
index 000000000000..b9ac6c943b89
--- /dev/null
+++ b/arch/powerpc/boot/dts/tqm8560.dts
@@ -0,0 +1,245 @@
+/*
+ * TQM 8560 Device Tree Source
+ *
+ * Copyright 2008 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+
+/ {
+        model = "tqm,8560";
+        compatible = "tqm,8560", "tqm,85xx";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+                serial0 = &serial0;
+                serial1 = &serial1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8560@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <32768>;
+                        i-cache-size = <32768>;
+                        timebase-frequency = <0>;
+                        bus-frequency = <0>;
+                        clock-frequency = <0>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        soc@e0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x0 0xe0000000 0x100000>;
+                reg = <0xe0000000 0x200>;
+                bus-frequency = <0>;
+                compatible = "fsl,mpc8560-immr", "simple-bus";
+
+                memory-controller@2000 {
+                        compatible = "fsl,8540-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&mpic>;
+                        interrupts = <18 2>;
+                };
+
+                l2-cache-controller@20000 {
+                        compatible = "fsl,8540-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <32>;
+                        cache-size = <0x40000>; // L2, 256K
+                        interrupt-parent = <&mpic>;
+                        interrupts = <16 2>;
+                };
+
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <43 2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1337";
+                                reg = <0x68>;
+                        };
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
+                        phy1: ethernet-phy@1 {
+                                interrupt-parent = <&mpic>;
+                                interrupts = <8 1>;
+                                reg = <1>;
+                                device_type = "ethernet-phy";
+                        };
+                        phy2: ethernet-phy@2 {
+                                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";
+                        };
+                };
+
+                enet0: ethernet@24000 {
+                        cell-index = <0>;
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <29 2 30 2 34 2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy2>;
+                };
+
+                enet1: ethernet@25000 {
+                        cell-index = <1>;
+                        device_type = "network";
+                        model = "TSEC";
+                        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>;
+                };
+
+                mpic: pic@40000 {
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        device_type = "open-pic";
+                };
+
+                cpm@919c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8560-cpm", "fsl,cpm2", "simple-bus";
+                        reg = <0x919c0 0x30>;
+                        ranges;
+
+                        muram@80000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0x80000 0x10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0 0x4000 0x9000 0x2000>;
+                                };
+                        };
+
+                        brg@919f0 {
+                                compatible = "fsl,mpc8560-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <0x919f0 0x10 0x915f0 0x10>;
+                                clock-frequency = <0>;
+                        };
+
+                        cpmpic: pic@90c00 {
+                                interrupt-controller;
+                                #address-cells = <0>;
+                                #interrupt-cells = <2>;
+                                interrupts = <46 2>;
+                                interrupt-parent = <&mpic>;
+                                reg = <0x90c00 0x80>;
+                                compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
+                        };
+
+                        serial0: serial@91a00 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc8560-scc-uart",
+                                             "fsl,cpm2-scc-uart";
+                                reg = <0x91a00 0x20 0x88000 0x100>;
+                                fsl,cpm-brg = <1>;
+                                fsl,cpm-command = <0x800000>;
+                                current-speed = <115200>;
+                                interrupts = <40 8>;
+                                interrupt-parent = <&cpmpic>;
+                        };
+
+                        serial1: serial@91a20 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc8560-scc-uart",
+                                             "fsl,cpm2-scc-uart";
+                                reg = <0x91a20 0x20 0x88100 0x100>;
+                                fsl,cpm-brg = <2>;
+                                fsl,cpm-command = <0x4a00000>;
+                                current-speed = <115200>;
+                                interrupts = <41 8>;
+                                interrupt-parent = <&cpmpic>;
+                        };
+
+                        enet2: ethernet@91340 {
+                                device_type = "network";
+                                compatible = "fsl,mpc8560-fcc-enet",
+                                             "fsl,cpm2-fcc-enet";
+                                reg = <0x91340 0x20 0x88600 0x100 0x913d0 0x1>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                                fsl,cpm-command = <0x1a400300>;
+                                interrupts = <34 8>;
+                                interrupt-parent = <&cpmpic>;
+                                phy-handle = <&phy3>;
+                        };
+                };
+        };
+
+        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 = <66666666>;
+                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>;
+        };
+};
diff --git a/arch/powerpc/boot/dts/walnut.dts b/arch/powerpc/boot/dts/walnut.dts
index 754fa3960f83..dcc21b0438e5 100644
--- a/arch/powerpc/boot/dts/walnut.dts
+++ b/arch/powerpc/boot/dts/walnut.dts
@@ -14,14 +14,21 @@
         #size-cells = <1>;
         model = "ibm,walnut";
         compatible = "ibm,walnut";
-        dcr-parent = <&/cpus/PowerPC,405GP@0>;
+        dcr-parent = <&/cpus/cpu@0>;
+
+        aliases {
+                ethernet0 = &EMAC;
+                serial0 = &UART0;
+                serial1 = &UART1;
+        };
 
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
 
-                PowerPC,405GP@0 {
+                cpu@0 {
                         device_type = "cpu";
+                        model = "PowerPC,405GP";
                         reg = <0>;
                         clock-frequency = <bebc200>; /* Filled in by zImage */
                         timebase-frequency = <0>; /* Filled in by zImage */
@@ -168,9 +175,10 @@
                                 };
                         };
 
-                        ds1743@1,0 {
+                        nvram@1,0 {
                                 /* NVRAM and RTC */
-                                compatible = "ds1743";
+                                compatible = "ds1743-nvram";
+                                #bytes = <2000>;
                                 reg = <1 0 2000>;
                         };
 
@@ -190,6 +198,45 @@
                                 virtual-reg = <f0300005>;
                         };
                 };
+
+                PCI0: pci@ec000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #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 */
+
+                        /* 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>;
+
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 80000000>;
+
+                        /* Walnut has all 4 IRQ pins tied together per slot */
+                        interrupt-map-mask = <f800 0 0 0>;
+                        interrupt-map = <
+                                /* IDSEL 1 */
+                                0800 0 0 0 &UIC0 1c 8
+
+                                /* IDSEL 2 */
+                                1000 0 0 0 &UIC0 1d 8
+
+                                /* IDSEL 3 */
+                                1800 0 0 0 &UIC0 1e 8
+
+                                /* IDSEL 4 */
+                                2000 0 0 0 &UIC0 1f 8
+                        >;
+                };
         };
 
         chosen {
diff --git a/arch/powerpc/boot/dts/warp.dts b/arch/powerpc/boot/dts/warp.dts
new file mode 100644
index 000000000000..dc1499d30f43
--- /dev/null
+++ b/arch/powerpc/boot/dts/warp.dts
@@ -0,0 +1,239 @@
+/*
+ * Device Tree Source for PIKA Warp
+ *
+ * Copyright (c) 2008 PIKA Technologies
+ *   Sean MacLennan <smaclennan@pikatech.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.
+ */
+
+/ {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        model = "pika,warp";
+        compatible = "pika,warp";
+        dcr-parent = <&/cpus/cpu@0>;
+
+        aliases {
+                ethernet0 = &EMAC0;
+                serial0 = &UART0;
+        };
+
+        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 = <20>;
+                        d-cache-line-size = <20>;
+                        i-cache-size = <8000>;
+                        d-cache-size = <8000>;
+                        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 = <0c0 009>;
+                #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 = <0d0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        SDR0: sdr {
+                compatible = "ibm,sdr-440ep";
+                dcr-reg = <00e 002>;
+        };
+
+        CPR0: cpr {
+                compatible = "ibm,cpr-440ep";
+                dcr-reg = <00c 002>;
+        };
+
+        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 = <010 2>;
+                };
+
+                DMA0: dma {
+                        compatible = "ibm,dma-440ep", "ibm,dma-440gp";
+                        dcr-reg = <100 027>;
+                };
+
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal";
+                        dcr-reg = <180 62>;
+                        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 a 4
+                                        /*RXEOB*/ 1 &UIC0 b 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>;
+                        ranges = <00000000 0 00000000 80000000
+                                  80000000 0 80000000 80000000>;
+                        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 = <012 2>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                interrupts = <5 1>;
+                                interrupt-parent = <&UIC1>;
+
+                                fpga@2,0 {
+                                        compatible = "pika,fpga";
+                                        reg = <2 0 2200>;
+                                        interrupts = <18 8>;
+                                        interrupt-parent = <&UIC0>;
+                                };
+
+                                nor_flash@0,0 {
+                                        compatible = "amd,s29gl512n", "cfi-flash";
+                                        bank-width = <2>;
+                                        reg = <0 0 4000000>;
+                                        #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 {
+                                                label = "fpga";
+                                                reg = <3f00000 40000>;
+                                        };
+                                        partition@3f40000 {
+                                                label = "env";
+                                                reg = <3f40000 40000>;
+                                        };
+                                        partition@3f80000 {
+                                                label = "u-boot";
+                                                reg = <3f80000 80000>;
+                                        };
+                                };
+                        };
+
+                        UART0: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600300 8>;
+                                virtual-reg = <ef600300>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                current-speed = <1c200>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <0 4>;
+                        };
+
+                        IIC0: i2c@ef600700 {
+                                compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
+                                reg = <ef600700 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+
+                        GPIO0: gpio@ef600b00 {
+                                compatible = "ibm,gpio-440ep";
+                                reg = <ef600b00 48>;
+                        };
+
+                        GPIO1: gpio@ef600c00 {
+                                compatible = "ibm,gpio-440ep";
+                                reg = <ef600c00 48>;
+                        };
+
+                        ZMII0: emac-zmii@ef600d00 {
+                                compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii";
+                                reg = <ef600d00 c>;
+                        };
+
+                        EMAC0: ethernet@ef600e00 {
+                                linux,network-index = <0>;
+                                device_type = "network";
+                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <1c 4 1d 4>;
+                                reg = <ef600e00 70>;
+                                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>;
+                                phy-mode = "rmii";
+                                phy-map = <00000000>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <0>;
+                        };
+
+                        usb@ef601000 {
+                                compatible = "ohci-be";
+                                reg = <ef601000 80>;
+                                interrupts = <8 1 9 1>;
+                                interrupt-parent = < &UIC1 >;
+                        };
+                };
+        };
+
+        chosen {
+                linux,stdout-path = "/plb/opb/serial@ef600300";
+        };
+};
diff --git a/arch/powerpc/boot/ebony.c b/arch/powerpc/boot/ebony.c
index 86c0f5df0a86..f61364c47a76 100644
--- a/arch/powerpc/boot/ebony.c
+++ b/arch/powerpc/boot/ebony.c
@@ -31,66 +31,6 @@
 
 static u8 *ebony_mac0, *ebony_mac1;
 
-/* Calculate 440GP clocks */
-void ibm440gp_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)
-{
-        u32 sys0 = mfdcr(DCRN_CPC0_SYS0);
-        u32 cr0 = mfdcr(DCRN_CPC0_CR0);
-        u32 cpu, plb, opb, ebc, tb, uart0, uart1, m;
-        u32 opdv = CPC0_SYS0_OPDV(sys0);
-        u32 epdv = CPC0_SYS0_EPDV(sys0);
-
-        if (sys0 & CPC0_SYS0_BYPASS) {
-                /* Bypass system PLL */
-                cpu = plb = sysclk;
-        } else {
-                if (sys0 & CPC0_SYS0_EXTSL)
-                        /* PerClk */
-                        m = CPC0_SYS0_FWDVB(sys0) * opdv * epdv;
-                else
-                        /* CPU clock */
-                        m = CPC0_SYS0_FBDV(sys0) * CPC0_SYS0_FWDVA(sys0);
-                cpu = sysclk * m / CPC0_SYS0_FWDVA(sys0);
-                plb = sysclk * m / CPC0_SYS0_FWDVB(sys0);
-        }
-
-        opb = plb / opdv;
-        ebc = opb / epdv;
-
-        /* FIXME: Check if this is for all 440GP, or just Ebony */
-        if ((mfpvr() & 0xf0000fff) == 0x40000440)
-                /* Rev. B 440GP, use external system clock */
-                tb = sysclk;
-        else
-                /* Rev. C 440GP, errata force us to use internal clock */
-                tb = cpu;
-
-        if (cr0 & CPC0_CR0_U0EC)
-                /* External UART clock */
-                uart0 = ser_clk;
-        else
-                /* Internal UART clock */
-                uart0 = plb / CPC0_CR0_UDIV(cr0);
-
-        if (cr0 & CPC0_CR0_U1EC)
-                /* External UART clock */
-                uart1 = ser_clk;
-        else
-                /* Internal UART clock */
-                uart1 = plb / CPC0_CR0_UDIV(cr0);
-
-        printf("PPC440GP: SysClk = %dMHz (%x)\n\r",
-               (sysclk + 500000) / 1000000, sysclk);
-
-        dt_fixup_cpu_clocks(cpu, tb, 0);
-
-        dt_fixup_clock("/plb", plb);
-        dt_fixup_clock("/plb/opb", opb);
-        dt_fixup_clock("/plb/opb/ebc", ebc);
-        dt_fixup_clock("/plb/opb/serial@40000200", uart0);
-        dt_fixup_clock("/plb/opb/serial@40000300", uart1);
-}
-
 #define EBONY_FPGA_PATH         "/plb/opb/ebc/fpga"
 #define EBONY_FPGA_FLASH_SEL    0x01
 #define EBONY_SMALL_FLASH_PATH  "/plb/opb/ebc/small-flash"
@@ -134,7 +74,7 @@ static void ebony_fixups(void)
         unsigned long sysclk = 33000000;
 
         ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
-        ibm4xx_fixup_memsize();
+        ibm4xx_sdram_fixup_memsize();
         dt_fixup_mac_addresses(ebony_mac0, ebony_mac1);
         ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
         ebony_flashsel_fixup();
@@ -146,6 +86,6 @@ void ebony_init(void *mac0, void *mac1)
         platform_ops.exit = ibm44x_dbcr_reset;
         ebony_mac0 = mac0;
         ebony_mac1 = mac1;
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
 }
diff --git a/arch/powerpc/boot/ep405.c b/arch/powerpc/boot/ep405.c
new file mode 100644
index 000000000000..2d08a862cbea
--- /dev/null
+++ b/arch/powerpc/boot/ep405.c
@@ -0,0 +1,74 @@
+/*
+ * Embedded Planet EP405 with PlanetCore firmware
+ *
+ * (c) Benjamin Herrenschmidt <benh@kernel.crashing.org>, IBM Corp,\
+ *
+ * Based on ep88xc.c by
+ *
+ * Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 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 "ops.h"
+#include "stdio.h"
+#include "planetcore.h"
+#include "dcr.h"
+#include "4xx.h"
+#include "io.h"
+
+static char *table;
+static u64 mem_size;
+
+static void platform_fixups(void)
+{
+        u64 val;
+        void *nvrtc;
+
+        dt_fixup_memory(0, mem_size);
+        planetcore_set_mac_addrs(table);
+
+        if (!planetcore_get_decimal(table, PLANETCORE_KEY_CRYSTAL_HZ, &val)) {
+                printf("No PlanetCore crystal frequency key.\r\n");
+                return;
+        }
+        ibm405gp_fixup_clocks(val, 0xa8c000);
+        ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
+        ibm4xx_fixup_ebc_ranges("/plb/ebc");
+
+        if (!planetcore_get_decimal(table, PLANETCORE_KEY_KB_NVRAM, &val)) {
+                printf("No PlanetCore NVRAM size key.\r\n");
+                return;
+        }
+        nvrtc = finddevice("/plb/ebc/nvrtc@4,200000");
+        if (nvrtc != NULL) {
+                u32 reg[3] = { 4, 0x200000, 0};
+                getprop(nvrtc, "reg", reg, 3);
+                reg[2] = (val << 10) & 0xffffffff;
+                setprop(nvrtc, "reg", reg, 3);
+        }
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        table = (char *)r3;
+        planetcore_prepare_table(table);
+
+        if (!planetcore_get_decimal(table, PLANETCORE_KEY_MB_RAM, &mem_size))
+                return;
+
+        mem_size *= 1024 * 1024;
+        simple_alloc_init(_end, mem_size - (unsigned long)_end, 32, 64);
+
+        fdt_init(_dtb_start);
+
+        planetcore_set_stdout_path(table);
+
+        serial_console_init();
+        platform_ops.fixups = platform_fixups;
+}
diff --git a/arch/powerpc/boot/ep8248e.c b/arch/powerpc/boot/ep8248e.c
new file mode 100644
index 000000000000..f57d14d0272b
--- /dev/null
+++ b/arch/powerpc/boot/ep8248e.c
@@ -0,0 +1,55 @@
+/*
+ * Embedded Planet EP8248E with PlanetCore firmware
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 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 "ops.h"
+#include "stdio.h"
+#include "planetcore.h"
+#include "pq2.h"
+
+static char *table;
+static u64 mem_size;
+
+#include <io.h>
+
+static void platform_fixups(void)
+{
+        u64 val;
+
+        dt_fixup_memory(0, mem_size);
+        planetcore_set_mac_addrs(table);
+
+        if (!planetcore_get_decimal(table, PLANETCORE_KEY_CRYSTAL_HZ, &val)) {
+                printf("No PlanetCore crystal frequency key.\r\n");
+                return;
+        }
+
+        pq2_fixup_clocks(val);
+}
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        table = (char *)r3;
+        planetcore_prepare_table(table);
+
+        if (!planetcore_get_decimal(table, PLANETCORE_KEY_MB_RAM, &mem_size))
+                return;
+
+        mem_size *= 1024 * 1024;
+        simple_alloc_init(_end, mem_size - (unsigned long)_end, 32, 64);
+
+        fdt_init(_dtb_start);
+
+        planetcore_set_stdout_path(table);
+        serial_console_init();
+        platform_ops.fixups = platform_fixups;
+}
diff --git a/arch/powerpc/boot/ep88xc.c b/arch/powerpc/boot/ep88xc.c
index 6b87cdce3fe7..a400f5407155 100644
--- a/arch/powerpc/boot/ep88xc.c
+++ b/arch/powerpc/boot/ep88xc.c
@@ -45,7 +45,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
         mem_size *= 1024 * 1024;
         simple_alloc_init(_end, mem_size - (unsigned long)_end, 32, 64);
 
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
 
         planetcore_set_stdout_path(table);
 
diff --git a/arch/powerpc/boot/flatdevtree.c b/arch/powerpc/boot/flatdevtree.c
deleted file mode 100644
index cf30675c6116..000000000000
--- a/arch/powerpc/boot/flatdevtree.c
+++ /dev/null
@@ -1,1036 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * Copyright Pantelis Antoniou 2006
- * Copyright (C) IBM Corporation 2006
- *
- * Authors: Pantelis Antoniou <pantelis@embeddedalley.com>
- *          Hollis Blanchard <hollisb@us.ibm.com>
- *          Mark A. Greer <mgreer@mvista.com>
- *          Paul Mackerras <paulus@samba.org>
- */
-
-#include <string.h>
-#include <stddef.h>
-#include "flatdevtree.h"
-#include "flatdevtree_env.h"
-
-#define _ALIGN(x, al)   (((x) + (al) - 1) & ~((al) - 1))
-
-static char *ft_root_node(struct ft_cxt *cxt)
-{
-        return cxt->rgn[FT_STRUCT].start;
-}
-
-/* Routines for keeping node ptrs returned by ft_find_device current */
-/* First entry not used b/c it would return 0 and be taken as NULL/error */
-static void *ft_get_phandle(struct ft_cxt *cxt, char *node)
-{
-        unsigned int i;
-
-        if (!node)
-                return NULL;
-
-        for (i = 1; i < cxt->nodes_used; i++)   /* already there? */
-                if (cxt->node_tbl[i] == node)
-                        return (void *)i;
-
-        if (cxt->nodes_used < cxt->node_max) {
-                cxt->node_tbl[cxt->nodes_used] = node;
-                return (void *)cxt->nodes_used++;
-        }
-
-        return NULL;
-}
-
-static char *ft_node_ph2node(struct ft_cxt *cxt, const void *phandle)
-{
-        unsigned int i = (unsigned int)phandle;
-
-        if (i < cxt->nodes_used)
-                return cxt->node_tbl[i];
-        return NULL;
-}
-
-static void ft_node_update_before(struct ft_cxt *cxt, char *addr, int shift)
-{
-        unsigned int i;
-
-        if (shift == 0)
-                return;
-
-        for (i = 1; i < cxt->nodes_used; i++)
-                if (cxt->node_tbl[i] < addr)
-                        cxt->node_tbl[i] += shift;
-}
-
-static void ft_node_update_after(struct ft_cxt *cxt, char *addr, int shift)
-{
-        unsigned int i;
-
-        if (shift == 0)
-                return;
-
-        for (i = 1; i < cxt->nodes_used; i++)
-                if (cxt->node_tbl[i] >= addr)
-                        cxt->node_tbl[i] += shift;
-}
-
-/* Struct used to return info from ft_next() */
-struct ft_atom {
-        u32 tag;
-        const char *name;
-        void *data;
-        u32 size;
-};
-
-/* Set ptrs to current one's info; return addr of next one */
-static char *ft_next(struct ft_cxt *cxt, char *p, struct ft_atom *ret)
-{
-        u32 sz;
-
-        if (p >= cxt->rgn[FT_STRUCT].start + cxt->rgn[FT_STRUCT].size)
-                return NULL;
-
-        ret->tag = be32_to_cpu(*(u32 *) p);
-        p += 4;
-
-        switch (ret->tag) {     /* Tag */
-        case OF_DT_BEGIN_NODE:
-                ret->name = p;
-                ret->data = (void *)(p - 4);    /* start of node */
-                p += _ALIGN(strlen(p) + 1, 4);
-                break;
-        case OF_DT_PROP:
-                ret->size = sz = be32_to_cpu(*(u32 *) p);
-                ret->name = cxt->str_anchor + be32_to_cpu(*(u32 *) (p + 4));
-                ret->data = (void *)(p + 8);
-                p += 8 + _ALIGN(sz, 4);
-                break;
-        case OF_DT_END_NODE:
-        case OF_DT_NOP:
-                break;
-        case OF_DT_END:
-        default:
-                p = NULL;
-                break;
-        }
-
-        return p;
-}
-
-#define HDR_SIZE        _ALIGN(sizeof(struct boot_param_header), 8)
-#define EXPAND_INCR     1024    /* alloc this much extra when expanding */
-
-/* Copy the tree to a newly-allocated region and put things in order */
-static int ft_reorder(struct ft_cxt *cxt, int nextra)
-{
-        unsigned long tot;
-        enum ft_rgn_id r;
-        char *p, *pend;
-        int stroff;
-
-        tot = HDR_SIZE + EXPAND_INCR;
-        for (r = FT_RSVMAP; r <= FT_STRINGS; ++r)
-                tot += cxt->rgn[r].size;
-        if (nextra > 0)
-                tot += nextra;
-        tot = _ALIGN(tot, 8);
-
-        if (!cxt->realloc)
-                return 0;
-        p = cxt->realloc(NULL, tot);
-        if (!p)
-                return 0;
-
-        memcpy(p, cxt->bph, sizeof(struct boot_param_header));
-        /* offsets get fixed up later */
-
-        cxt->bph = (struct boot_param_header *)p;
-        cxt->max_size = tot;
-        pend = p + tot;
-        p += HDR_SIZE;
-
-        memcpy(p, cxt->rgn[FT_RSVMAP].start, cxt->rgn[FT_RSVMAP].size);
-        cxt->rgn[FT_RSVMAP].start = p;
-        p += cxt->rgn[FT_RSVMAP].size;
-
-        memcpy(p, cxt->rgn[FT_STRUCT].start, cxt->rgn[FT_STRUCT].size);
-        ft_node_update_after(cxt, cxt->rgn[FT_STRUCT].start,
-                        p - cxt->rgn[FT_STRUCT].start);
-        cxt->p += p - cxt->rgn[FT_STRUCT].start;
-        cxt->rgn[FT_STRUCT].start = p;
-
-        p = pend - cxt->rgn[FT_STRINGS].size;
-        memcpy(p, cxt->rgn[FT_STRINGS].start, cxt->rgn[FT_STRINGS].size);
-        stroff = cxt->str_anchor - cxt->rgn[FT_STRINGS].start;
-        cxt->rgn[FT_STRINGS].start = p;
-        cxt->str_anchor = p + stroff;
-
-        cxt->isordered = 1;
-        return 1;
-}
-
-static inline char *prev_end(struct ft_cxt *cxt, enum ft_rgn_id r)
-{
-        if (r > FT_RSVMAP)
-                return cxt->rgn[r - 1].start + cxt->rgn[r - 1].size;
-        return (char *)cxt->bph + HDR_SIZE;
-}
-
-static inline char *next_start(struct ft_cxt *cxt, enum ft_rgn_id r)
-{
-        if (r < FT_STRINGS)
-                return cxt->rgn[r + 1].start;
-        return (char *)cxt->bph + cxt->max_size;
-}
-
-/*
- * See if we can expand region rgn by nextra bytes by using up
- * free space after or before the region.
- */
-static int ft_shuffle(struct ft_cxt *cxt, char **pp, enum ft_rgn_id rgn,
-                int nextra)
-{
-        char *p = *pp;
-        char *rgn_start, *rgn_end;
-
-        rgn_start = cxt->rgn[rgn].start;
-        rgn_end = rgn_start + cxt->rgn[rgn].size;
-        if (nextra <= 0 || rgn_end + nextra <= next_start(cxt, rgn)) {
-                /* move following stuff */
-                if (p < rgn_end) {
-                        if (nextra < 0)
-                                memmove(p, p - nextra, rgn_end - p + nextra);
-                        else
-                                memmove(p + nextra, p, rgn_end - p);
-                        if (rgn == FT_STRUCT)
-                                ft_node_update_after(cxt, p, nextra);
-                }
-                cxt->rgn[rgn].size += nextra;
-                if (rgn == FT_STRINGS)
-                        /* assumes strings only added at beginning */
-                        cxt->str_anchor += nextra;
-                return 1;
-        }
-        if (prev_end(cxt, rgn) <= rgn_start - nextra) {
-                /* move preceding stuff */
-                if (p > rgn_start) {
-                        memmove(rgn_start - nextra, rgn_start, p - rgn_start);
-                        if (rgn == FT_STRUCT)
-                                ft_node_update_before(cxt, p, -nextra);
-                }
-                *pp -= nextra;
-                cxt->rgn[rgn].start -= nextra;
-                cxt->rgn[rgn].size += nextra;
-                return 1;
-        }
-        return 0;
-}
-
-static int ft_make_space(struct ft_cxt *cxt, char **pp, enum ft_rgn_id rgn,
-                         int nextra)
-{
-        unsigned long size, ssize, tot;
-        char *str, *next;
-        enum ft_rgn_id r;
-
-        if (!cxt->isordered) {
-                unsigned long rgn_off = *pp - cxt->rgn[rgn].start;
-
-                if (!ft_reorder(cxt, nextra))
-                        return 0;
-
-                *pp = cxt->rgn[rgn].start + rgn_off;
-        }
-        if (ft_shuffle(cxt, pp, rgn, nextra))
-                return 1;
-
-        /* See if there is space after the strings section */
-        ssize = cxt->rgn[FT_STRINGS].size;
-        if (cxt->rgn[FT_STRINGS].start + ssize
-                        < (char *)cxt->bph + cxt->max_size) {
-                /* move strings up as far as possible */
-                str = (char *)cxt->bph + cxt->max_size - ssize;
-                cxt->str_anchor += str - cxt->rgn[FT_STRINGS].start;
-                memmove(str, cxt->rgn[FT_STRINGS].start, ssize);
-                cxt->rgn[FT_STRINGS].start = str;
-                /* enough space now? */
-                if (rgn >= FT_STRUCT && ft_shuffle(cxt, pp, rgn, nextra))
-                        return 1;
-        }
-
-        /* how much total free space is there following this region? */
-        tot = 0;
-        for (r = rgn; r < FT_STRINGS; ++r) {
-                char *r_end = cxt->rgn[r].start + cxt->rgn[r].size;
-                tot += next_start(cxt, rgn) - r_end;
-        }
-
-        /* cast is to shut gcc up; we know nextra >= 0 */
-        if (tot < (unsigned int)nextra) {
-                /* have to reallocate */
-                char *newp, *new_start;
-                int shift;
-
-                if (!cxt->realloc)
-                        return 0;
-                size = _ALIGN(cxt->max_size + (nextra - tot) + EXPAND_INCR, 8);
-                newp = cxt->realloc(cxt->bph, size);
-                if (!newp)
-                        return 0;
-                cxt->max_size = size;
-                shift = newp - (char *)cxt->bph;
-
-                if (shift) { /* realloc can return same addr */
-                        cxt->bph = (struct boot_param_header *)newp;
-                        ft_node_update_after(cxt, cxt->rgn[FT_STRUCT].start,
-                                        shift);
-                        for (r = FT_RSVMAP; r <= FT_STRINGS; ++r) {
-                                new_start = cxt->rgn[r].start + shift;
-                                cxt->rgn[r].start = new_start;
-                        }
-                        *pp += shift;
-                        cxt->str_anchor += shift;
-                }
-
-                /* move strings up to the end */
-                str = newp + size - ssize;
-                cxt->str_anchor += str - cxt->rgn[FT_STRINGS].start;
-                memmove(str, cxt->rgn[FT_STRINGS].start, ssize);
-                cxt->rgn[FT_STRINGS].start = str;
-
-                if (ft_shuffle(cxt, pp, rgn, nextra))
-                        return 1;
-        }
-
-        /* must be FT_RSVMAP and we need to move FT_STRUCT up */
-        if (rgn == FT_RSVMAP) {
-                next = cxt->rgn[FT_RSVMAP].start + cxt->rgn[FT_RSVMAP].size
-                        + nextra;
-                ssize = cxt->rgn[FT_STRUCT].size;
-                if (next + ssize >= cxt->rgn[FT_STRINGS].start)
-                        return 0;       /* "can't happen" */
-                memmove(next, cxt->rgn[FT_STRUCT].start, ssize);
-                ft_node_update_after(cxt, cxt->rgn[FT_STRUCT].start, nextra);
-                cxt->rgn[FT_STRUCT].start = next;
-
-                if (ft_shuffle(cxt, pp, rgn, nextra))
-                        return 1;
-        }
-
-        return 0;               /* "can't happen" */
-}
-
-static void ft_put_word(struct ft_cxt *cxt, u32 v)
-{
-        *(u32 *) cxt->p = cpu_to_be32(v);
-        cxt->p += 4;
-}
-
-static void ft_put_bin(struct ft_cxt *cxt, const void *data, unsigned int sz)
-{
-        unsigned long sza = _ALIGN(sz, 4);
-
-        /* zero out the alignment gap if necessary */
-        if (sz < sza)
-                *(u32 *) (cxt->p + sza - 4) = 0;
-
-        /* copy in the data */
-        memcpy(cxt->p, data, sz);
-
-        cxt->p += sza;
-}
-
-char *ft_begin_node(struct ft_cxt *cxt, const char *name)
-{
-        unsigned long nlen = strlen(name) + 1;
-        unsigned long len = 8 + _ALIGN(nlen, 4);
-        char *ret;
-
-        if (!ft_make_space(cxt, &cxt->p, FT_STRUCT, len))
-                return NULL;
-
-        ret = cxt->p;
-
-        ft_put_word(cxt, OF_DT_BEGIN_NODE);
-        ft_put_bin(cxt, name, strlen(name) + 1);
-
-        return ret;
-}
-
-void ft_end_node(struct ft_cxt *cxt)
-{
-        ft_put_word(cxt, OF_DT_END_NODE);
-}
-
-void ft_nop(struct ft_cxt *cxt)
-{
-        if (ft_make_space(cxt, &cxt->p, FT_STRUCT, 4))
-                ft_put_word(cxt, OF_DT_NOP);
-}
-
-#define NO_STRING       0x7fffffff
-
-static int lookup_string(struct ft_cxt *cxt, const char *name)
-{
-        char *p, *end;
-
-        p = cxt->rgn[FT_STRINGS].start;
-        end = p + cxt->rgn[FT_STRINGS].size;
-        while (p < end) {
-                if (strcmp(p, (char *)name) == 0)
-                        return p - cxt->str_anchor;
-                p += strlen(p) + 1;
-        }
-
-        return NO_STRING;
-}
-
-/* lookup string and insert if not found */
-static int map_string(struct ft_cxt *cxt, const char *name)
-{
-        int off;
-        char *p;
-
-        off = lookup_string(cxt, name);
-        if (off != NO_STRING)
-                return off;
-        p = cxt->rgn[FT_STRINGS].start;
-        if (!ft_make_space(cxt, &p, FT_STRINGS, strlen(name) + 1))
-                return NO_STRING;
-        strcpy(p, name);
-        return p - cxt->str_anchor;
-}
-
-int ft_prop(struct ft_cxt *cxt, const char *name, const void *data,
-                unsigned int sz)
-{
-        int off, len;
-
-        off = map_string(cxt, name);
-        if (off == NO_STRING)
-                return -1;
-
-        len = 12 + _ALIGN(sz, 4);
-        if (!ft_make_space(cxt, &cxt->p, FT_STRUCT, len))
-                return -1;
-
-        ft_put_word(cxt, OF_DT_PROP);
-        ft_put_word(cxt, sz);
-        ft_put_word(cxt, off);
-        ft_put_bin(cxt, data, sz);
-        return 0;
-}
-
-int ft_prop_str(struct ft_cxt *cxt, const char *name, const char *str)
-{
-        return ft_prop(cxt, name, str, strlen(str) + 1);
-}
-
-int ft_prop_int(struct ft_cxt *cxt, const char *name, unsigned int val)
-{
-        u32 v = cpu_to_be32((u32) val);
-
-        return ft_prop(cxt, name, &v, 4);
-}
-
-/* Calculate the size of the reserved map */
-static unsigned long rsvmap_size(struct ft_cxt *cxt)
-{
-        struct ft_reserve *res;
-
-        res = (struct ft_reserve *)cxt->rgn[FT_RSVMAP].start;
-        while (res->start || res->len)
-                ++res;
-        return (char *)(res + 1) - cxt->rgn[FT_RSVMAP].start;
-}
-
-/* Calculate the size of the struct region by stepping through it */
-static unsigned long struct_size(struct ft_cxt *cxt)
-{
-        char *p = cxt->rgn[FT_STRUCT].start;
-        char *next;
-        struct ft_atom atom;
-
-        /* make check in ft_next happy */
-        if (cxt->rgn[FT_STRUCT].size == 0)
-                cxt->rgn[FT_STRUCT].size = 0xfffffffful - (unsigned long)p;
-
-        while ((next = ft_next(cxt, p, &atom)) != NULL)
-                p = next;
-        return p + 4 - cxt->rgn[FT_STRUCT].start;
-}
-
-/* add `adj' on to all string offset values in the struct area */
-static void adjust_string_offsets(struct ft_cxt *cxt, int adj)
-{
-        char *p = cxt->rgn[FT_STRUCT].start;
-        char *next;
-        struct ft_atom atom;
-        int off;
-
-        while ((next = ft_next(cxt, p, &atom)) != NULL) {
-                if (atom.tag == OF_DT_PROP) {
-                        off = be32_to_cpu(*(u32 *) (p + 8));
-                        *(u32 *) (p + 8) = cpu_to_be32(off + adj);
-                }
-                p = next;
-        }
-}
-
-/* start construction of the flat OF tree from scratch */
-void ft_begin(struct ft_cxt *cxt, void *blob, unsigned int max_size,
-                void *(*realloc_fn) (void *, unsigned long))
-{
-        struct boot_param_header *bph = blob;
-        char *p;
-        struct ft_reserve *pres;
-
-        /* clear the cxt */
-        memset(cxt, 0, sizeof(*cxt));
-
-        cxt->bph = bph;
-        cxt->max_size = max_size;
-        cxt->realloc = realloc_fn;
-        cxt->isordered = 1;
-
-        /* zero everything in the header area */
-        memset(bph, 0, sizeof(*bph));
-
-        bph->magic = cpu_to_be32(OF_DT_HEADER);
-        bph->version = cpu_to_be32(0x10);
-        bph->last_comp_version = cpu_to_be32(0x10);
-
-        /* start pointers */
-        cxt->rgn[FT_RSVMAP].start = p = blob + HDR_SIZE;
-        cxt->rgn[FT_RSVMAP].size = sizeof(struct ft_reserve);
-        pres = (struct ft_reserve *)p;
-        cxt->rgn[FT_STRUCT].start = p += sizeof(struct ft_reserve);
-        cxt->rgn[FT_STRUCT].size = 4;
-        cxt->rgn[FT_STRINGS].start = blob + max_size;
-        cxt->rgn[FT_STRINGS].size = 0;
-
-        /* init rsvmap and struct */
-        pres->start = 0;
-        pres->len = 0;
-        *(u32 *) p = cpu_to_be32(OF_DT_END);
-
-        cxt->str_anchor = blob;
-}
-
-/* open up an existing blob to be examined or modified */
-int ft_open(struct ft_cxt *cxt, void *blob, unsigned int max_size,
-                unsigned int max_find_device,
-                void *(*realloc_fn) (void *, unsigned long))
-{
-        struct boot_param_header *bph = blob;
-
-        /* can't cope with version < 16 */
-        if (be32_to_cpu(bph->version) < 16)
-                return -1;
-
-        /* clear the cxt */
-        memset(cxt, 0, sizeof(*cxt));
-
-        /* alloc node_tbl to track node ptrs returned by ft_find_device */
-        ++max_find_device;
-        cxt->node_tbl = realloc_fn(NULL, max_find_device * sizeof(char *));
-        if (!cxt->node_tbl)
-                return -1;
-        memset(cxt->node_tbl, 0, max_find_device * sizeof(char *));
-        cxt->node_max = max_find_device;
-        cxt->nodes_used = 1;    /* don't use idx 0 b/c looks like NULL */
-
-        cxt->bph = bph;
-        cxt->max_size = max_size;
-        cxt->realloc = realloc_fn;
-
-        cxt->rgn[FT_RSVMAP].start = blob + be32_to_cpu(bph->off_mem_rsvmap);
-        cxt->rgn[FT_RSVMAP].size = rsvmap_size(cxt);
-        cxt->rgn[FT_STRUCT].start = blob + be32_to_cpu(bph->off_dt_struct);
-        cxt->rgn[FT_STRUCT].size = struct_size(cxt);
-        cxt->rgn[FT_STRINGS].start = blob + be32_to_cpu(bph->off_dt_strings);
-        cxt->rgn[FT_STRINGS].size = be32_to_cpu(bph->dt_strings_size);
-
-        cxt->p = cxt->rgn[FT_STRUCT].start;
-        cxt->str_anchor = cxt->rgn[FT_STRINGS].start;
-
-        return 0;
-}
-
-/* add a reserver physical area to the rsvmap */
-int ft_add_rsvmap(struct ft_cxt *cxt, u64 physaddr, u64 size)
-{
-        char *p;
-        struct ft_reserve *pres;
-
-        p = cxt->rgn[FT_RSVMAP].start + cxt->rgn[FT_RSVMAP].size
-                - sizeof(struct ft_reserve);
-        if (!ft_make_space(cxt, &p, FT_RSVMAP, sizeof(struct ft_reserve)))
-                return -1;
-
-        pres = (struct ft_reserve *)p;
-        pres->start = cpu_to_be64(physaddr);
-        pres->len = cpu_to_be64(size);
-
-        return 0;
-}
-
-void ft_begin_tree(struct ft_cxt *cxt)
-{
-        cxt->p = ft_root_node(cxt);
-}
-
-void ft_end_tree(struct ft_cxt *cxt)
-{
-        struct boot_param_header *bph = cxt->bph;
-        char *p, *oldstr, *str, *endp;
-        unsigned long ssize;
-        int adj;
-
-        if (!cxt->isordered)
-                return;         /* we haven't touched anything */
-
-        /* adjust string offsets */
-        oldstr = cxt->rgn[FT_STRINGS].start;
-        adj = cxt->str_anchor - oldstr;
-        if (adj)
-                adjust_string_offsets(cxt, adj);
-
-        /* make strings end on 8-byte boundary */
-        ssize = cxt->rgn[FT_STRINGS].size;
-        endp = (char *)_ALIGN((unsigned long)cxt->rgn[FT_STRUCT].start
-                        + cxt->rgn[FT_STRUCT].size + ssize, 8);
-        str = endp - ssize;
-
-        /* move strings down to end of structs */
-        memmove(str, oldstr, ssize);
-        cxt->str_anchor = str;
-        cxt->rgn[FT_STRINGS].start = str;
-
-        /* fill in header fields */
-        p = (char *)bph;
-        bph->totalsize = cpu_to_be32(endp - p);
-        bph->off_mem_rsvmap = cpu_to_be32(cxt->rgn[FT_RSVMAP].start - p);
-        bph->off_dt_struct = cpu_to_be32(cxt->rgn[FT_STRUCT].start - p);
-        bph->off_dt_strings = cpu_to_be32(cxt->rgn[FT_STRINGS].start - p);
-        bph->dt_strings_size = cpu_to_be32(ssize);
-}
-
-void *ft_find_device(struct ft_cxt *cxt, const void *top, const char *srch_path)
-{
-        char *node;
-
-        if (top) {
-                node = ft_node_ph2node(cxt, top);
-                if (node == NULL)
-                        return NULL;
-        } else {
-                node = ft_root_node(cxt);
-        }
-
-        node = ft_find_descendent(cxt, node, srch_path);
-        return ft_get_phandle(cxt, node);
-}
-
-void *ft_find_descendent(struct ft_cxt *cxt, void *top, const char *srch_path)
-{
-        struct ft_atom atom;
-        char *p;
-        const char *cp, *q;
-        int cl;
-        int depth = -1;
-        int dmatch = 0;
-        const char *path_comp[FT_MAX_DEPTH];
-
-        cp = srch_path;
-        cl = 0;
-        p = top;
-
-        while ((p = ft_next(cxt, p, &atom)) != NULL) {
-                switch (atom.tag) {
-                case OF_DT_BEGIN_NODE:
-                        ++depth;
-                        if (depth != dmatch)
-                                break;
-                        cxt->genealogy[depth] = atom.data;
-                        cxt->genealogy[depth + 1] = NULL;
-                        if (depth && !(strncmp(atom.name, cp, cl) == 0
-                                        && (atom.name[cl] == '/'
-                                                || atom.name[cl] == '\0'
-                                                || atom.name[cl] == '@')))
-                                break;
-                        path_comp[dmatch] = cp;
-                        /* it matches so far, advance to next path component */
-                        cp += cl;
-                        /* skip slashes */
-                        while (*cp == '/')
-                                ++cp;
-                        /* we're done if this is the end of the string */
-                        if (*cp == 0)
-                                return atom.data;
-                        /* look for end of this component */
-                        q = strchr(cp, '/');
-                        if (q)
-                                cl = q - cp;
-                        else
-                                cl = strlen(cp);
-                        ++dmatch;
-                        break;
-                case OF_DT_END_NODE:
-                        if (depth == 0)
-                                return NULL;
-                        if (dmatch > depth) {
-                                --dmatch;
-                                cl = cp - path_comp[dmatch] - 1;
-                                cp = path_comp[dmatch];
-                                while (cl > 0 && cp[cl - 1] == '/')
-                                        --cl;
-                        }
-                        --depth;
-                        break;
-                }
-        }
-        return NULL;
-}
-
-void *__ft_get_parent(struct ft_cxt *cxt, void *node)
-{
-        int d;
-        struct ft_atom atom;
-        char *p;
-
-        for (d = 0; cxt->genealogy[d] != NULL; ++d)
-                if (cxt->genealogy[d] == node)
-                        return d > 0 ? cxt->genealogy[d - 1] : NULL;
-
-        /* have to do it the hard way... */
-        p = ft_root_node(cxt);
-        d = 0;
-        while ((p = ft_next(cxt, p, &atom)) != NULL) {
-                switch (atom.tag) {
-                case OF_DT_BEGIN_NODE:
-                        cxt->genealogy[d] = atom.data;
-                        if (node == atom.data) {
-                                /* found it */
-                                cxt->genealogy[d + 1] = NULL;
-                                return d > 0 ? cxt->genealogy[d - 1] : NULL;
-                        }
-                        ++d;
-                        break;
-                case OF_DT_END_NODE:
-                        --d;
-                        break;
-                }
-        }
-        return NULL;
-}
-
-void *ft_get_parent(struct ft_cxt *cxt, const void *phandle)
-{
-        void *node = ft_node_ph2node(cxt, phandle);
-        if (node == NULL)
-                return NULL;
-
-        node = __ft_get_parent(cxt, node);
-        return ft_get_phandle(cxt, node);
-}
-
-static const void *__ft_get_prop(struct ft_cxt *cxt, void *node,
-                                 const char *propname, unsigned int *len)
-{
-        struct ft_atom atom;
-        int depth = 0;
-
-        while ((node = ft_next(cxt, node, &atom)) != NULL) {
-                switch (atom.tag) {
-                case OF_DT_BEGIN_NODE:
-                        ++depth;
-                        break;
-
-                case OF_DT_PROP:
-                        if (depth != 1 || strcmp(atom.name, propname))
-                                break;
-
-                        if (len)
-                                *len = atom.size;
-
-                        return atom.data;
-
-                case OF_DT_END_NODE:
-                        if (--depth <= 0)
-                                return NULL;
-                }
-        }
-
-        return NULL;
-}
-
-int ft_get_prop(struct ft_cxt *cxt, const void *phandle, const char *propname,
-                void *buf, const unsigned int buflen)
-{
-        const void *data;
-        unsigned int size;
-
-        void *node = ft_node_ph2node(cxt, phandle);
-        if (!node)
-                return -1;
-
-        data = __ft_get_prop(cxt, node, propname, &size);
-        if (data) {
-                unsigned int clipped_size = min(size, buflen);
-                memcpy(buf, data, clipped_size);
-                return size;
-        }
-
-        return -1;
-}
-
-void *__ft_find_node_by_prop_value(struct ft_cxt *cxt, void *prev,
-                                   const char *propname, const char *propval,
-                                   unsigned int proplen)
-{
-        struct ft_atom atom;
-        char *p = ft_root_node(cxt);
-        char *next;
-        int past_prev = prev ? 0 : 1;
-        int depth = -1;
-
-        while ((next = ft_next(cxt, p, &atom)) != NULL) {
-                const void *data;
-                unsigned int size;
-
-                switch (atom.tag) {
-                case OF_DT_BEGIN_NODE:
-                        depth++;
-
-                        if (prev == p) {
-                                past_prev = 1;
-                                break;
-                        }
-
-                        if (!past_prev || depth < 1)
-                                break;
-
-                        data = __ft_get_prop(cxt, p, propname, &size);
-                        if (!data || size != proplen)
-                                break;
-                        if (memcmp(data, propval, size))
-                                break;
-
-                        return p;
-
-                case OF_DT_END_NODE:
-                        if (depth-- == 0)
-                                return NULL;
-
-                        break;
-                }
-
-                p = next;
-        }
-
-        return NULL;
-}
-
-void *ft_find_node_by_prop_value(struct ft_cxt *cxt, const void *prev,
-                                 const char *propname, const char *propval,
-                                 int proplen)
-{
-        void *node = NULL;
-
-        if (prev) {
-                node = ft_node_ph2node(cxt, prev);
-
-                if (!node)
-                        return NULL;
-        }
-
-        node = __ft_find_node_by_prop_value(cxt, node, propname,
-                                            propval, proplen);
-        return ft_get_phandle(cxt, node);
-}
-
-int ft_set_prop(struct ft_cxt *cxt, const void *phandle, const char *propname,
-                const void *buf, const unsigned int buflen)
-{
-        struct ft_atom atom;
-        void *node;
-        char *p, *next;
-        int nextra;
-
-        node = ft_node_ph2node(cxt, phandle);
-        if (node == NULL)
-                return -1;
-
-        next = ft_next(cxt, node, &atom);
-        if (atom.tag != OF_DT_BEGIN_NODE)
-                /* phandle didn't point to a node */
-                return -1;
-        p = next;
-
-        while ((next = ft_next(cxt, p, &atom)) != NULL) {
-                switch (atom.tag) {
-                case OF_DT_BEGIN_NODE: /* properties must go before subnodes */
-                case OF_DT_END_NODE:
-                        /* haven't found the property, insert here */
-                        cxt->p = p;
-                        return ft_prop(cxt, propname, buf, buflen);
-                case OF_DT_PROP:
-                        if (strcmp(atom.name, propname))
-                                break;
-                        /* found an existing property, overwrite it */
-                        nextra = _ALIGN(buflen, 4) - _ALIGN(atom.size, 4);
-                        cxt->p = atom.data;
-                        if (nextra && !ft_make_space(cxt, &cxt->p, FT_STRUCT,
-                                                nextra))
-                                return -1;
-                        *(u32 *) (cxt->p - 8) = cpu_to_be32(buflen);
-                        ft_put_bin(cxt, buf, buflen);
-                        return 0;
-                }
-                p = next;
-        }
-        return -1;
-}
-
-int ft_del_prop(struct ft_cxt *cxt, const void *phandle, const char *propname)
-{
-        struct ft_atom atom;
-        void *node;
-        char *p, *next;
-        int size;
-
-        node = ft_node_ph2node(cxt, phandle);
-        if (node == NULL)
-                return -1;
-
-        p = node;
-        while ((next = ft_next(cxt, p, &atom)) != NULL) {
-                switch (atom.tag) {
-                case OF_DT_BEGIN_NODE:
-                case OF_DT_END_NODE:
-                        return -1;
-                case OF_DT_PROP:
-                        if (strcmp(atom.name, propname))
-                                break;
-                        /* found the property, remove it */
-                        size = 12 + -_ALIGN(atom.size, 4);
-                        cxt->p = p;
-                        if (!ft_make_space(cxt, &cxt->p, FT_STRUCT, -size))
-                                return -1;
-                        return 0;
-                }
-                p = next;
-        }
-        return -1;
-}
-
-void *ft_create_node(struct ft_cxt *cxt, const void *parent, const char *name)
-{
-        struct ft_atom atom;
-        char *p, *next, *ret;
-        int depth = 0;
-
-        if (parent) {
-                p = ft_node_ph2node(cxt, parent);
-                if (!p)
-                        return NULL;
-        } else {
-                p = ft_root_node(cxt);
-        }
-
-        while ((next = ft_next(cxt, p, &atom)) != NULL) {
-                switch (atom.tag) {
-                case OF_DT_BEGIN_NODE:
-                        ++depth;
-                        if (depth == 1 && strcmp(atom.name, name) == 0)
-                                /* duplicate node name, return error */
-                                return NULL;
-                        break;
-                case OF_DT_END_NODE:
-                        --depth;
-                        if (depth > 0)
-                                break;
-                        /* end of node, insert here */
-                        cxt->p = p;
-                        ret = ft_begin_node(cxt, name);
-                        ft_end_node(cxt);
-                        return ft_get_phandle(cxt, ret);
-                }
-                p = next;
-        }
-        return NULL;
-}
-
-/* Returns the start of the path within the provided buffer, or NULL on
- * error.
- */
-char *ft_get_path(struct ft_cxt *cxt, const void *phandle,
-                  char *buf, int len)
-{
-        const char *path_comp[FT_MAX_DEPTH];
-        struct ft_atom atom;
-        char *p, *next, *pos;
-        int depth = 0, i;
-        void *node;
-
-        node = ft_node_ph2node(cxt, phandle);
-        if (node == NULL)
-                return NULL;
-
-        p = ft_root_node(cxt);
-
-        while ((next = ft_next(cxt, p, &atom)) != NULL) {
-                switch (atom.tag) {
-                case OF_DT_BEGIN_NODE:
-                        path_comp[depth++] = atom.name;
-                        if (p == node)
-                                goto found;
-
-                        break;
-
-                case OF_DT_END_NODE:
-                        if (--depth == 0)
-                                return NULL;
-                }
-
-                p = next;
-        }
-
-found:
-        pos = buf;
-        for (i = 1; i < depth; i++) {
-                int this_len;
-
-                if (len <= 1)
-                        return NULL;
-
-                *pos++ = '/';
-                len--;
-
-                strncpy(pos, path_comp[i], len);
-
-                if (pos[len - 1] != 0)
-                        return NULL;
-
-                this_len = strlen(pos);
-                len -= this_len;
-                pos += this_len;
-        }
-
-        return buf;
-}
diff --git a/arch/powerpc/boot/flatdevtree.h b/arch/powerpc/boot/flatdevtree.h
deleted file mode 100644
index b0957a2d967f..000000000000
--- a/arch/powerpc/boot/flatdevtree.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#ifndef FLATDEVTREE_H
-#define FLATDEVTREE_H
-
-#include "flatdevtree_env.h"
-
-/* Definitions used by the flattened device tree */
-#define OF_DT_HEADER            0xd00dfeed      /* marker */
-#define OF_DT_BEGIN_NODE        0x1     /* Start of node, full name */
-#define OF_DT_END_NODE          0x2     /* End node */
-#define OF_DT_PROP              0x3     /* Property: name off, size, content */
-#define OF_DT_NOP               0x4     /* nop */
-#define OF_DT_END               0x9
-
-#define OF_DT_VERSION           0x10
-
-struct boot_param_header {
-        u32 magic;              /* magic word OF_DT_HEADER */
-        u32 totalsize;          /* total size of DT block */
-        u32 off_dt_struct;      /* offset to structure */
-        u32 off_dt_strings;     /* offset to strings */
-        u32 off_mem_rsvmap;     /* offset to memory reserve map */
-        u32 version;            /* format version */
-        u32 last_comp_version;  /* last compatible version */
-        /* version 2 fields below */
-        u32 boot_cpuid_phys;    /* Physical CPU id we're booting on */
-        /* version 3 fields below */
-        u32 dt_strings_size;    /* size of the DT strings block */
-};
-
-struct ft_reserve {
-        u64 start;
-        u64 len;
-};
-
-struct ft_region {
-        char *start;
-        unsigned long size;
-};
-
-enum ft_rgn_id {
-        FT_RSVMAP,
-        FT_STRUCT,
-        FT_STRINGS,
-        FT_N_REGION
-};
-
-#define FT_MAX_DEPTH    50
-
-struct ft_cxt {
-        struct boot_param_header *bph;
-        int max_size;           /* maximum size of tree */
-        int isordered;          /* everything in standard order */
-        void *(*realloc)(void *, unsigned long);
-        char *str_anchor;
-        char *p;                /* current insertion point in structs */
-        struct ft_region rgn[FT_N_REGION];
-        void *genealogy[FT_MAX_DEPTH+1];
-        char **node_tbl;
-        unsigned int node_max;
-        unsigned int nodes_used;
-};
-
-char *ft_begin_node(struct ft_cxt *cxt, const char *name);
-void ft_end_node(struct ft_cxt *cxt);
-
-void ft_begin_tree(struct ft_cxt *cxt);
-void ft_end_tree(struct ft_cxt *cxt);
-
-void ft_nop(struct ft_cxt *cxt);
-int ft_prop(struct ft_cxt *cxt, const char *name,
-            const void *data, unsigned int sz);
-int ft_prop_str(struct ft_cxt *cxt, const char *name, const char *str);
-int ft_prop_int(struct ft_cxt *cxt, const char *name, unsigned int val);
-void ft_begin(struct ft_cxt *cxt, void *blob, unsigned int max_size,
-              void *(*realloc_fn)(void *, unsigned long));
-int ft_open(struct ft_cxt *cxt, void *blob, unsigned int max_size,
-                unsigned int max_find_device,
-                void *(*realloc_fn)(void *, unsigned long));
-int ft_add_rsvmap(struct ft_cxt *cxt, u64 physaddr, u64 size);
-
-void ft_dump_blob(const void *bphp);
-void ft_merge_blob(struct ft_cxt *cxt, void *blob);
-void *ft_find_device(struct ft_cxt *cxt, const void *top,
-                     const char *srch_path);
-void *ft_find_descendent(struct ft_cxt *cxt, void *top, const char *srch_path);
-int ft_get_prop(struct ft_cxt *cxt, const void *phandle, const char *propname,
-                void *buf, const unsigned int buflen);
-int ft_set_prop(struct ft_cxt *cxt, const void *phandle, const char *propname,
-                const void *buf, const unsigned int buflen);
-void *ft_get_parent(struct ft_cxt *cxt, const void *phandle);
-void *ft_find_node_by_prop_value(struct ft_cxt *cxt, const void *prev,
-                                 const char *propname, const char *propval,
-                                 int proplen);
-void *ft_create_node(struct ft_cxt *cxt, const void *parent, const char *name);
-char *ft_get_path(struct ft_cxt *cxt, const void *phandle, char *buf, int len);
-
-#endif /* FLATDEVTREE_H */
diff --git a/arch/powerpc/boot/flatdevtree_misc.c b/arch/powerpc/boot/flatdevtree_misc.c
deleted file mode 100644
index b3670096fa71..000000000000
--- a/arch/powerpc/boot/flatdevtree_misc.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * This file does the necessary interface mapping between the bootwrapper
- * device tree operations and the interface provided by shared source
- * files flatdevicetree.[ch].
- *
- * Author: Mark A. Greer <mgreer@mvista.com>
- *
- * 2006 (c) MontaVista Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-#include <stddef.h>
-#include "flatdevtree.h"
-#include "ops.h"
-
-static struct ft_cxt cxt;
-
-static void *fdtm_finddevice(const char *name)
-{
-        return ft_find_device(&cxt, NULL, name);
-}
-
-static int fdtm_getprop(const void *phandle, const char *propname,
-                        void *buf, const int buflen)
-{
-        return ft_get_prop(&cxt, phandle, propname, buf, buflen);
-}
-
-static int fdtm_setprop(const void *phandle, const char *propname,
-                        const void *buf, const int buflen)
-{
-        return ft_set_prop(&cxt, phandle, propname, buf, buflen);
-}
-
-static void *fdtm_get_parent(const void *phandle)
-{
-        return ft_get_parent(&cxt, phandle);
-}
-
-static void *fdtm_create_node(const void *phandle, const char *name)
-{
-        return ft_create_node(&cxt, phandle, name);
-}
-
-static void *fdtm_find_node_by_prop_value(const void *prev,
-                                          const char *propname,
-                                          const char *propval,
-                                          int proplen)
-{
-        return ft_find_node_by_prop_value(&cxt, prev, propname,
-                                          propval, proplen);
-}
-
-static unsigned long fdtm_finalize(void)
-{
-        ft_end_tree(&cxt);
-        return (unsigned long)cxt.bph;
-}
-
-static char *fdtm_get_path(const void *phandle, char *buf, int len)
-{
-        return ft_get_path(&cxt, phandle, buf, len);
-}
-
-int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device)
-{
-        dt_ops.finddevice = fdtm_finddevice;
-        dt_ops.getprop = fdtm_getprop;
-        dt_ops.setprop = fdtm_setprop;
-        dt_ops.get_parent = fdtm_get_parent;
-        dt_ops.create_node = fdtm_create_node;
-        dt_ops.find_node_by_prop_value = fdtm_find_node_by_prop_value;
-        dt_ops.finalize = fdtm_finalize;
-        dt_ops.get_path = fdtm_get_path;
-
-        return ft_open(&cxt, dt_blob, max_size, max_find_device,
-                        platform_ops.realloc);
-}
diff --git a/arch/powerpc/boot/holly.c b/arch/powerpc/boot/holly.c
index 199e783aea4d..58013b923178 100644
--- a/arch/powerpc/boot/holly.c
+++ b/arch/powerpc/boot/holly.c
@@ -28,6 +28,6 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5)
         u32 heapsize = 0x8000000 - (u32)_end; /* 128M */
 
         simple_alloc_init(_end, heapsize, 32, 64);
-        ft_init(_dtb_start, 0, 4);
+        fdt_init(_dtb_start);
         serial_console_init();
 }
diff --git a/arch/powerpc/boot/libfdt-wrapper.c b/arch/powerpc/boot/libfdt-wrapper.c
new file mode 100644
index 000000000000..59016bef1391
--- /dev/null
+++ b/arch/powerpc/boot/libfdt-wrapper.c
@@ -0,0 +1,193 @@
+/*
+ * This file does the necessary interface mapping between the bootwrapper
+ * device tree operations and the interface provided by shared source
+ * files flatdevicetree.[ch].
+ *
+ * Copyright 2007 David Gibson, IBM Corporation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
+
+#include <stddef.h>
+#include <stdio.h>
+#include <page.h>
+#include <libfdt.h>
+#include "ops.h"
+
+#define DEBUG   0
+#define BAD_ERROR(err)  (((err) < 0) \
+                         && ((err) != -FDT_ERR_NOTFOUND) \
+                         && ((err) != -FDT_ERR_EXISTS))
+
+#define check_err(err) \
+        ({ \
+                if (BAD_ERROR(err) || ((err < 0) && DEBUG)) \
+                        printf("%s():%d  %s\n\r", __FUNCTION__, __LINE__, \
+                               fdt_strerror(err)); \
+                if (BAD_ERROR(err)) \
+                        exit(); \
+                (err < 0) ? -1 : 0; \
+        })
+
+#define offset_devp(off)        \
+        ({ \
+                int _offset = (off); \
+                check_err(_offset) ? NULL : (void *)(_offset+1); \
+        })
+
+#define devp_offset_find(devp)  (((int)(devp))-1)
+#define devp_offset(devp)       (devp ? ((int)(devp))-1 : 0)
+
+static void *fdt;
+static void *buf; /* = NULL */
+
+#define EXPAND_GRANULARITY      1024
+
+static void expand_buf(int minexpand)
+{
+        int size = fdt_totalsize(fdt);
+        int rc;
+
+        size = _ALIGN(size + minexpand, EXPAND_GRANULARITY);
+        buf = platform_ops.realloc(buf, size);
+        if (!buf)
+                fatal("Couldn't find %d bytes to expand device tree\n\r", size);
+        rc = fdt_open_into(fdt, buf, size);
+        if (rc != 0)
+                fatal("Couldn't expand fdt into new buffer: %s\n\r",
+                      fdt_strerror(rc));
+
+        fdt = buf;
+}
+
+static void *fdt_wrapper_finddevice(const char *path)
+{
+        return offset_devp(fdt_path_offset(fdt, path));
+}
+
+static int fdt_wrapper_getprop(const void *devp, const char *name,
+                               void *buf, const int buflen)
+{
+        const void *p;
+        int len;
+
+        p = fdt_getprop(fdt, devp_offset(devp), name, &len);
+        if (!p)
+                return check_err(len);
+        memcpy(buf, p, min(len, buflen));
+        return len;
+}
+
+static int fdt_wrapper_setprop(const void *devp, const char *name,
+                               const void *buf, const int len)
+{
+        int rc;
+
+        rc = fdt_setprop(fdt, devp_offset(devp), name, buf, len);
+        if (rc == -FDT_ERR_NOSPACE) {
+                expand_buf(len + 16);
+                rc = fdt_setprop(fdt, devp_offset(devp), name, buf, len);
+        }
+
+        return check_err(rc);
+}
+
+static void *fdt_wrapper_get_parent(const void *devp)
+{
+        return offset_devp(fdt_parent_offset(fdt, devp_offset(devp)));
+}
+
+static void *fdt_wrapper_create_node(const void *devp, const char *name)
+{
+        int offset;
+
+        offset = fdt_add_subnode(fdt, devp_offset(devp), name);
+        if (offset == -FDT_ERR_NOSPACE) {
+                expand_buf(strlen(name) + 16);
+                offset = fdt_add_subnode(fdt, devp_offset(devp), name);
+        }
+
+        return offset_devp(offset);
+}
+
+static void *fdt_wrapper_find_node_by_prop_value(const void *prev,
+                                                 const char *name,
+                                                 const char *val,
+                                                 int len)
+{
+        int offset = fdt_node_offset_by_prop_value(fdt, devp_offset_find(prev),
+                                                   name, val, len);
+        return offset_devp(offset);
+}
+
+static void *fdt_wrapper_find_node_by_compatible(const void *prev,
+                                                 const char *val)
+{
+        int offset = fdt_node_offset_by_compatible(fdt, devp_offset_find(prev),
+                                                   val);
+        return offset_devp(offset);
+}
+
+static char *fdt_wrapper_get_path(const void *devp, char *buf, int len)
+{
+        int rc;
+
+        rc = fdt_get_path(fdt, devp_offset(devp), buf, len);
+        if (check_err(rc))
+                return NULL;
+        return buf;
+}
+
+static unsigned long fdt_wrapper_finalize(void)
+{
+        int rc;
+
+        rc = fdt_pack(fdt);
+        if (rc != 0)
+                fatal("Couldn't pack flat tree: %s\n\r",
+                      fdt_strerror(rc));
+        return (unsigned long)fdt;
+}
+
+void fdt_init(void *blob)
+{
+        int err;
+
+        dt_ops.finddevice = fdt_wrapper_finddevice;
+        dt_ops.getprop = fdt_wrapper_getprop;
+        dt_ops.setprop = fdt_wrapper_setprop;
+        dt_ops.get_parent = fdt_wrapper_get_parent;
+        dt_ops.create_node = fdt_wrapper_create_node;
+        dt_ops.find_node_by_prop_value = fdt_wrapper_find_node_by_prop_value;
+        dt_ops.find_node_by_compatible = fdt_wrapper_find_node_by_compatible;
+        dt_ops.get_path = fdt_wrapper_get_path;
+        dt_ops.finalize = fdt_wrapper_finalize;
+
+        /* Make sure the dt blob is the right version and so forth */
+        fdt = blob;
+        err = fdt_open_into(fdt, fdt, fdt_totalsize(blob));
+        if (err == -FDT_ERR_NOSPACE) {
+                int bufsize = fdt_totalsize(fdt) + 4;
+                buf = malloc(bufsize);
+                err = fdt_open_into(fdt, buf, bufsize);
+        }
+
+        if (err != 0)
+                fatal("fdt_init(): %s\n\r", fdt_strerror(err));
+
+        if (buf)
+                fdt = buf;
+}
diff --git a/arch/powerpc/boot/libfdt/Makefile.libfdt b/arch/powerpc/boot/libfdt/Makefile.libfdt
new file mode 100644
index 000000000000..82f9c6a8287b
--- /dev/null
+++ b/arch/powerpc/boot/libfdt/Makefile.libfdt
@@ -0,0 +1,14 @@
+# Makefile.libfdt
+#
+# This is not a complete Makefile of itself.  Instead, it is designed to
+# be easily embeddable into other systems of Makefiles.
+#
+LIBFDT_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
+LIBFDT_INCLUDES = fdt.h libfdt.h
+LIBFDT_EXTRA = libfdt_internal.h
+LIBFDT_LIB = libfdt/libfdt.a
+
+LIBFDT_OBJS = $(LIBFDT_SRCS:%.c=%.o)
+
+$(LIBFDT_objdir)/$(LIBFDT_LIB): $(addprefix $(LIBFDT_objdir)/,$(LIBFDT_OBJS))
+
diff --git a/arch/powerpc/boot/libfdt/fdt.c b/arch/powerpc/boot/libfdt/fdt.c
new file mode 100644
index 000000000000..586a36136db2
--- /dev/null
+++ b/arch/powerpc/boot/libfdt/fdt.c
@@ -0,0 +1,156 @@
+/*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ *
+ * libfdt is dual licensed: you can use it either under the terms of
+ * the GPL, or the BSD license, at your option.
+ *
+ *  a) This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Alternatively,
+ *
+ *  b) Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *     2. Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "libfdt_env.h"
+
+#include <fdt.h>
+#include <libfdt.h>
+
+#include "libfdt_internal.h"
+
+int fdt_check_header(const void *fdt)
+{
+        if (fdt_magic(fdt) == FDT_MAGIC) {
+                /* Complete tree */
+                if (fdt_version(fdt) < FDT_FIRST_SUPPORTED_VERSION)
+                        return -FDT_ERR_BADVERSION;
+                if (fdt_last_comp_version(fdt) > FDT_LAST_SUPPORTED_VERSION)
+                        return -FDT_ERR_BADVERSION;
+        } else if (fdt_magic(fdt) == SW_MAGIC) {
+                /* Unfinished sequential-write blob */
+                if (fdt_size_dt_struct(fdt) == 0)
+                        return -FDT_ERR_BADSTATE;
+        } else {
+                return -FDT_ERR_BADMAGIC;
+        }
+
+        return 0;
+}
+
+const void *fdt_offset_ptr(const void *fdt, int offset, int len)
+{
+        const void *p;
+
+        if (fdt_version(fdt) >= 0x11)
+                if (((offset + len) < offset)
+                    || ((offset + len) > fdt_size_dt_struct(fdt)))
+                        return NULL;
+
+        p = _fdt_offset_ptr(fdt, offset);
+
+        if (p + len < p)
+                return NULL;
+        return p;
+}
+
+uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset)
+{
+        const uint32_t *tagp, *lenp;
+        uint32_t tag;
+        const char *p;
+
+        if (offset % FDT_TAGSIZE)
+                return -1;
+
+        tagp = fdt_offset_ptr(fdt, offset, FDT_TAGSIZE);
+        if (! tagp)
+                return FDT_END; /* premature end */
+        tag = fdt32_to_cpu(*tagp);
+        offset += FDT_TAGSIZE;
+
+        switch (tag) {
+        case FDT_BEGIN_NODE:
+                /* skip name */
+                do {
+                        p = fdt_offset_ptr(fdt, offset++, 1);
+                } while (p && (*p != '\0'));
+                if (! p)
+                        return FDT_END;
+                break;
+        case FDT_PROP:
+                lenp = fdt_offset_ptr(fdt, offset, sizeof(*lenp));
+                if (! lenp)
+                        return FDT_END;
+                /* skip name offset, length and value */
+                offset += 2*FDT_TAGSIZE + fdt32_to_cpu(*lenp);
+                break;
+        }
+
+        if (nextoffset)
+                *nextoffset = ALIGN(offset, FDT_TAGSIZE);
+
+        return tag;
+}
+
+const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)
+{
+        int len = strlen(s) + 1;
+        const char *last = strtab + tabsize - len;
+        const char *p;
+
+        for (p = strtab; p <= last; p++)
+                if (memeq(p, s, len))
+                        return p;
+        return NULL;
+}
+
+int fdt_move(const void *fdt, void *buf, int bufsize)
+{
+        int err = fdt_check_header(fdt);
+
+        if (err)
+                return err;
+
+        if (fdt_totalsize(fdt) > bufsize)
+                return -FDT_ERR_NOSPACE;
+
+        memmove(buf, fdt, fdt_totalsize(fdt));
+        return 0;
+}
diff --git a/arch/powerpc/boot/libfdt/fdt.h b/arch/powerpc/boot/libfdt/fdt.h
new file mode 100644
index 000000000000..48ccfd910000
--- /dev/null
+++ b/arch/powerpc/boot/libfdt/fdt.h
@@ -0,0 +1,60 @@
+#ifndef _FDT_H
+#define _FDT_H
+
+#ifndef __ASSEMBLY__
+
+struct fdt_header {
+        uint32_t magic;                  /* magic word FDT_MAGIC */
+        uint32_t totalsize;              /* total size of DT block */
+        uint32_t off_dt_struct;          /* offset to structure */
+        uint32_t off_dt_strings;         /* offset to strings */
+        uint32_t off_mem_rsvmap;         /* offset to memory reserve map */
+        uint32_t version;                /* format version */
+        uint32_t last_comp_version;      /* last compatible version */
+
+        /* version 2 fields below */
+        uint32_t boot_cpuid_phys;        /* Which physical CPU id we're
+                                            booting on */
+        /* version 3 fields below */
+        uint32_t size_dt_strings;        /* size of the strings block */
+
+        /* version 17 fields below */
+        uint32_t size_dt_struct;         /* size of the structure block */
+};
+
+struct fdt_reserve_entry {
+        uint64_t address;
+        uint64_t size;
+};
+
+struct fdt_node_header {
+        uint32_t tag;
+        char name[0];
+};
+
+struct fdt_property {
+        uint32_t tag;
+        uint32_t len;
+        uint32_t nameoff;
+        char data[0];
+};
+
+#endif /* !__ASSEMBLY */
+
+#define FDT_MAGIC       0xd00dfeed      /* 4: version, 4: total size */
+#define FDT_TAGSIZE     sizeof(uint32_t)
+
+#define FDT_BEGIN_NODE  0x1             /* Start node: full name */
+#define FDT_END_NODE    0x2             /* End node */
+#define FDT_PROP        0x3             /* Property: name off,
+                                           size, content */
+#define FDT_NOP         0x4             /* nop */
+#define FDT_END         0x9
+
+#define FDT_V1_SIZE     (7*sizeof(uint32_t))
+#define FDT_V2_SIZE     (FDT_V1_SIZE + sizeof(uint32_t))
+#define FDT_V3_SIZE     (FDT_V2_SIZE + sizeof(uint32_t))
+#define FDT_V16_SIZE    FDT_V3_SIZE
+#define FDT_V17_SIZE    (FDT_V16_SIZE + sizeof(uint32_t))
+
+#endif /* _FDT_H */
diff --git a/arch/powerpc/boot/libfdt/fdt_ro.c b/arch/powerpc/boot/libfdt/fdt_ro.c
new file mode 100644
index 000000000000..12a37d59f96e
--- /dev/null
+++ b/arch/powerpc/boot/libfdt/fdt_ro.c
@@ -0,0 +1,583 @@
+/*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ *
+ * libfdt is dual licensed: you can use it either under the terms of
+ * the GPL, or the BSD license, at your option.
+ *
+ *  a) This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Alternatively,
+ *
+ *  b) Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *     2. Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "libfdt_env.h"
+
+#include <fdt.h>
+#include <libfdt.h>
+
+#include "libfdt_internal.h"
+
+#define CHECK_HEADER(fdt) \
+        { \
+                int err; \
+                if ((err = fdt_check_header(fdt)) != 0) \
+                        return err; \
+        }
+
+static int nodename_eq(const void *fdt, int offset,
+                       const char *s, int len)
+{
+        const char *p = fdt_offset_ptr(fdt, offset, len+1);
+
+        if (! p)
+                /* short match */
+                return 0;
+
+        if (memcmp(p, s, len) != 0)
+                return 0;
+
+        if (p[len] == '\0')
+                return 1;
+        else if (!memchr(s, '@', len) && (p[len] == '@'))
+                return 1;
+        else
+                return 0;
+}
+
+const char *fdt_string(const void *fdt, int stroffset)
+{
+        return (char *)fdt + fdt_off_dt_strings(fdt) + stroffset;
+}
+
+int fdt_get_mem_rsv(const void *fdt, int n, uint64_t *address, uint64_t *size)
+{
+        CHECK_HEADER(fdt);
+        *address = fdt64_to_cpu(_fdt_mem_rsv(fdt, n)->address);
+        *size = fdt64_to_cpu(_fdt_mem_rsv(fdt, n)->size);
+        return 0;
+}
+
+int fdt_num_mem_rsv(const void *fdt)
+{
+        int i = 0;
+
+        while (fdt64_to_cpu(_fdt_mem_rsv(fdt, i)->size) != 0)
+                i++;
+        return i;
+}
+
+int fdt_subnode_offset_namelen(const void *fdt, int parentoffset,
+                               const char *name, int namelen)
+{
+        int level = 0;
+        uint32_t tag;
+        int offset, nextoffset;
+
+        CHECK_HEADER(fdt);
+
+        tag = fdt_next_tag(fdt, parentoffset, &nextoffset);
+        if (tag != FDT_BEGIN_NODE)
+                return -FDT_ERR_BADOFFSET;
+
+        do {
+                offset = nextoffset;
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+
+                switch (tag) {
+                case FDT_END:
+                        return -FDT_ERR_TRUNCATED;
+
+                case FDT_BEGIN_NODE:
+                        level++;
+                        if (level != 1)
+                                continue;
+                        if (nodename_eq(fdt, offset+FDT_TAGSIZE, name, namelen))
+                                /* Found it! */
+                                return offset;
+                        break;
+
+                case FDT_END_NODE:
+                        level--;
+                        break;
+
+                case FDT_PROP:
+                case FDT_NOP:
+                        break;
+
+                default:
+                        return -FDT_ERR_BADSTRUCTURE;
+                }
+        } while (level >= 0);
+
+        return -FDT_ERR_NOTFOUND;
+}
+
+int fdt_subnode_offset(const void *fdt, int parentoffset,
+                       const char *name)
+{
+        return fdt_subnode_offset_namelen(fdt, parentoffset, name, strlen(name));
+}
+
+int fdt_path_offset(const void *fdt, const char *path)
+{
+        const char *end = path + strlen(path);
+        const char *p = path;
+        int offset = 0;
+
+        CHECK_HEADER(fdt);
+
+        if (*path != '/')
+                return -FDT_ERR_BADPATH;
+
+        while (*p) {
+                const char *q;
+
+                while (*p == '/')
+                        p++;
+                if (! *p)
+                        return offset;
+                q = strchr(p, '/');
+                if (! q)
+                        q = end;
+
+                offset = fdt_subnode_offset_namelen(fdt, offset, p, q-p);
+                if (offset < 0)
+                        return offset;
+
+                p = q;
+        }
+
+        return offset;
+}
+
+const char *fdt_get_name(const void *fdt, int nodeoffset, int *len)
+{
+        const struct fdt_node_header *nh;
+        int err;
+
+        if ((err = fdt_check_header(fdt)) != 0)
+                goto fail;
+
+        err = -FDT_ERR_BADOFFSET;
+        nh = fdt_offset_ptr(fdt, nodeoffset, sizeof(*nh));
+        if (!nh || (fdt32_to_cpu(nh->tag) != FDT_BEGIN_NODE))
+                goto fail;
+
+        if (len)
+                *len = strlen(nh->name);
+
+        return nh->name;
+
+ fail:
+        if (len)
+                *len = err;
+        return NULL;
+}
+
+const struct fdt_property *fdt_get_property(const void *fdt,
+                                            int nodeoffset,
+                                            const char *name, int *lenp)
+{
+        uint32_t tag;
+        const struct fdt_property *prop;
+        int namestroff;
+        int offset, nextoffset;
+        int err;
+
+        if ((err = fdt_check_header(fdt)) != 0)
+                goto fail;
+
+        err = -FDT_ERR_BADOFFSET;
+        if (nodeoffset % FDT_TAGSIZE)
+                goto fail;
+
+        tag = fdt_next_tag(fdt, nodeoffset, &nextoffset);
+        if (tag != FDT_BEGIN_NODE)
+                goto fail;
+
+        do {
+                offset = nextoffset;
+
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+                switch (tag) {
+                case FDT_END:
+                        err = -FDT_ERR_TRUNCATED;
+                        goto fail;
+
+                case FDT_BEGIN_NODE:
+                case FDT_END_NODE:
+                case FDT_NOP:
+                        break;
+
+                case FDT_PROP:
+                        err = -FDT_ERR_BADSTRUCTURE;
+                        prop = fdt_offset_ptr(fdt, offset, sizeof(*prop));
+                        if (! prop)
+                                goto fail;
+                        namestroff = fdt32_to_cpu(prop->nameoff);
+                        if (streq(fdt_string(fdt, namestroff), name)) {
+                                /* Found it! */
+                                int len = fdt32_to_cpu(prop->len);
+                                prop = fdt_offset_ptr(fdt, offset,
+                                                      sizeof(*prop)+len);
+                                if (! prop)
+                                        goto fail;
+
+                                if (lenp)
+                                        *lenp = len;
+
+                                return prop;
+                        }
+                        break;
+
+                default:
+                        err = -FDT_ERR_BADSTRUCTURE;
+                        goto fail;
+                }
+        } while ((tag != FDT_BEGIN_NODE) && (tag != FDT_END_NODE));
+
+        err = -FDT_ERR_NOTFOUND;
+ fail:
+        if (lenp)
+                *lenp = err;
+        return NULL;
+}
+
+const void *fdt_getprop(const void *fdt, int nodeoffset,
+                  const char *name, int *lenp)
+{
+        const struct fdt_property *prop;
+
+        prop = fdt_get_property(fdt, nodeoffset, name, lenp);
+        if (! prop)
+                return NULL;
+
+        return prop->data;
+}
+
+uint32_t fdt_get_phandle(const void *fdt, int nodeoffset)
+{
+        const uint32_t *php;
+        int len;
+
+        php = fdt_getprop(fdt, nodeoffset, "linux,phandle", &len);
+        if (!php || (len != sizeof(*php)))
+                return 0;
+
+        return fdt32_to_cpu(*php);
+}
+
+int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen)
+{
+        uint32_t tag;
+        int p = 0, overflow = 0;
+        int offset, nextoffset, namelen;
+        const char *name;
+
+        CHECK_HEADER(fdt);
+
+        tag = fdt_next_tag(fdt, 0, &nextoffset);
+        if (tag != FDT_BEGIN_NODE)
+                return -FDT_ERR_BADSTRUCTURE;
+
+        if (buflen < 2)
+                return -FDT_ERR_NOSPACE;
+        buf[0] = '/';
+        p = 1;
+
+        while (nextoffset <= nodeoffset) {
+                offset = nextoffset;
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+                switch (tag) {
+                case FDT_END:
+                        return -FDT_ERR_BADOFFSET;
+
+                case FDT_BEGIN_NODE:
+                        name = fdt_get_name(fdt, offset, &namelen);
+                        if (!name)
+                                return namelen;
+                        if (overflow || ((p + namelen + 1) > buflen)) {
+                                overflow++;
+                                break;
+                        }
+                        memcpy(buf + p, name, namelen);
+                        p += namelen;
+                        buf[p++] = '/';
+                        break;
+
+                case FDT_END_NODE:
+                        if (overflow) {
+                                overflow--;
+                                break;
+                        }
+                        do {
+                                p--;
+                        } while  (buf[p-1] != '/');
+                        break;
+
+                case FDT_PROP:
+                case FDT_NOP:
+                        break;
+
+                default:
+                        return -FDT_ERR_BADSTRUCTURE;
+                }
+        }
+
+        if (overflow)
+                return -FDT_ERR_NOSPACE;
+
+        if (p > 1) /* special case so that root path is "/", not "" */
+                p--;
+        buf[p] = '\0';
+        return p;
+}
+
+int fdt_supernode_atdepth_offset(const void *fdt, int nodeoffset,
+                                 int supernodedepth, int *nodedepth)
+{
+        int level = -1;
+        uint32_t tag;
+        int offset, nextoffset = 0;
+        int supernodeoffset = -FDT_ERR_INTERNAL;
+
+        CHECK_HEADER(fdt);
+
+        if (supernodedepth < 0)
+                return -FDT_ERR_NOTFOUND;
+
+        do {
+                offset = nextoffset;
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+                switch (tag) {
+                case FDT_END:
+                        return -FDT_ERR_BADOFFSET;
+
+                case FDT_BEGIN_NODE:
+                        level++;
+                        if (level == supernodedepth)
+                                supernodeoffset = offset;
+                        break;
+
+                case FDT_END_NODE:
+                        level--;
+                        break;
+
+                case FDT_PROP:
+                case FDT_NOP:
+                        break;
+
+                default:
+                        return -FDT_ERR_BADSTRUCTURE;
+                }
+        } while (offset < nodeoffset);
+
+        if (nodedepth)
+                *nodedepth = level;
+
+        if (supernodedepth > level)
+                return -FDT_ERR_NOTFOUND;
+        return supernodeoffset;
+}
+
+int fdt_node_depth(const void *fdt, int nodeoffset)
+{
+        int nodedepth;
+        int err;
+
+        err = fdt_supernode_atdepth_offset(fdt, nodeoffset, 0, &nodedepth);
+        if (err)
+                return (err < 0) ? err : -FDT_ERR_INTERNAL;
+        return nodedepth;
+}
+
+int fdt_parent_offset(const void *fdt, int nodeoffset)
+{
+        int nodedepth = fdt_node_depth(fdt, nodeoffset);
+
+        if (nodedepth < 0)
+                return nodedepth;
+        return fdt_supernode_atdepth_offset(fdt, nodeoffset,
+                                            nodedepth - 1, NULL);
+}
+
+int fdt_node_offset_by_prop_value(const void *fdt, int startoffset,
+                                  const char *propname,
+                                  const void *propval, int proplen)
+{
+        uint32_t tag;
+        int offset, nextoffset;
+        const void *val;
+        int len;
+
+        CHECK_HEADER(fdt);
+
+        if (startoffset >= 0) {
+                tag = fdt_next_tag(fdt, startoffset, &nextoffset);
+                if (tag != FDT_BEGIN_NODE)
+                        return -FDT_ERR_BADOFFSET;
+        } else {
+                nextoffset = 0;
+        }
+
+        /* FIXME: The algorithm here is pretty horrible: we scan each
+         * property of a node in fdt_getprop(), then if that didn't
+         * find what we want, we scan over them again making our way
+         * to the next node.  Still it's the easiest to implement
+         * approach; performance can come later. */
+        do {
+                offset = nextoffset;
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+
+                switch (tag) {
+                case FDT_BEGIN_NODE:
+                        val = fdt_getprop(fdt, offset, propname, &len);
+                        if (val
+                            && (len == proplen)
+                            && (memcmp(val, propval, len) == 0))
+                                return offset;
+                        break;
+
+                case FDT_PROP:
+                case FDT_END:
+                case FDT_END_NODE:
+                case FDT_NOP:
+                        break;
+
+                default:
+                        return -FDT_ERR_BADSTRUCTURE;
+                }
+        } while (tag != FDT_END);
+
+        return -FDT_ERR_NOTFOUND;
+}
+
+int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle)
+{
+        if ((phandle == 0) || (phandle == -1))
+                return -FDT_ERR_BADPHANDLE;
+        phandle = cpu_to_fdt32(phandle);
+        return fdt_node_offset_by_prop_value(fdt, -1, "linux,phandle",
+                                             &phandle, sizeof(phandle));
+}
+
+int _stringlist_contains(const void *strlist, int listlen, const char *str)
+{
+        int len = strlen(str);
+        const void *p;
+
+        while (listlen >= len) {
+                if (memcmp(str, strlist, len+1) == 0)
+                        return 1;
+                p = memchr(strlist, '\0', listlen);
+                if (!p)
+                        return 0; /* malformed strlist.. */
+                listlen -= (p-strlist) + 1;
+                strlist = p + 1;
+        }
+        return 0;
+}
+
+int fdt_node_check_compatible(const void *fdt, int nodeoffset,
+                              const char *compatible)
+{
+        const void *prop;
+        int len;
+
+        prop = fdt_getprop(fdt, nodeoffset, "compatible", &len);
+        if (!prop)
+                return len;
+        if (_stringlist_contains(prop, len, compatible))
+                return 0;
+        else
+                return 1;
+}
+
+int fdt_node_offset_by_compatible(const void *fdt, int startoffset,
+                                  const char *compatible)
+{
+        uint32_t tag;
+        int offset, nextoffset;
+        int err;
+
+        CHECK_HEADER(fdt);
+
+        if (startoffset >= 0) {
+                tag = fdt_next_tag(fdt, startoffset, &nextoffset);
+                if (tag != FDT_BEGIN_NODE)
+                        return -FDT_ERR_BADOFFSET;
+        } else {
+                nextoffset = 0;
+        }
+
+        /* FIXME: The algorithm here is pretty horrible: we scan each
+         * property of a node in fdt_node_check_compatible(), then if
+         * that didn't find what we want, we scan over them again
+         * making our way to the next node.  Still it's the easiest to
+         * implement approach; performance can come later. */
+        do {
+                offset = nextoffset;
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+
+                switch (tag) {
+                case FDT_BEGIN_NODE:
+                        err = fdt_node_check_compatible(fdt, offset,
+                                                        compatible);
+                        if ((err < 0)
+                            && (err != -FDT_ERR_NOTFOUND))
+                                return err;
+                        else if (err == 0)
+                                return offset;
+                        break;
+
+                case FDT_PROP:
+                case FDT_END:
+                case FDT_END_NODE:
+                case FDT_NOP:
+                        break;
+
+                default:
+                        return -FDT_ERR_BADSTRUCTURE;
+                }
+        } while (tag != FDT_END);
+
+        return -FDT_ERR_NOTFOUND;
+}
diff --git a/arch/powerpc/boot/libfdt/fdt_rw.c b/arch/powerpc/boot/libfdt/fdt_rw.c
new file mode 100644
index 000000000000..6673f8ec962a
--- /dev/null
+++ b/arch/powerpc/boot/libfdt/fdt_rw.c
@@ -0,0 +1,447 @@
+/*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ *
+ * libfdt is dual licensed: you can use it either under the terms of
+ * the GPL, or the BSD license, at your option.
+ *
+ *  a) This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Alternatively,
+ *
+ *  b) Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *     2. Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "libfdt_env.h"
+
+#include <fdt.h>
+#include <libfdt.h>
+
+#include "libfdt_internal.h"
+
+static int _blocks_misordered(const void *fdt,
+                              int mem_rsv_size, int struct_size)
+{
+        return (fdt_off_mem_rsvmap(fdt) < ALIGN(sizeof(struct fdt_header), 8))
+                || (fdt_off_dt_struct(fdt) <
+                    (fdt_off_mem_rsvmap(fdt) + mem_rsv_size))
+                || (fdt_off_dt_strings(fdt) <
+                    (fdt_off_dt_struct(fdt) + struct_size))
+                || (fdt_totalsize(fdt) <
+                    (fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt)));
+}
+
+static int rw_check_header(void *fdt)
+{
+        int err;
+
+        if ((err = fdt_check_header(fdt)))
+                return err;
+        if (fdt_version(fdt) < 17)
+                return -FDT_ERR_BADVERSION;
+        if (_blocks_misordered(fdt, sizeof(struct fdt_reserve_entry),
+                               fdt_size_dt_struct(fdt)))
+                return -FDT_ERR_BADLAYOUT;
+        if (fdt_version(fdt) > 17)
+                fdt_set_version(fdt, 17);
+
+        return 0;
+}
+
+#define RW_CHECK_HEADER(fdt) \
+        { \
+                int err; \
+                if ((err = rw_check_header(fdt)) != 0) \
+                        return err; \
+        }
+
+static inline int _blob_data_size(void *fdt)
+{
+        return fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);
+}
+
+static int _blob_splice(void *fdt, void *p, int oldlen, int newlen)
+{
+        void *end = fdt + _blob_data_size(fdt);
+
+        if (((p + oldlen) < p) || ((p + oldlen) > end))
+                return -FDT_ERR_BADOFFSET;
+        if ((end - oldlen + newlen) > (fdt + fdt_totalsize(fdt)))
+                return -FDT_ERR_NOSPACE;
+        memmove(p + newlen, p + oldlen, end - p - oldlen);
+        return 0;
+}
+
+static int _blob_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p,
+                                int oldn, int newn)
+{
+        int delta = (newn - oldn) * sizeof(*p);
+        int err;
+        err = _blob_splice(fdt, p, oldn * sizeof(*p), newn * sizeof(*p));
+        if (err)
+                return err;
+        fdt_set_off_dt_struct(fdt, fdt_off_dt_struct(fdt) + delta);
+        fdt_set_off_dt_strings(fdt, fdt_off_dt_strings(fdt) + delta);
+        return 0;
+}
+
+static int _blob_splice_struct(void *fdt, void *p,
+                               int oldlen, int newlen)
+{
+        int delta = newlen - oldlen;
+        int err;
+
+        if ((err = _blob_splice(fdt, p, oldlen, newlen)))
+                return err;
+
+        fdt_set_size_dt_struct(fdt, fdt_size_dt_struct(fdt) + delta);
+        fdt_set_off_dt_strings(fdt, fdt_off_dt_strings(fdt) + delta);
+        return 0;
+}
+
+static int _blob_splice_string(void *fdt, int newlen)
+{
+        void *p = fdt + fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);
+        int err;
+
+        if ((err = _blob_splice(fdt, p, 0, newlen)))
+                return err;
+
+        fdt_set_size_dt_strings(fdt, fdt_size_dt_strings(fdt) + newlen);
+        return 0;
+}
+
+static int _find_add_string(void *fdt, const char *s)
+{
+        char *strtab = (char *)fdt + fdt_off_dt_strings(fdt);
+        const char *p;
+        char *new;
+        int len = strlen(s) + 1;
+        int err;
+
+        p = _fdt_find_string(strtab, fdt_size_dt_strings(fdt), s);
+        if (p)
+                /* found it */
+                return (p - strtab);
+
+        new = strtab + fdt_size_dt_strings(fdt);
+        err = _blob_splice_string(fdt, len);
+        if (err)
+                return err;
+
+        memcpy(new, s, len);
+        return (new - strtab);
+}
+
+int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size)
+{
+        struct fdt_reserve_entry *re;
+        int err;
+
+        if ((err = rw_check_header(fdt)))
+                return err;
+
+        re = _fdt_mem_rsv_w(fdt, fdt_num_mem_rsv(fdt));
+        err = _blob_splice_mem_rsv(fdt, re, 0, 1);
+        if (err)
+                return err;
+
+        re->address = cpu_to_fdt64(address);
+        re->size = cpu_to_fdt64(size);
+        return 0;
+}
+
+int fdt_del_mem_rsv(void *fdt, int n)
+{
+        struct fdt_reserve_entry *re = _fdt_mem_rsv_w(fdt, n);
+        int err;
+
+        if ((err = rw_check_header(fdt)))
+                return err;
+        if (n >= fdt_num_mem_rsv(fdt))
+                return -FDT_ERR_NOTFOUND;
+
+        err = _blob_splice_mem_rsv(fdt, re, 1, 0);
+        if (err)
+                return err;
+        return 0;
+}
+
+static int _resize_property(void *fdt, int nodeoffset, const char *name, int len,
+                            struct fdt_property **prop)
+{
+        int oldlen;
+        int err;
+
+        *prop = fdt_get_property_w(fdt, nodeoffset, name, &oldlen);
+        if (! (*prop))
+                return oldlen;
+
+        if ((err = _blob_splice_struct(fdt, (*prop)->data,
+                                       ALIGN(oldlen, FDT_TAGSIZE),
+                                       ALIGN(len, FDT_TAGSIZE))))
+                return err;
+
+        (*prop)->len = cpu_to_fdt32(len);
+        return 0;
+}
+
+static int _add_property(void *fdt, int nodeoffset, const char *name, int len,
+                         struct fdt_property **prop)
+{
+        uint32_t tag;
+        int proplen;
+        int nextoffset;
+        int namestroff;
+        int err;
+
+        tag = fdt_next_tag(fdt, nodeoffset, &nextoffset);
+        if (tag != FDT_BEGIN_NODE)
+                return -FDT_ERR_BADOFFSET;
+
+        namestroff = _find_add_string(fdt, name);
+        if (namestroff < 0)
+                return namestroff;
+
+        *prop = _fdt_offset_ptr_w(fdt, nextoffset);
+        proplen = sizeof(**prop) + ALIGN(len, FDT_TAGSIZE);
+
+        err = _blob_splice_struct(fdt, *prop, 0, proplen);
+        if (err)
+                return err;
+
+        (*prop)->tag = cpu_to_fdt32(FDT_PROP);
+        (*prop)->nameoff = cpu_to_fdt32(namestroff);
+        (*prop)->len = cpu_to_fdt32(len);
+        return 0;
+}
+
+int fdt_setprop(void *fdt, int nodeoffset, const char *name,
+                const void *val, int len)
+{
+        struct fdt_property *prop;
+        int err;
+
+        if ((err = rw_check_header(fdt)))
+                return err;
+
+        err = _resize_property(fdt, nodeoffset, name, len, &prop);
+        if (err == -FDT_ERR_NOTFOUND)
+                err = _add_property(fdt, nodeoffset, name, len, &prop);
+        if (err)
+                return err;
+
+        memcpy(prop->data, val, len);
+        return 0;
+}
+
+int fdt_delprop(void *fdt, int nodeoffset, const char *name)
+{
+        struct fdt_property *prop;
+        int len, proplen;
+
+        RW_CHECK_HEADER(fdt);
+
+        prop = fdt_get_property_w(fdt, nodeoffset, name, &len);
+        if (! prop)
+                return len;
+
+        proplen = sizeof(*prop) + ALIGN(len, FDT_TAGSIZE);
+        return _blob_splice_struct(fdt, prop, proplen, 0);
+}
+
+int fdt_add_subnode_namelen(void *fdt, int parentoffset,
+                            const char *name, int namelen)
+{
+        struct fdt_node_header *nh;
+        int offset, nextoffset;
+        int nodelen;
+        int err;
+        uint32_t tag;
+        uint32_t *endtag;
+
+        RW_CHECK_HEADER(fdt);
+
+        offset = fdt_subnode_offset_namelen(fdt, parentoffset, name, namelen);
+        if (offset >= 0)
+                return -FDT_ERR_EXISTS;
+        else if (offset != -FDT_ERR_NOTFOUND)
+                return offset;
+
+        /* Try to place the new node after the parent's properties */
+        fdt_next_tag(fdt, parentoffset, &nextoffset); /* skip the BEGIN_NODE */
+        do {
+                offset = nextoffset;
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+        } while (tag == FDT_PROP);
+
+        nh = _fdt_offset_ptr_w(fdt, offset);
+        nodelen = sizeof(*nh) + ALIGN(namelen+1, FDT_TAGSIZE) + FDT_TAGSIZE;
+
+        err = _blob_splice_struct(fdt, nh, 0, nodelen);
+        if (err)
+                return err;
+
+        nh->tag = cpu_to_fdt32(FDT_BEGIN_NODE);
+        memset(nh->name, 0, ALIGN(namelen+1, FDT_TAGSIZE));
+        memcpy(nh->name, name, namelen);
+        endtag = (uint32_t *)((void *)nh + nodelen - FDT_TAGSIZE);
+        *endtag = cpu_to_fdt32(FDT_END_NODE);
+
+        return offset;
+}
+
+int fdt_add_subnode(void *fdt, int parentoffset, const char *name)
+{
+        return fdt_add_subnode_namelen(fdt, parentoffset, name, strlen(name));
+}
+
+int fdt_del_node(void *fdt, int nodeoffset)
+{
+        int endoffset;
+
+        RW_CHECK_HEADER(fdt);
+
+        endoffset = _fdt_node_end_offset(fdt, nodeoffset);
+        if (endoffset < 0)
+                return endoffset;
+
+        return _blob_splice_struct(fdt, _fdt_offset_ptr_w(fdt, nodeoffset),
+                                   endoffset - nodeoffset, 0);
+}
+
+static void _packblocks(const void *fdt, void *buf,
+                       int mem_rsv_size, int struct_size)
+{
+        int mem_rsv_off, struct_off, strings_off;
+
+        mem_rsv_off = ALIGN(sizeof(struct fdt_header), 8);
+        struct_off = mem_rsv_off + mem_rsv_size;
+        strings_off = struct_off + struct_size;
+
+        memmove(buf + mem_rsv_off, fdt + fdt_off_mem_rsvmap(fdt), mem_rsv_size);
+        fdt_set_off_mem_rsvmap(buf, mem_rsv_off);
+
+        memmove(buf + struct_off, fdt + fdt_off_dt_struct(fdt), struct_size);
+        fdt_set_off_dt_struct(buf, struct_off);
+        fdt_set_size_dt_struct(buf, struct_size);
+
+        memmove(buf + strings_off, fdt + fdt_off_dt_strings(fdt),
+                fdt_size_dt_strings(fdt));
+        fdt_set_off_dt_strings(buf, strings_off);
+        fdt_set_size_dt_strings(buf, fdt_size_dt_strings(fdt));
+}
+
+int fdt_open_into(const void *fdt, void *buf, int bufsize)
+{
+        int err;
+        int mem_rsv_size, struct_size;
+        int newsize;
+        void *tmp;
+
+        err = fdt_check_header(fdt);
+        if (err)
+                return err;
+
+        mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)
+                * sizeof(struct fdt_reserve_entry);
+
+        if (fdt_version(fdt) >= 17) {
+                struct_size = fdt_size_dt_struct(fdt);
+        } else {
+                struct_size = 0;
+                while (fdt_next_tag(fdt, struct_size, &struct_size) != FDT_END)
+                        ;
+        }
+
+        if (!_blocks_misordered(fdt, mem_rsv_size, struct_size)) {
+                /* no further work necessary */
+                err = fdt_move(fdt, buf, bufsize);
+                if (err)
+                        return err;
+                fdt_set_version(buf, 17);
+                fdt_set_size_dt_struct(buf, struct_size);
+                fdt_set_totalsize(buf, bufsize);
+                return 0;
+        }
+
+        /* Need to reorder */
+        newsize = ALIGN(sizeof(struct fdt_header), 8) + mem_rsv_size
+                + struct_size + fdt_size_dt_strings(fdt);
+
+        if (bufsize < newsize)
+                return -FDT_ERR_NOSPACE;
+
+        if (((buf + newsize) <= fdt)
+            || (buf >= (fdt + fdt_totalsize(fdt)))) {
+                tmp = buf;
+        } else {
+                tmp = (void *)fdt + fdt_totalsize(fdt);
+                if ((tmp + newsize) > (buf + bufsize))
+                        return -FDT_ERR_NOSPACE;
+        }
+
+        _packblocks(fdt, tmp, mem_rsv_size, struct_size);
+        memmove(buf, tmp, newsize);
+
+        fdt_set_magic(buf, FDT_MAGIC);
+        fdt_set_totalsize(buf, bufsize);
+        fdt_set_version(buf, 17);
+        fdt_set_last_comp_version(buf, 16);
+        fdt_set_boot_cpuid_phys(buf, fdt_boot_cpuid_phys(fdt));
+
+        return 0;
+}
+
+int fdt_pack(void *fdt)
+{
+        int mem_rsv_size;
+        int err;
+
+        err = rw_check_header(fdt);
+        if (err)
+                return err;
+
+        mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)
+                * sizeof(struct fdt_reserve_entry);
+        _packblocks(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt));
+        fdt_set_totalsize(fdt, _blob_data_size(fdt));
+
+        return 0;
+}
diff --git a/arch/powerpc/boot/libfdt/fdt_strerror.c b/arch/powerpc/boot/libfdt/fdt_strerror.c
new file mode 100644
index 000000000000..f9d32ef5360a
--- /dev/null
+++ b/arch/powerpc/boot/libfdt/fdt_strerror.c
@@ -0,0 +1,96 @@
+/*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ *
+ * libfdt is dual licensed: you can use it either under the terms of
+ * the GPL, or the BSD license, at your option.
+ *
+ *  a) This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Alternatively,
+ *
+ *  b) Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *     2. Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "libfdt_env.h"
+
+#include <fdt.h>
+#include <libfdt.h>
+
+#include "libfdt_internal.h"
+
+struct errtabent {
+        const char *str;
+};
+
+#define ERRTABENT(val) \
+        [(val)] = { .str = #val, }
+
+static struct errtabent errtable[] = {
+        ERRTABENT(FDT_ERR_NOTFOUND),
+        ERRTABENT(FDT_ERR_EXISTS),
+        ERRTABENT(FDT_ERR_NOSPACE),
+
+        ERRTABENT(FDT_ERR_BADOFFSET),
+        ERRTABENT(FDT_ERR_BADPATH),
+        ERRTABENT(FDT_ERR_BADSTATE),
+
+        ERRTABENT(FDT_ERR_TRUNCATED),
+        ERRTABENT(FDT_ERR_BADMAGIC),
+        ERRTABENT(FDT_ERR_BADVERSION),
+        ERRTABENT(FDT_ERR_BADSTRUCTURE),
+        ERRTABENT(FDT_ERR_BADLAYOUT),
+};
+#define ERRTABSIZE      (sizeof(errtable) / sizeof(errtable[0]))
+
+const char *fdt_strerror(int errval)
+{
+        if (errval > 0)
+                return "<valid offset/length>";
+        else if (errval == 0)
+                return "<no error>";
+        else if (errval > -ERRTABSIZE) {
+                const char *s = errtable[-errval].str;
+
+                if (s)
+                        return s;
+        }
+
+        return "<unknown error>";
+}
diff --git a/arch/powerpc/boot/libfdt/fdt_sw.c b/arch/powerpc/boot/libfdt/fdt_sw.c
new file mode 100644
index 000000000000..dda2de34b2e0
--- /dev/null
+++ b/arch/powerpc/boot/libfdt/fdt_sw.c
@@ -0,0 +1,258 @@
+/*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ *
+ * libfdt is dual licensed: you can use it either under the terms of
+ * the GPL, or the BSD license, at your option.
+ *
+ *  a) This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Alternatively,
+ *
+ *  b) Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *     2. Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "libfdt_env.h"
+
+#include <fdt.h>
+#include <libfdt.h>
+
+#include "libfdt_internal.h"
+
+static int check_header_sw(void *fdt)
+{
+        if (fdt_magic(fdt) != SW_MAGIC)
+                return -FDT_ERR_BADMAGIC;
+        return 0;
+}
+
+static void *grab_space(void *fdt, int len)
+{
+        int offset = fdt_size_dt_struct(fdt);
+        int spaceleft;
+
+        spaceleft = fdt_totalsize(fdt) - fdt_off_dt_struct(fdt)
+                - fdt_size_dt_strings(fdt);
+
+        if ((offset + len < offset) || (offset + len > spaceleft))
+                return NULL;
+
+        fdt_set_size_dt_struct(fdt, offset + len);
+        return fdt_offset_ptr_w(fdt, offset, len);
+}
+
+int fdt_create(void *buf, int bufsize)
+{
+        void *fdt = buf;
+
+        if (bufsize < sizeof(struct fdt_header))
+                return -FDT_ERR_NOSPACE;
+
+        memset(buf, 0, bufsize);
+
+        fdt_set_magic(fdt, SW_MAGIC);
+        fdt_set_version(fdt, FDT_LAST_SUPPORTED_VERSION);
+        fdt_set_last_comp_version(fdt, FDT_FIRST_SUPPORTED_VERSION);
+        fdt_set_totalsize(fdt,  bufsize);
+
+        fdt_set_off_mem_rsvmap(fdt, ALIGN(sizeof(struct fdt_header),
+                                          sizeof(struct fdt_reserve_entry)));
+        fdt_set_off_dt_struct(fdt, fdt_off_mem_rsvmap(fdt));
+        fdt_set_off_dt_strings(fdt, bufsize);
+
+        return 0;
+}
+
+int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size)
+{
+        struct fdt_reserve_entry *re;
+        int err = check_header_sw(fdt);
+        int offset;
+
+        if (err)
+                return err;
+        if (fdt_size_dt_struct(fdt))
+                return -FDT_ERR_BADSTATE;
+
+        offset = fdt_off_dt_struct(fdt);
+        if ((offset + sizeof(*re)) > fdt_totalsize(fdt))
+                return -FDT_ERR_NOSPACE;
+
+        re = (struct fdt_reserve_entry *)(fdt + offset);
+        re->address = cpu_to_fdt64(addr);
+        re->size = cpu_to_fdt64(size);
+
+        fdt_set_off_dt_struct(fdt, offset + sizeof(*re));
+
+        return 0;
+}
+
+int fdt_finish_reservemap(void *fdt)
+{
+        return fdt_add_reservemap_entry(fdt, 0, 0);
+}
+
+int fdt_begin_node(void *fdt, const char *name)
+{
+        struct fdt_node_header *nh;
+        int err = check_header_sw(fdt);
+        int namelen = strlen(name) + 1;
+
+        if (err)
+                return err;
+
+        nh = grab_space(fdt, sizeof(*nh) + ALIGN(namelen, FDT_TAGSIZE));
+        if (! nh)
+                return -FDT_ERR_NOSPACE;
+
+        nh->tag = cpu_to_fdt32(FDT_BEGIN_NODE);
+        memcpy(nh->name, name, namelen);
+        return 0;
+}
+
+int fdt_end_node(void *fdt)
+{
+        uint32_t *en;
+        int err = check_header_sw(fdt);
+
+        if (err)
+                return err;
+
+        en = grab_space(fdt, FDT_TAGSIZE);
+        if (! en)
+                return -FDT_ERR_NOSPACE;
+
+        *en = cpu_to_fdt32(FDT_END_NODE);
+        return 0;
+}
+
+static int find_add_string(void *fdt, const char *s)
+{
+        char *strtab = (char *)fdt + fdt_totalsize(fdt);
+        const char *p;
+        int strtabsize = fdt_size_dt_strings(fdt);
+        int len = strlen(s) + 1;
+        int struct_top, offset;
+
+        p = _fdt_find_string(strtab - strtabsize, strtabsize, s);
+        if (p)
+                return p - strtab;
+
+        /* Add it */
+        offset = -strtabsize - len;
+        struct_top = fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt);
+        if (fdt_totalsize(fdt) + offset < struct_top)
+                return 0; /* no more room :( */
+
+        memcpy(strtab + offset, s, len);
+        fdt_set_size_dt_strings(fdt, strtabsize + len);
+        return offset;
+}
+
+int fdt_property(void *fdt, const char *name, const void *val, int len)
+{
+        struct fdt_property *prop;
+        int err = check_header_sw(fdt);
+        int nameoff;
+
+        if (err)
+                return err;
+
+        nameoff = find_add_string(fdt, name);
+        if (nameoff == 0)
+                return -FDT_ERR_NOSPACE;
+
+        prop = grab_space(fdt, sizeof(*prop) + ALIGN(len, FDT_TAGSIZE));
+        if (! prop)
+                return -FDT_ERR_NOSPACE;
+
+        prop->tag = cpu_to_fdt32(FDT_PROP);
+        prop->nameoff = cpu_to_fdt32(nameoff);
+        prop->len = cpu_to_fdt32(len);
+        memcpy(prop->data, val, len);
+        return 0;
+}
+
+int fdt_finish(void *fdt)
+{
+        int err = check_header_sw(fdt);
+        char *p = (char *)fdt;
+        uint32_t *end;
+        int oldstroffset, newstroffset;
+        uint32_t tag;
+        int offset, nextoffset;
+
+        if (err)
+                return err;
+
+        /* Add terminator */
+        end = grab_space(fdt, sizeof(*end));
+        if (! end)
+                return -FDT_ERR_NOSPACE;
+        *end = cpu_to_fdt32(FDT_END);
+
+        /* Relocate the string table */
+        oldstroffset = fdt_totalsize(fdt) - fdt_size_dt_strings(fdt);
+        newstroffset = fdt_off_dt_struct(fdt) + fdt_size_dt_struct(fdt);
+        memmove(p + newstroffset, p + oldstroffset, fdt_size_dt_strings(fdt));
+        fdt_set_off_dt_strings(fdt, newstroffset);
+
+        /* Walk the structure, correcting string offsets */
+        offset = 0;
+        while ((tag = fdt_next_tag(fdt, offset, &nextoffset)) != FDT_END) {
+                if (tag == FDT_PROP) {
+                        struct fdt_property *prop =
+                                fdt_offset_ptr_w(fdt, offset, sizeof(*prop));
+                        int nameoff;
+
+                        if (! prop)
+                                return -FDT_ERR_BADSTRUCTURE;
+
+                        nameoff = fdt32_to_cpu(prop->nameoff);
+                        nameoff += fdt_size_dt_strings(fdt);
+                        prop->nameoff = cpu_to_fdt32(nameoff);
+                }
+                offset = nextoffset;
+        }
+
+        /* Finally, adjust the header */
+        fdt_set_totalsize(fdt, newstroffset + fdt_size_dt_strings(fdt));
+        fdt_set_magic(fdt, FDT_MAGIC);
+        return 0;
+}
diff --git a/arch/powerpc/boot/libfdt/fdt_wip.c b/arch/powerpc/boot/libfdt/fdt_wip.c
new file mode 100644
index 000000000000..88e24b8318f4
--- /dev/null
+++ b/arch/powerpc/boot/libfdt/fdt_wip.c
@@ -0,0 +1,144 @@
+/*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ *
+ * libfdt is dual licensed: you can use it either under the terms of
+ * the GPL, or the BSD license, at your option.
+ *
+ *  a) This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Alternatively,
+ *
+ *  b) Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *     2. Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include "libfdt_env.h"
+
+#include <fdt.h>
+#include <libfdt.h>
+
+#include "libfdt_internal.h"
+
+int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
+                        const void *val, int len)
+{
+        void *propval;
+        int proplen;
+
+        propval = fdt_getprop_w(fdt, nodeoffset, name, &proplen);
+        if (! propval)
+                return proplen;
+
+        if (proplen != len)
+                return -FDT_ERR_NOSPACE;
+
+        memcpy(propval, val, len);
+        return 0;
+}
+
+static void nop_region(void *start, int len)
+{
+        uint32_t *p;
+
+        for (p = start; (void *)p < (start + len); p++)
+                *p = cpu_to_fdt32(FDT_NOP);
+}
+
+int fdt_nop_property(void *fdt, int nodeoffset, const char *name)
+{
+        struct fdt_property *prop;
+        int len;
+
+        prop = fdt_get_property_w(fdt, nodeoffset, name, &len);
+        if (! prop)
+                return len;
+
+        nop_region(prop, len + sizeof(*prop));
+
+        return 0;
+}
+
+int _fdt_node_end_offset(void *fdt, int nodeoffset)
+{
+        int level = 0;
+        uint32_t tag;
+        int offset, nextoffset;
+
+        tag = fdt_next_tag(fdt, nodeoffset, &nextoffset);
+        if (tag != FDT_BEGIN_NODE)
+                return -FDT_ERR_BADOFFSET;
+        do {
+                offset = nextoffset;
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+
+                switch (tag) {
+                case FDT_END:
+                        return offset;
+
+                case FDT_BEGIN_NODE:
+                        level++;
+                        break;
+
+                case FDT_END_NODE:
+                        level--;
+                        break;
+
+                case FDT_PROP:
+                case FDT_NOP:
+                        break;
+
+                default:
+                        return -FDT_ERR_BADSTRUCTURE;
+                }
+        } while (level >= 0);
+
+        return nextoffset;
+}
+
+int fdt_nop_node(void *fdt, int nodeoffset)
+{
+        int endoffset;
+
+        endoffset = _fdt_node_end_offset(fdt, nodeoffset);
+        if (endoffset < 0)
+                return endoffset;
+
+        nop_region(fdt_offset_ptr_w(fdt, nodeoffset, 0), endoffset - nodeoffset);
+        return 0;
+}
diff --git a/arch/powerpc/boot/libfdt/libfdt.h b/arch/powerpc/boot/libfdt/libfdt.h
new file mode 100644
index 000000000000..6b2fb92ea357
--- /dev/null
+++ b/arch/powerpc/boot/libfdt/libfdt.h
@@ -0,0 +1,721 @@
+#ifndef _LIBFDT_H
+#define _LIBFDT_H
+/*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ *
+ * libfdt is dual licensed: you can use it either under the terms of
+ * the GPL, or the BSD license, at your option.
+ *
+ *  a) This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Alternatively,
+ *
+ *  b) Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *     2. Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <libfdt_env.h>
+#include <fdt.h>
+
+#define FDT_FIRST_SUPPORTED_VERSION     0x10
+#define FDT_LAST_SUPPORTED_VERSION      0x11
+
+/* Error codes: informative error codes */
+#define FDT_ERR_NOTFOUND        1
+        /* FDT_ERR_NOTFOUND: The requested node or property does not exist */
+#define FDT_ERR_EXISTS          2
+        /* FDT_ERR_EXISTS: Attemped to create a node or property which
+         * already exists */
+#define FDT_ERR_NOSPACE         3
+        /* FDT_ERR_NOSPACE: Operation needed to expand the device
+         * tree, but its buffer did not have sufficient space to
+         * contain the expanded tree. Use fdt_open_into() to move the
+         * device tree to a buffer with more space. */
+
+/* Error codes: codes for bad parameters */
+#define FDT_ERR_BADOFFSET       4
+        /* FDT_ERR_BADOFFSET: Function was passed a structure block
+         * offset which is out-of-bounds, or which points to an
+         * unsuitable part of the structure for the operation. */
+#define FDT_ERR_BADPATH         5
+        /* FDT_ERR_BADPATH: Function was passed a badly formatted path
+         * (e.g. missing a leading / for a function which requires an
+         * absolute path) */
+#define FDT_ERR_BADPHANDLE      6
+        /* FDT_ERR_BADPHANDLE: Function was passed an invalid phandle
+         * value.  phandle values of 0 and -1 are not permitted. */
+#define FDT_ERR_BADSTATE        7
+        /* FDT_ERR_BADSTATE: Function was passed an incomplete device
+         * tree created by the sequential-write functions, which is
+         * not sufficiently complete for the requested operation. */
+
+/* Error codes: codes for bad device tree blobs */
+#define FDT_ERR_TRUNCATED       8
+        /* FDT_ERR_TRUNCATED: Structure block of the given device tree
+         * ends without an FDT_END tag. */
+#define FDT_ERR_BADMAGIC        9
+        /* FDT_ERR_BADMAGIC: Given "device tree" appears not to be a
+         * device tree at all - it is missing the flattened device
+         * tree magic number. */
+#define FDT_ERR_BADVERSION      10
+        /* FDT_ERR_BADVERSION: Given device tree has a version which
+         * can't be handled by the requested operation.  For
+         * read-write functions, this may mean that fdt_open_into() is
+         * required to convert the tree to the expected version. */
+#define FDT_ERR_BADSTRUCTURE    11
+        /* FDT_ERR_BADSTRUCTURE: Given device tree has a corrupt
+         * structure block or other serious error (e.g. misnested
+         * nodes, or subnodes preceding properties). */
+#define FDT_ERR_BADLAYOUT       12
+        /* FDT_ERR_BADLAYOUT: For read-write functions, the given
+         * device tree has it's sub-blocks in an order that the
+         * function can't handle (memory reserve map, then structure,
+         * then strings).  Use fdt_open_into() to reorganize the tree
+         * into a form suitable for the read-write operations. */
+
+/* "Can't happen" error indicating a bug in libfdt */
+#define FDT_ERR_INTERNAL        13
+        /* FDT_ERR_INTERNAL: libfdt has failed an internal assertion.
+         * Should never be returned, if it is, it indicates a bug in
+         * libfdt itself. */
+
+#define FDT_ERR_MAX             13
+
+/**********************************************************************/
+/* Low-level functions (you probably don't need these)                */
+/**********************************************************************/
+
+const void *fdt_offset_ptr(const void *fdt, int offset, int checklen);
+static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen)
+{
+        return (void *)fdt_offset_ptr(fdt, offset, checklen);
+}
+
+uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset);
+
+/**********************************************************************/
+/* General functions                                                  */
+/**********************************************************************/
+
+#define fdt_get_header(fdt, field) \
+        (fdt32_to_cpu(((const struct fdt_header *)(fdt))->field))
+#define fdt_magic(fdt)                  (fdt_get_header(fdt, magic))
+#define fdt_totalsize(fdt)              (fdt_get_header(fdt, totalsize))
+#define fdt_off_dt_struct(fdt)          (fdt_get_header(fdt, off_dt_struct))
+#define fdt_off_dt_strings(fdt)         (fdt_get_header(fdt, off_dt_strings))
+#define fdt_off_mem_rsvmap(fdt)         (fdt_get_header(fdt, off_mem_rsvmap))
+#define fdt_version(fdt)                (fdt_get_header(fdt, version))
+#define fdt_last_comp_version(fdt)      (fdt_get_header(fdt, last_comp_version))
+#define fdt_boot_cpuid_phys(fdt)        (fdt_get_header(fdt, boot_cpuid_phys))
+#define fdt_size_dt_strings(fdt)        (fdt_get_header(fdt, size_dt_strings))
+#define fdt_size_dt_struct(fdt)         (fdt_get_header(fdt, size_dt_struct))
+
+#define __fdt_set_hdr(name) \
+        static inline void fdt_set_##name(void *fdt, uint32_t val) \
+        { \
+                struct fdt_header *fdth = fdt; \
+                fdth->name = cpu_to_fdt32(val); \
+        }
+__fdt_set_hdr(magic);
+__fdt_set_hdr(totalsize);
+__fdt_set_hdr(off_dt_struct);
+__fdt_set_hdr(off_dt_strings);
+__fdt_set_hdr(off_mem_rsvmap);
+__fdt_set_hdr(version);
+__fdt_set_hdr(last_comp_version);
+__fdt_set_hdr(boot_cpuid_phys);
+__fdt_set_hdr(size_dt_strings);
+__fdt_set_hdr(size_dt_struct);
+#undef __fdt_set_hdr
+
+/**
+ * fdt_check_header - sanity check a device tree or possible device tree
+ * @fdt: pointer to data which might be a flattened device tree
+ *
+ * fdt_check_header() checks that the given buffer contains what
+ * appears to be a flattened device tree with sane information in its
+ * header.
+ *
+ * returns:
+ *     0, if the buffer appears to contain a valid device tree
+ *     -FDT_ERR_BADMAGIC,
+ *     -FDT_ERR_BADVERSION,
+ *     -FDT_ERR_BADSTATE, standard meanings, as above
+ */
+int fdt_check_header(const void *fdt);
+
+/**
+ * fdt_move - move a device tree around in memory
+ * @fdt: pointer to the device tree to move
+ * @buf: pointer to memory where the device is to be moved
+ * @bufsize: size of the memory space at buf
+ *
+ * fdt_move() relocates, if possible, the device tree blob located at
+ * fdt to the buffer at buf of size bufsize.  The buffer may overlap
+ * with the existing device tree blob at fdt.  Therefore,
+ *     fdt_move(fdt, fdt, fdt_totalsize(fdt))
+ * should always succeed.
+ *
+ * returns:
+ *     0, on success
+ *     -FDT_ERR_NOSPACE, bufsize is insufficient to contain the device tree
+ *     -FDT_ERR_BADMAGIC,
+ *     -FDT_ERR_BADVERSION,
+ *     -FDT_ERR_BADSTATE, standard meanings
+ */
+int fdt_move(const void *fdt, void *buf, int bufsize);
+
+/**********************************************************************/
+/* Read-only functions                                                */
+/**********************************************************************/
+
+/**
+ * fdt_string - retreive a string from the strings block of a device tree
+ * @fdt: pointer to the device tree blob
+ * @stroffset: offset of the string within the strings block (native endian)
+ *
+ * fdt_string() retrieves a pointer to a single string from the
+ * strings block of the device tree blob at fdt.
+ *
+ * returns:
+ *     a pointer to the string, on success
+ *     NULL, if stroffset is out of bounds
+ */
+const char *fdt_string(const void *fdt, int stroffset);
+
+/**
+ * fdt_num_mem_rsv - retreive the number of memory reserve map entries
+ * @fdt: pointer to the device tree blob
+ *
+ * Returns the number of entries in the device tree blob's memory
+ * reservation map.  This does not include the terminating 0,0 entry
+ * or any other (0,0) entries reserved for expansion.
+ *
+ * returns:
+ *     the number of entries
+ */
+int fdt_num_mem_rsv(const void *fdt);
+
+/**
+ * fdt_get_mem_rsv - retreive one memory reserve map entry
+ * @fdt: pointer to the device tree blob
+ * @address, @size: pointers to 64-bit variables
+ *
+ * On success, *address and *size will contain the address and size of
+ * the n-th reserve map entry from the device tree blob, in
+ * native-endian format.
+ *
+ * returns:
+ *     0, on success
+ *     -FDT_ERR_BADMAGIC,
+ *     -FDT_ERR_BADVERSION,
+ *     -FDT_ERR_BADSTATE, standard meanings
+ */
+int fdt_get_mem_rsv(const void *fdt, int n, uint64_t *address, uint64_t *size);
+
+/**
+ * fdt_subnode_offset_namelen - find a subnode based on substring
+ * @fdt: pointer to the device tree blob
+ * @parentoffset: structure block offset of a node
+ * @name: name of the subnode to locate
+ * @namelen: number of characters of name to consider
+ *
+ * Identical to fdt_subnode_offset(), but only examine the first
+ * namelen characters of name for matching the subnode name.  This is
+ * useful for finding subnodes based on a portion of a larger string,
+ * such as a full path.
+ */
+int fdt_subnode_offset_namelen(const void *fdt, int parentoffset,
+                               const char *name, int namelen);
+/**
+ * fdt_subnode_offset - find a subnode of a given node
+ * @fdt: pointer to the device tree blob
+ * @parentoffset: structure block offset of a node
+ * @name: name of the subnode to locate
+ *
+ * fdt_subnode_offset() finds a subnode of the node at structure block
+ * offset parentoffset with the given name.  name may include a unit
+ * address, in which case fdt_subnode_offset() will find the subnode
+ * with that unit address, or the unit address may be omitted, in
+ * which case fdt_subnode_offset() will find an arbitrary subnode
+ * whose name excluding unit address matches the given name.
+ *
+ * returns:
+ *      structure block offset of the requested subnode (>=0), on success
+ *      -FDT_ERR_NOTFOUND, if the requested subnode does not exist
+ *      -FDT_ERR_BADOFFSET, if parentoffset did not point to an FDT_BEGIN_NODE tag
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE,
+ *      -FDT_ERR_TRUNCATED, standard meanings.
+ */
+int fdt_subnode_offset(const void *fdt, int parentoffset, const char *name);
+
+/**
+ * fdt_path_offset - find a tree node by its full path
+ * @fdt: pointer to the device tree blob
+ * @path: full path of the node to locate
+ *
+ * fdt_path_offset() finds a node of a given path in the device tree.
+ * Each path component may omit the unit address portion, but the
+ * results of this are undefined if any such path component is
+ * ambiguous (that is if there are multiple nodes at the relevant
+ * level matching the given component, differentiated only by unit
+ * address).
+ *
+ * returns:
+ *      structure block offset of the node with the requested path (>=0), on success
+ *      -FDT_ERR_BADPATH, given path does not begin with '/' or is invalid
+ *      -FDT_ERR_NOTFOUND, if the requested node does not exist
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE,
+ *      -FDT_ERR_TRUNCATED, standard meanings.
+ */
+int fdt_path_offset(const void *fdt, const char *path);
+
+/**
+ * fdt_get_name - retreive the name of a given node
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: structure block offset of the starting node
+ * @lenp: pointer to an integer variable (will be overwritten) or NULL
+ *
+ * fdt_get_name() retrieves the name (including unit address) of the
+ * device tree node at structure block offset nodeoffset.  If lenp is
+ * non-NULL, the length of this name is also returned, in the integer
+ * pointed to by lenp.
+ *
+ * returns:
+ *      pointer to the node's name, on success
+ *              If lenp is non-NULL, *lenp contains the length of that name (>=0)
+ *      NULL, on error
+ *              if lenp is non-NULL *lenp contains an error code (<0):
+ *              -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
+ *              -FDT_ERR_BADMAGIC,
+ *              -FDT_ERR_BADVERSION,
+ *              -FDT_ERR_BADSTATE, standard meanings
+ */
+const char *fdt_get_name(const void *fdt, int nodeoffset, int *lenp);
+
+/**
+ * fdt_get_property - find a given property in a given node
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose property to find
+ * @name: name of the property to find
+ * @lenp: pointer to an integer variable (will be overwritten) or NULL
+ *
+ * fdt_get_property() retrieves a pointer to the fdt_property
+ * structure within the device tree blob corresponding to the property
+ * named 'name' of the node at offset nodeoffset.  If lenp is
+ * non-NULL, the length of the property value also returned, in the
+ * integer pointed to by lenp.
+ *
+ * returns:
+ *      pointer to the structure representing the property
+ *              if lenp is non-NULL, *lenp contains the length of the property
+ *              value (>=0)
+ *      NULL, on error
+ *              if lenp is non-NULL, *lenp contains an error code (<0):
+ *              -FDT_ERR_NOTFOUND, node does not have named property
+ *              -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
+ *              -FDT_ERR_BADMAGIC,
+ *              -FDT_ERR_BADVERSION,
+ *              -FDT_ERR_BADSTATE,
+ *              -FDT_ERR_BADSTRUCTURE,
+ *              -FDT_ERR_TRUNCATED, standard meanings
+ */
+const struct fdt_property *fdt_get_property(const void *fdt, int nodeoffset,
+                                            const char *name, int *lenp);
+static inline struct fdt_property *fdt_get_property_w(void *fdt, int nodeoffset,
+                                                      const char *name,
+                                                      int *lenp)
+{
+        return (struct fdt_property *)fdt_get_property(fdt, nodeoffset,
+                                                       name, lenp);
+}
+
+/**
+ * fdt_getprop - retrieve the value of a given property
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose property to find
+ * @name: name of the property to find
+ * @lenp: pointer to an integer variable (will be overwritten) or NULL
+ *
+ * fdt_getprop() retrieves a pointer to the value of the property
+ * named 'name' of the node at offset nodeoffset (this will be a
+ * pointer to within the device blob itself, not a copy of the value).
+ * If lenp is non-NULL, the length of the property value also
+ * returned, in the integer pointed to by lenp.
+ *
+ * returns:
+ *      pointer to the property's value
+ *              if lenp is non-NULL, *lenp contains the length of the property
+ *              value (>=0)
+ *      NULL, on error
+ *              if lenp is non-NULL, *lenp contains an error code (<0):
+ *              -FDT_ERR_NOTFOUND, node does not have named property
+ *              -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
+ *              -FDT_ERR_BADMAGIC,
+ *              -FDT_ERR_BADVERSION,
+ *              -FDT_ERR_BADSTATE,
+ *              -FDT_ERR_BADSTRUCTURE,
+ *              -FDT_ERR_TRUNCATED, standard meanings
+ */
+const void *fdt_getprop(const void *fdt, int nodeoffset,
+                        const char *name, int *lenp);
+static inline void *fdt_getprop_w(void *fdt, int nodeoffset,
+                                  const char *name, int *lenp)
+{
+        return (void *)fdt_getprop(fdt, nodeoffset, name, lenp);
+}
+
+/**
+ * fdt_get_phandle - retreive the phandle of a given node
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: structure block offset of the node
+ *
+ * fdt_get_phandle() retrieves the phandle of the device tree node at
+ * structure block offset nodeoffset.
+ *
+ * returns:
+ *      the phandle of the node at nodeoffset, on succes (!= 0, != -1)
+ *      0, if the node has no phandle, or another error occurs
+ */
+uint32_t fdt_get_phandle(const void *fdt, int nodeoffset);
+
+/**
+ * fdt_get_path - determine the full path of a node
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose path to find
+ * @buf: character buffer to contain the returned path (will be overwritten)
+ * @buflen: size of the character buffer at buf
+ *
+ * fdt_get_path() computes the full path of the node at offset
+ * nodeoffset, and records that path in the buffer at buf.
+ *
+ * NOTE: This function is expensive, as it must scan the device tree
+ * structure from the start to nodeoffset.
+ *
+ * returns:
+ *      0, on success
+ *              buf contains the absolute path of the node at
+ *              nodeoffset, as a NUL-terminated string.
+ *      -FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag
+ *      -FDT_ERR_NOSPACE, the path of the given node is longer than (bufsize-1)
+ *              characters and will not fit in the given buffer.
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE, standard meanings
+ */
+int fdt_get_path(const void *fdt, int nodeoffset, char *buf, int buflen);
+
+/**
+ * fdt_supernode_atdepth_offset - find a specific ancestor of a node
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose parent to find
+ * @supernodedepth: depth of the ancestor to find
+ * @nodedepth: pointer to an integer variable (will be overwritten) or NULL
+ *
+ * fdt_supernode_atdepth_offset() finds an ancestor of the given node
+ * at a specific depth from the root (where the root itself has depth
+ * 0, its immediate subnodes depth 1 and so forth).  So
+ *      fdt_supernode_atdepth_offset(fdt, nodeoffset, 0, NULL);
+ * will always return 0, the offset of the root node.  If the node at
+ * nodeoffset has depth D, then:
+ *      fdt_supernode_atdepth_offset(fdt, nodeoffset, D, NULL);
+ * will return nodeoffset itself.
+ *
+ * NOTE: This function is expensive, as it must scan the device tree
+ * structure from the start to nodeoffset.
+ *
+ * returns:
+
+ *      structure block offset of the node at node offset's ancestor
+ *              of depth supernodedepth (>=0), on success
+ *      -FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag
+*       -FDT_ERR_NOTFOUND, supernodedepth was greater than the depth of nodeoffset
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE, standard meanings
+ */
+int fdt_supernode_atdepth_offset(const void *fdt, int nodeoffset,
+                                 int supernodedepth, int *nodedepth);
+
+/**
+ * fdt_node_depth - find the depth of a given node
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose parent to find
+ *
+ * fdt_node_depth() finds the depth of a given node.  The root node
+ * has depth 0, its immediate subnodes depth 1 and so forth.
+ *
+ * NOTE: This function is expensive, as it must scan the device tree
+ * structure from the start to nodeoffset.
+ *
+ * returns:
+ *      depth of the node at nodeoffset (>=0), on success
+ *      -FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE, standard meanings
+ */
+int fdt_node_depth(const void *fdt, int nodeoffset);
+
+/**
+ * fdt_parent_offset - find the parent of a given node
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose parent to find
+ *
+ * fdt_parent_offset() locates the parent node of a given node (that
+ * is, it finds the offset of the node which contains the node at
+ * nodeoffset as a subnode).
+ *
+ * NOTE: This function is expensive, as it must scan the device tree
+ * structure from the start to nodeoffset, *twice*.
+ *
+ * returns:
+ *      stucture block offset of the parent of the node at nodeoffset
+ *              (>=0), on success
+ *      -FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE, standard meanings
+ */
+int fdt_parent_offset(const void *fdt, int nodeoffset);
+
+/**
+ * fdt_node_offset_by_prop_value - find nodes with a given property value
+ * @fdt: pointer to the device tree blob
+ * @startoffset: only find nodes after this offset
+ * @propname: property name to check
+ * @propval: property value to search for
+ * @proplen: length of the value in propval
+ *
+ * fdt_node_offset_by_prop_value() returns the offset of the first
+ * node after startoffset, which has a property named propname whose
+ * value is of length proplen and has value equal to propval; or if
+ * startoffset is -1, the very first such node in the tree.
+ *
+ * To iterate through all nodes matching the criterion, the following
+ * idiom can be used:
+ *      offset = fdt_node_offset_by_prop_value(fdt, -1, propname,
+ *                                             propval, proplen);
+ *      while (offset != -FDT_ERR_NOTFOUND) {
+ *              // other code here
+ *              offset = fdt_node_offset_by_prop_value(fdt, offset, propname,
+ *                                                     propval, proplen);
+ *      }
+ *
+ * Note the -1 in the first call to the function, if 0 is used here
+ * instead, the function will never locate the root node, even if it
+ * matches the criterion.
+ *
+ * returns:
+ *      structure block offset of the located node (>= 0, >startoffset),
+ *               on success
+ *      -FDT_ERR_NOTFOUND, no node matching the criterion exists in the
+ *              tree after startoffset
+ *      -FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE, standard meanings
+ */
+int fdt_node_offset_by_prop_value(const void *fdt, int startoffset,
+                                  const char *propname,
+                                  const void *propval, int proplen);
+
+/**
+ * fdt_node_offset_by_phandle - find the node with a given phandle
+ * @fdt: pointer to the device tree blob
+ * @phandle: phandle value
+ *
+ * fdt_node_offset_by_prop_value() returns the offset of the node
+ * which has the given phandle value.  If there is more than one node
+ * in the tree with the given phandle (an invalid tree), results are
+ * undefined.
+ *
+ * returns:
+ *      structure block offset of the located node (>= 0), on success
+ *      -FDT_ERR_NOTFOUND, no node with that phandle exists
+ *      -FDT_ERR_BADPHANDLE, given phandle value was invalid (0 or -1)
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE, standard meanings
+ */
+int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle);
+
+/**
+ * fdt_node_check_compatible: check a node's compatible property
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of a tree node
+ * @compatible: string to match against
+ *
+ *
+ * fdt_node_check_compatible() returns 0 if the given node contains a
+ * 'compatible' property with the given string as one of its elements,
+ * it returns non-zero otherwise, or on error.
+ *
+ * returns:
+ *      0, if the node has a 'compatible' property listing the given string
+ *      1, if the node has a 'compatible' property, but it does not list
+ *              the given string
+ *      -FDT_ERR_NOTFOUND, if the given node has no 'compatible' property
+ *      -FDT_ERR_BADOFFSET, if nodeoffset does not refer to a BEGIN_NODE tag
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE, standard meanings
+ */
+int fdt_node_check_compatible(const void *fdt, int nodeoffset,
+                              const char *compatible);
+
+/**
+ * fdt_node_offset_by_compatible - find nodes with a given 'compatible' value
+ * @fdt: pointer to the device tree blob
+ * @startoffset: only find nodes after this offset
+ * @compatible: 'compatible' string to match against
+ *
+ * fdt_node_offset_by_compatible() returns the offset of the first
+ * node after startoffset, which has a 'compatible' property which
+ * lists the given compatible string; or if startoffset is -1, the
+ * very first such node in the tree.
+ *
+ * To iterate through all nodes matching the criterion, the following
+ * idiom can be used:
+ *      offset = fdt_node_offset_by_compatible(fdt, -1, compatible);
+ *      while (offset != -FDT_ERR_NOTFOUND) {
+ *              // other code here
+ *              offset = fdt_node_offset_by_compatible(fdt, offset, compatible);
+ *      }
+ *
+ * Note the -1 in the first call to the function, if 0 is used here
+ * instead, the function will never locate the root node, even if it
+ * matches the criterion.
+ *
+ * returns:
+ *      structure block offset of the located node (>= 0, >startoffset),
+ *               on success
+ *      -FDT_ERR_NOTFOUND, no node matching the criterion exists in the
+ *              tree after startoffset
+ *      -FDT_ERR_BADOFFSET, nodeoffset does not refer to a BEGIN_NODE tag
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE, standard meanings
+ */
+int fdt_node_offset_by_compatible(const void *fdt, int startoffset,
+                                  const char *compatible);
+
+/**********************************************************************/
+/* Write-in-place functions                                           */
+/**********************************************************************/
+
+int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
+                        const void *val, int len);
+static inline int fdt_setprop_inplace_cell(void *fdt, int nodeoffset,
+                                           const char *name, uint32_t val)
+{
+        val = cpu_to_fdt32(val);
+        return fdt_setprop_inplace(fdt, nodeoffset, name, &val, sizeof(val));
+}
+
+int fdt_nop_property(void *fdt, int nodeoffset, const char *name);
+int fdt_nop_node(void *fdt, int nodeoffset);
+
+/**********************************************************************/
+/* Sequential write functions                                         */
+/**********************************************************************/
+
+int fdt_create(void *buf, int bufsize);
+int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size);
+int fdt_finish_reservemap(void *fdt);
+int fdt_begin_node(void *fdt, const char *name);
+int fdt_property(void *fdt, const char *name, const void *val, int len);
+static inline int fdt_property_cell(void *fdt, const char *name, uint32_t val)
+{
+        val = cpu_to_fdt32(val);
+        return fdt_property(fdt, name, &val, sizeof(val));
+}
+#define fdt_property_string(fdt, name, str) \
+        fdt_property(fdt, name, str, strlen(str)+1)
+int fdt_end_node(void *fdt);
+int fdt_finish(void *fdt);
+
+/**********************************************************************/
+/* Read-write functions                                               */
+/**********************************************************************/
+
+int fdt_open_into(const void *fdt, void *buf, int bufsize);
+int fdt_pack(void *fdt);
+
+int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size);
+int fdt_del_mem_rsv(void *fdt, int n);
+
+int fdt_setprop(void *fdt, int nodeoffset, const char *name,
+                const void *val, int len);
+static inline int fdt_setprop_cell(void *fdt, int nodeoffset, const char *name,
+                                   uint32_t val)
+{
+        val = cpu_to_fdt32(val);
+        return fdt_setprop(fdt, nodeoffset, name, &val, sizeof(val));
+}
+#define fdt_setprop_string(fdt, nodeoffset, name, str) \
+        fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1)
+int fdt_delprop(void *fdt, int nodeoffset, const char *name);
+int fdt_add_subnode_namelen(void *fdt, int parentoffset,
+                            const char *name, int namelen);
+int fdt_add_subnode(void *fdt, int parentoffset, const char *name);
+int fdt_del_node(void *fdt, int nodeoffset);
+
+/**********************************************************************/
+/* Debugging / informational functions                                */
+/**********************************************************************/
+
+const char *fdt_strerror(int errval);
+
+#endif /* _LIBFDT_H */
diff --git a/arch/powerpc/boot/libfdt/libfdt_internal.h b/arch/powerpc/boot/libfdt/libfdt_internal.h
new file mode 100644
index 000000000000..1e60936beb5b
--- /dev/null
+++ b/arch/powerpc/boot/libfdt/libfdt_internal.h
@@ -0,0 +1,89 @@
+#ifndef _LIBFDT_INTERNAL_H
+#define _LIBFDT_INTERNAL_H
+/*
+ * libfdt - Flat Device Tree manipulation
+ * Copyright (C) 2006 David Gibson, IBM Corporation.
+ *
+ * libfdt is dual licensed: you can use it either under the terms of
+ * the GPL, or the BSD license, at your option.
+ *
+ *  a) This library is free software; you can redistribute it and/or
+ *     modify it under the terms of the GNU General Public License as
+ *     published by the Free Software Foundation; either version 2 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This library is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public
+ *     License along with this library; if not, write to the Free
+ *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ *     MA 02110-1301 USA
+ *
+ * Alternatively,
+ *
+ *  b) Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *     2. Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *     THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ *     CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ *     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ *     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ *     DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ *     CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *     SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *     NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ *     LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ *     HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ *     CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ *     OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ *     EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <fdt.h>
+
+#define ALIGN(x, a)     (((x) + (a) - 1) & ~((a) - 1))
+#define PALIGN(p, a)    ((void *)ALIGN((unsigned long)(p), (a)))
+
+#define memeq(p, q, n)  (memcmp((p), (q), (n)) == 0)
+#define streq(p, q)     (strcmp((p), (q)) == 0)
+
+uint32_t _fdt_next_tag(const void *fdt, int startoffset, int *nextoffset);
+const char *_fdt_find_string(const char *strtab, int tabsize, const char *s);
+int _fdt_node_end_offset(void *fdt, int nodeoffset);
+
+static inline const void *_fdt_offset_ptr(const void *fdt, int offset)
+{
+        return fdt + fdt_off_dt_struct(fdt) + offset;
+}
+
+static inline void *_fdt_offset_ptr_w(void *fdt, int offset)
+{
+        return (void *)_fdt_offset_ptr(fdt, offset);
+}
+
+static inline const struct fdt_reserve_entry *_fdt_mem_rsv(const void *fdt, int n)
+{
+        const struct fdt_reserve_entry *rsv_table =
+                fdt + fdt_off_mem_rsvmap(fdt);
+
+        return rsv_table + n;
+}
+static inline struct fdt_reserve_entry *_fdt_mem_rsv_w(void *fdt, int n)
+{
+        return (void *)_fdt_mem_rsv(fdt, n);
+}
+
+#define SW_MAGIC                (~FDT_MAGIC)
+
+#endif /* _LIBFDT_INTERNAL_H */
diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h
new file mode 100644
index 000000000000..a4b0fc959ece
--- /dev/null
+++ b/arch/powerpc/boot/libfdt_env.h
@@ -0,0 +1,17 @@
+#ifndef _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
+#define _ARCH_POWERPC_BOOT_LIBFDT_ENV_H
+
+#include <types.h>
+#include <string.h>
+
+typedef u32 uint32_t;
+typedef u64 uint64_t;
+
+#define fdt16_to_cpu(x)         (x)
+#define cpu_to_fdt16(x)         (x)
+#define fdt32_to_cpu(x)         (x)
+#define cpu_to_fdt32(x)         (x)
+#define fdt64_to_cpu(x)         (x)
+#define cpu_to_fdt64(x)         (x)
+
+#endif /* _ARCH_POWERPC_BOOT_LIBFDT_ENV_H */
diff --git a/arch/powerpc/boot/main.c b/arch/powerpc/boot/main.c
index 1b496b37eca0..9e7f3ddd9913 100644
--- a/arch/powerpc/boot/main.c
+++ b/arch/powerpc/boot/main.c
@@ -16,7 +16,6 @@
 #include "stdio.h"
 #include "ops.h"
 #include "gunzip_util.h"
-#include "flatdevtree.h"
 #include "reg.h"
 
 static struct gunzip_state gzstate;
diff --git a/arch/powerpc/boot/ops.h b/arch/powerpc/boot/ops.h
index a180b6505f47..4b0544b03c64 100644
--- a/arch/powerpc/boot/ops.h
+++ b/arch/powerpc/boot/ops.h
@@ -46,6 +46,8 @@ struct dt_ops {
         void *(*find_node_by_prop_value)(const void *prev,
                                          const char *propname,
                                          const char *propval, int proplen);
+        void *(*find_node_by_compatible)(const void *prev,
+                                         const char *compat);
         unsigned long (*finalize)(void);
         char *(*get_path)(const void *phandle, char *buf, int len);
 };
@@ -79,7 +81,7 @@ struct loader_info {
 extern struct loader_info loader_info;
 
 void start(void);
-int ft_init(void *dt_blob, unsigned int max_size, unsigned int max_find_device);
+void fdt_init(void *blob);
 int serial_console_init(void);
 int ns16550_console_init(void *devp, struct serial_console_data *scdp);
 int mpsc_console_init(void *devp, struct serial_console_data *scdp);
@@ -159,9 +161,32 @@ static inline void *find_node_by_devtype(const void *prev,
         return find_node_by_prop_value_str(prev, "device_type", type);
 }
 
+static inline void *find_node_by_alias(const char *alias)
+{
+        void *devp = finddevice("/aliases");
+
+        if (devp) {
+                char path[MAX_PATH_LEN];
+                if (getprop(devp, alias, path, MAX_PATH_LEN) > 0)
+                        return finddevice(path);
+        }
+
+        return NULL;
+}
+
+static inline void *find_node_by_compatible(const void *prev,
+                                            const char *compat)
+{
+        if (dt_ops.find_node_by_compatible)
+                return dt_ops.find_node_by_compatible(prev, compat);
+
+        return NULL;
+}
+
 void dt_fixup_memory(u64 start, u64 size);
 void dt_fixup_cpu_clocks(u32 cpufreq, u32 tbfreq, u32 busfreq);
 void dt_fixup_clock(const char *path, u32 freq);
+void dt_fixup_mac_address_by_alias(const char *alias, const u8 *addr);
 void dt_fixup_mac_address(u32 index, const u8 *addr);
 void __dt_fixup_mac_addresses(u32 startindex, ...);
 #define dt_fixup_mac_addresses(...) \
diff --git a/arch/powerpc/boot/prpmc2800.c b/arch/powerpc/boot/prpmc2800.c
index 9614e1db9dae..05c3245b30d7 100644
--- a/arch/powerpc/boot/prpmc2800.c
+++ b/arch/powerpc/boot/prpmc2800.c
@@ -547,8 +547,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
         if (!dtb)
                 exit();
         memmove(dtb, _dtb_start, dt_size);
-        if (ft_init(dtb, dt_size, 16))
-                exit();
+        fdt_init(dtb);
 
         bridge_base = mv64x60_get_bridge_base();
 
diff --git a/arch/powerpc/boot/ps3.c b/arch/powerpc/boot/ps3.c
index d6661151b494..3b0ac4d006ec 100644
--- a/arch/powerpc/boot/ps3.c
+++ b/arch/powerpc/boot/ps3.c
@@ -131,7 +131,7 @@ void platform_init(void)
         printf("\n-- PS3 bootwrapper --\n");
 
         simple_alloc_init(_end, heapsize, 32, 64);
-        ft_init(_dtb_start, 0, 4);
+        fdt_init(_dtb_start);
 
         chosen = finddevice("/chosen");
 
diff --git a/arch/powerpc/boot/redboot-8xx.c b/arch/powerpc/boot/redboot-8xx.c
new file mode 100644
index 000000000000..f7945adc8004
--- /dev/null
+++ b/arch/powerpc/boot/redboot-8xx.c
@@ -0,0 +1,58 @@
+/*
+ * RedBoot firmware support
+ *
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * Copyright (c) 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 "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/redboot.h b/arch/powerpc/boot/redboot.h
new file mode 100644
index 000000000000..ace0b7fed8eb
--- /dev/null
+++ b/arch/powerpc/boot/redboot.h
@@ -0,0 +1,56 @@
+#ifndef _PPC_REDBOOT_H
+#define _PPC_REDBOOT_H
+
+//=========================================================================
+// include/asm-ppc/redboot.h
+//   Copyright (c) 2002, 2003 Gary Thomas (<gary@mlbassoc.com>
+//   Copyright (c) 1997 Dan Malek (dmalek@jlc.net)
+
+//
+// Board specific details, as provided by RedBoot
+//
+
+/* A Board Information structure that is given to a program when
+ * RedBoot starts it up.  Note: not all fields make sense for all
+ * architectures and it's up to the platform specific code to fill
+ * in the details.
+ */
+typedef struct bd_info {
+    unsigned int   bi_tag;        /* Should be 0x42444944 "BDID" */
+    unsigned int   bi_size;       /* Size of this structure */
+    unsigned int   bi_revision;   /* revision of this structure */
+    unsigned int   bi_bdate;      /* bootstrap date, i.e. 0x19971106 */
+    unsigned int   bi_memstart;   /* Memory start address */
+    unsigned int   bi_memsize;    /* Memory (end) size in bytes */
+    unsigned int   bi_intfreq;    /* Internal Freq, in Hz */
+    unsigned int   bi_busfreq;    /* Bus Freq, in Hz */
+    unsigned int   bi_cpmfreq;    /* CPM Freq, in Hz */
+    unsigned int   bi_brgfreq;    /* BRG Freq, in Hz */
+    unsigned int   bi_vco;        /* VCO Out from PLL */
+    unsigned int   bi_pci_freq;   /* PCI Freq, in Hz */
+    unsigned int   bi_baudrate;   /* Default console baud rate */
+    unsigned int   bi_immr;       /* IMMR when called from boot rom */
+    unsigned char  bi_enetaddr[6];
+    unsigned int   bi_flashbase;  /* Physical address of FLASH memory */
+    unsigned int   bi_flashsize;  /* Length of FLASH memory */
+    int            bi_flashwidth; /* Width (8,16,32,64) */
+    unsigned char *bi_cmdline;    /* Pointer to command line */
+    unsigned char  bi_esa[3][6];  /* Ethernet station addresses */
+    unsigned int   bi_ramdisk_begin, bi_ramdisk_end;
+    struct {                      /* Information about [main] video screen */
+        short x_res;              /*   Horizontal resolution in pixels */
+        short y_res;              /*   Vertical resolution in pixels */
+        short bpp;                /*   Bits/pixel */
+        short mode;               /*   Type of pixels (packed, indexed) */
+        unsigned long fb;         /*   Pointer to frame buffer (pixel) memory */
+    } bi_video;
+    void         (*bi_cputc)(char);   /* Write a character to the RedBoot console */
+    char         (*bi_cgetc)(void);   /* Read a character from the RedBoot console */
+    int          (*bi_ctstc)(void);   /* Test for input on the RedBoot console */
+} bd_t;
+
+#define BI_REV 0x0102    /* Version 1.02 */
+
+#define bi_pci_busfreq bi_pci_freq
+#define bi_immr_base   bi_immr
+#endif
diff --git a/arch/powerpc/boot/reg.h b/arch/powerpc/boot/reg.h
index d3cd9ee98afb..9c2c9978e0eb 100644
--- a/arch/powerpc/boot/reg.h
+++ b/arch/powerpc/boot/reg.h
@@ -16,6 +16,14 @@ static inline u32 mfpvr(void)
         return pvr;
 }
 
+#define __stringify_1(x)        #x
+#define __stringify(x)          __stringify_1(x)
+
+#define mfspr(rn)       ({unsigned long rval; \
+                        asm volatile("mfspr %0," __stringify(rn) \
+                                : "=r" (rval)); rval; })
+#define mtspr(rn, v)    asm volatile("mtspr " __stringify(rn) ",%0" : : "r" (v))
+
 register void *__stack_pointer asm("r1");
 #define get_sp()        (__stack_pointer)
 
diff --git a/arch/powerpc/boot/serial.c b/arch/powerpc/boot/serial.c
index cafeece20ac7..9960421eb6b9 100644
--- a/arch/powerpc/boot/serial.c
+++ b/arch/powerpc/boot/serial.c
@@ -126,9 +126,10 @@ int serial_console_init(void)
                  dt_is_compatible(devp, "fsl,cpm2-scc-uart") ||
                  dt_is_compatible(devp, "fsl,cpm2-smc-uart"))
                 rc = cpm_console_init(devp, &serial_cd);
-        else if (dt_is_compatible(devp, "mpc5200-psc-uart"))
+        else if (dt_is_compatible(devp, "fsl,mpc5200-psc-uart"))
                 rc = mpc5200_psc_console_init(devp, &serial_cd);
-        else if (dt_is_compatible(devp, "xilinx,uartlite"))
+        else if (dt_is_compatible(devp, "xlnx,opb-uartlite-1.00.b") ||
+                 dt_is_compatible(devp, "xlnx,xps-uartlite-1.00.a"))
                 rc = uartlite_console_init(devp, &serial_cd);
 
         /* Add other serial console driver calls here */
diff --git a/arch/powerpc/boot/treeboot-walnut.c b/arch/powerpc/boot/treeboot-walnut.c
index bb2c309d70fc..472e36605a52 100644
--- a/arch/powerpc/boot/treeboot-walnut.c
+++ b/arch/powerpc/boot/treeboot-walnut.c
@@ -20,55 +20,6 @@
 
 BSS_STACK(4096);
 
-void ibm405gp_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)
-{
-        u32 pllmr = mfdcr(DCRN_CPC0_PLLMR);
-        u32 cpc0_cr0 = mfdcr(DCRN_405_CPC0_CR0);
-        u32 cpc0_cr1 = mfdcr(DCRN_405_CPC0_CR1);
-        u32 cpu, plb, opb, ebc, tb, uart0, uart1, m;
-        u32 fwdv, fbdv, cbdv, opdv, epdv, udiv;
-
-        fwdv = (8 - ((pllmr & 0xe0000000) >> 29));
-        fbdv = (pllmr & 0x1e000000) >> 25;
-        cbdv = ((pllmr & 0x00060000) >> 17) + 1;
-        opdv = ((pllmr & 0x00018000) >> 15) + 1;
-        epdv = ((pllmr & 0x00001800) >> 13) + 2;
-        udiv = ((cpc0_cr0 & 0x3e) >> 1) + 1;
-
-        m = fwdv * fbdv * cbdv;
-
-        cpu = sysclk * m / fwdv;
-        plb = cpu / cbdv;
-        opb = plb / opdv;
-        ebc = plb / epdv;
-
-        if (cpc0_cr0 & 0x80) {
-                /* uart0 uses the external clock */
-                uart0 = ser_clk;
-        } else {
-                uart0 = cpu / udiv;
-        }
-
-        if (cpc0_cr0 & 0x40) {
-                /* uart1 uses the external clock */
-                uart1 = ser_clk;
-        } else {
-                uart1 = cpu / udiv;
-        }
-
-        /* setup the timebase clock to tick at the cpu frequency */
-        cpc0_cr1 = cpc0_cr1 & ~0x00800000;
-        mtdcr(DCRN_405_CPC0_CR1, cpc0_cr1);
-        tb = cpu;
-
-        dt_fixup_cpu_clocks(cpu, tb, 0);
-        dt_fixup_clock("/plb", plb);
-        dt_fixup_clock("/plb/opb", opb);
-        dt_fixup_clock("/plb/ebc", ebc);
-        dt_fixup_clock("/plb/opb/serial@ef600300", uart0);
-        dt_fixup_clock("/plb/opb/serial@ef600400", uart1);
-}
-
 static void walnut_flashsel_fixup(void)
 {
         void *devp, *sram;
@@ -112,7 +63,7 @@ static void walnut_flashsel_fixup(void)
 #define WALNUT_OPENBIOS_MAC_OFF 0xfffffe0b
 static void walnut_fixups(void)
 {
-        ibm4xx_fixup_memsize();
+        ibm4xx_sdram_fixup_memsize();
         ibm405gp_fixup_clocks(33330000, 0xa8c000);
         ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
         ibm4xx_fixup_ebc_ranges("/plb/ebc");
@@ -128,6 +79,6 @@ void platform_init(void)
         simple_alloc_init(_end, avail_ram, 32, 32);
         platform_ops.fixups = walnut_fixups;
         platform_ops.exit = ibm40x_dbcr_reset;
-        ft_init(_dtb_start, _dtb_end - _dtb_start, 32);
+        fdt_init(_dtb_start);
         serial_console_init();
 }
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 31147a037728..763a0c46f441 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -45,6 +45,7 @@ CROSS=
 
 # directory for object and other files used by this script
 object=arch/powerpc/boot
+objbin=$object
 
 # directory for working files
 tmpdir=.
@@ -95,6 +96,7 @@ while [ "$#" -gt 0 ]; do
         shift
         [ "$#" -gt 0 ] || usage
         object="$1"
+        objbin="$1"
         ;;
     -W)
         shift
@@ -116,10 +118,13 @@ while [ "$#" -gt 0 ]; do
 done
 
 if [ -n "$dts" ]; then
+    if [ ! -r "$dts" -a -r "$object/dts/$dts" ]; then
+        dts="$object/dts/$dts"
+    fi
     if [ -z "$dtb" ]; then
         dtb="$platform.dtb"
     fi
-    dtc -O dtb -o "$dtb" -b 0 -V 16 "$dts"
+    $object/dtc -O dtb -o "$dtb" -b 0 "$dts"
 fi
 
 if [ -z "$kernel" ]; then
@@ -163,7 +168,7 @@ ps3)
     ksection=.kernel:vmlinux.bin
     isection=.kernel:initrd
     ;;
-ep88xc)
+ep88xc|ep405|redboot*|ep8248e)
     platformo="$object/fixed-head.o $object/$platform.o"
     binary=y
     ;;
@@ -246,11 +251,11 @@ fi
 # post-processing needed for some platforms
 case "$platform" in
 pseries|chrp)
-    $object/addnote "$ofile"
+    $objbin/addnote "$ofile"
     ;;
 coff)
     ${CROSS}objcopy -O aixcoff-rs6000 --set-start "$entry" "$ofile"
-    $object/hack-coff "$ofile"
+    $objbin/hack-coff "$ofile"
     ;;
 cuboot*)
     gzip -f -9 "$ofile"
@@ -259,7 +264,7 @@ cuboot*)
     ;;
 treeboot*)
     mv "$ofile" "$ofile.elf"
-    $object/mktree "$ofile.elf" "$ofile" "$base" "$entry"
+    $objbin/mktree "$ofile.elf" "$ofile" "$base" "$entry"
     if [ -z "$cacheit" ]; then
         rm -f "$ofile.elf"
     fi
@@ -287,8 +292,6 @@ ps3)
     overlay_dest="256"
     overlay_size="256"
 
-    rm -f "$object/otheros.bld"
-
     ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
 
     dd if="$ofile.bin" of="$ofile.bin" conv=notrunc   \
@@ -299,6 +302,8 @@ ps3)
         skip=$system_reset_overlay seek=$overlay_dest \
         count=$overlay_size bs=1
 
-    gzip --force -9 --stdout "$ofile.bin" > "$object/otheros.bld"
+    odir="$(dirname "$ofile.bin")"
+    rm -f "$odir/otheros.bld"
+    gzip --force -9 --stdout "$ofile.bin" > "$odir/otheros.bld"
     ;;
 esac