Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (158 commits)
  powerpc: Fix CHRP PCI config access for indirect_pci
  powerpc/chrp: Fix detection of Python PCI host bridge on IBM CHRPs
  powerpc: Fix 32-bit SMP boot on CHRP
  powerpc: Fix link errors on 32-bit machines using legacy DMA
  powerpc/pci: Improve detection of unassigned bridge resources
  hvc_console: Fix free_irq in spinlocked section
  powerpc: Get USE_STRICT_MM_TYPECHECKS working again
  powerpc: Reflect the used arguments in machine_init() prototype
  powerpc: Fix DMA offset for non-coherent DMA
  powerpc: fix fsl_upm nand driver modular build
  powerpc/83xx: add NAND support for the MPC8360E-RDK boards
  powerpc: FPGA support for GE Fanuc SBC610
  i2c: MPC8349E-mITX Power Management and GPIO expander driver
  powerpc: reserve two DMA channels for audio in MPC8610 HPCD device tree
  powerpc: document the "fsl,ssi-dma-channel" compatible property
  powerpc: disable CHRP and PMAC support in various defconfigs
  OF: add fsl,mcu-mpc8349emitx to the exception list
  powerpc/83xx: add DS1374 RTC support for the MPC837xE-MDS boards
  powerpc: remove support for bootmem-allocated memory for the DIU driver
  powerpc: remove non-dependent load fsl_booke PTE_64BIT
  ...

281 files changed, 12899 insertions, 6171 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 587da5e0990f..c171f5bcf258 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -415,8 +415,11 @@ config PPC_64K_PAGES
 
 config FORCE_MAX_ZONEORDER
         int "Maximum zone order"
+        range 9 64 if PPC_64K_PAGES
         default "9" if PPC_64K_PAGES
+        range 13 64 if PPC64 && !PPC_64K_PAGES
         default "13" if PPC64 && !PPC_64K_PAGES
+        range 11 64
         default "11"
         help
           The kernel memory allocator divides physically contiguous memory
@@ -806,6 +809,19 @@ config PIN_TLB
 endmenu
 
 if PPC64
+config RELOCATABLE
+        bool "Build a relocatable kernel"
+        help
+          This builds a kernel image that is capable of running anywhere
+          in the RMA (real memory area) at any 16k-aligned base address.
+          The kernel is linked as a position-independent executable (PIE)
+          and contains dynamic relocations which are processed early
+          in the bootup process.
+
+          One use is for the kexec on panic case where the recovery kernel
+          must live at a different physical address than the primary
+          kernel.
+
 config PAGE_OFFSET
         hex
         default "0xc000000000000000"
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 4ebc52a19f0a..15eb27861fc7 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -51,6 +51,11 @@ config FTR_FIXUP_SELFTEST
         depends on DEBUG_KERNEL
         default n
 
+config MSI_BITMAP_SELFTEST
+        bool "Run self-tests of the MSI bitmap code."
+        depends on DEBUG_KERNEL
+        default n
+
 config XMON
         bool "Include xmon kernel debugger"
         depends on DEBUG_KERNEL
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index c6be19e9ceae..24dd1a37f8fb 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -63,7 +63,9 @@ override CC	+= -m$(CONFIG_WORD_SIZE)
 override AR     := GNUTARGET=elf$(CONFIG_WORD_SIZE)-powerpc $(AR)
 endif
 
-LDFLAGS_vmlinux := -Bstatic
+LDFLAGS_vmlinux-yy := -Bstatic
+LDFLAGS_vmlinux-$(CONFIG_PPC64)$(CONFIG_RELOCATABLE) := -pie
+LDFLAGS_vmlinux := $(LDFLAGS_vmlinux-yy)
 
 CFLAGS-$(CONFIG_PPC64)  := -mminimal-toc -mtraceback=none  -mcall-aixdesc
 CFLAGS-$(CONFIG_PPC32)  := -ffixed-r2 -mmultiple
@@ -102,7 +104,10 @@ endif
 KBUILD_CFLAGS += $(call cc-option,-mno-altivec)
 
 # No SPE instruction when building kernel
+# (We use all available options to help semi-broken compilers)
 KBUILD_CFLAGS += $(call cc-option,-mno-spe)
+KBUILD_CFLAGS += $(call cc-option,-mspe=no)
+KBUILD_CFLAGS += $(call cc-option,-mabi=no-spe)
 
 # Enable unit-at-a-time mode when possible. It shrinks the
 # kernel considerably.
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 65d1a8454d2c..aac1406ccba5 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -310,8 +310,11 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb
 $(obj)/vmlinux.strip: vmlinux
         $(STRIP) -s -R .comment $< -o $@
 
+# The iseries hypervisor won't take an ET_DYN executable, so this
+# changes the type (byte 17) in the file to ET_EXEC (2).
 $(obj)/zImage.iseries: vmlinux
         $(STRIP) -s -R .comment $< -o $@
+        printf "\x02" | dd of=$@ conv=notrunc bs=1 seek=17
 
 $(obj)/uImage: vmlinux $(wrapperbits)
         $(call if_changed,wrap,uboot)
diff --git a/arch/powerpc/boot/addnote.c b/arch/powerpc/boot/addnote.c
index b1e5611b2ab1..dcc9ab2ca823 100644
--- a/arch/powerpc/boot/addnote.c
+++ b/arch/powerpc/boot/addnote.c
@@ -11,7 +11,12 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  *
- * Usage: addnote zImage
+ * Usage: addnote zImage [note.elf]
+ *
+ * If note.elf is supplied, it is the name of an ELF file that contains
+ * an RPA note to use instead of the built-in one.  Alternatively, the
+ * note.elf file may be empty, in which case the built-in RPA note is
+ * used (this is to simplify how this is invoked from the wrapper script).
  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,27 +48,29 @@ char rpaname[] = "IBM,RPA-Client-Config";
  */
 #define N_RPA_DESCR     8
 unsigned int rpanote[N_RPA_DESCR] = {
-        0,                      /* lparaffinity */
-        64,                     /* min_rmo_size */
+        1,                      /* lparaffinity */
+        128,                    /* min_rmo_size */
         0,                      /* min_rmo_percent */
-        40,                     /* max_pft_size */
+        46,                     /* max_pft_size */
         1,                      /* splpar */
         -1,                     /* min_load */
-        0,                      /* new_mem_def */
-        1,                      /* ignore_my_client_config */
+        1,                      /* new_mem_def */
+        0,                      /* ignore_my_client_config */
 };
 
 #define ROUNDUP(len)    (((len) + 3) & ~3)
 
 unsigned char buf[512];
+unsigned char notebuf[512];
 
-#define GET_16BE(off)   ((buf[off] << 8) + (buf[(off)+1]))
-#define GET_32BE(off)   ((GET_16BE(off) << 16) + GET_16BE((off)+2))
+#define GET_16BE(b, off)        (((b)[off] << 8) + ((b)[(off)+1]))
+#define GET_32BE(b, off)        ((GET_16BE((b), (off)) << 16) + \
+                                 GET_16BE((b), (off)+2))
 
-#define PUT_16BE(off, v)        (buf[off] = ((v) >> 8) & 0xff, \
-                                 buf[(off) + 1] = (v) & 0xff)
-#define PUT_32BE(off, v)        (PUT_16BE((off), (v) >> 16), \
-                                 PUT_16BE((off) + 2, (v)))
+#define PUT_16BE(b, off, v)     ((b)[off] = ((v) >> 8) & 0xff, \
+                                 (b)[(off) + 1] = (v) & 0xff)
+#define PUT_32BE(b, off, v)     (PUT_16BE((b), (off), (v) >> 16), \
+                                 PUT_16BE((b), (off) + 2, (v)))
 
 /* Structure of an ELF file */
 #define E_IDENT         0       /* ELF header */
@@ -88,15 +95,71 @@ unsigned char buf[512];
 
 unsigned char elf_magic[4] = { 0x7f, 'E', 'L', 'F' };
 
+unsigned char *read_rpanote(const char *fname, int *nnp)
+{
+        int notefd, nr, i;
+        int ph, ps, np;
+        int note, notesize;
+
+        notefd = open(fname, O_RDONLY);
+        if (notefd < 0) {
+                perror(fname);
+                exit(1);
+        }
+        nr = read(notefd, notebuf, sizeof(notebuf));
+        if (nr < 0) {
+                perror("read note");
+                exit(1);
+        }
+        if (nr == 0)            /* empty file */
+                return NULL;
+        if (nr < E_HSIZE ||
+            memcmp(&notebuf[E_IDENT+EI_MAGIC], elf_magic, 4) != 0 ||
+            notebuf[E_IDENT+EI_CLASS] != ELFCLASS32 ||
+            notebuf[E_IDENT+EI_DATA] != ELFDATA2MSB)
+                goto notelf;
+        close(notefd);
+
+        /* now look for the RPA-note */
+        ph = GET_32BE(notebuf, E_PHOFF);
+        ps = GET_16BE(notebuf, E_PHENTSIZE);
+        np = GET_16BE(notebuf, E_PHNUM);
+        if (ph < E_HSIZE || ps < PH_HSIZE || np < 1)
+                goto notelf;
+
+        for (i = 0; i < np; ++i, ph += ps) {
+                if (GET_32BE(notebuf, ph + PH_TYPE) != PT_NOTE)
+                        continue;
+                note = GET_32BE(notebuf, ph + PH_OFFSET);
+                notesize = GET_32BE(notebuf, ph + PH_FILESZ);
+                if (notesize < 34 || note + notesize > nr)
+                        continue;
+                if (GET_32BE(notebuf, note) != strlen(rpaname) + 1 ||
+                    GET_32BE(notebuf, note + 8) != 0x12759999 ||
+                    strcmp((char *)&notebuf[note + 12], rpaname) != 0)
+                        continue;
+                /* looks like an RPA note, return it */
+                *nnp = notesize;
+                return &notebuf[note];
+        }
+        /* no RPA note found */
+        return NULL;
+
+ notelf:
+        fprintf(stderr, "%s is not a big-endian 32-bit ELF image\n", fname);
+        exit(1);
+}
+
 int
 main(int ac, char **av)
 {
         int fd, n, i;
         int ph, ps, np;
         int nnote, nnote2, ns;
+        unsigned char *rpap;
 
-        if (ac != 2) {
-                fprintf(stderr, "Usage: %s elf-file\n", av[0]);
+        if (ac != 2 && ac != 3) {
+                fprintf(stderr, "Usage: %s elf-file [rpanote.elf]\n", av[0]);
                 exit(1);
         }
         fd = open(av[1], O_RDWR);
@@ -107,6 +170,7 @@ main(int ac, char **av)
 
         nnote = 12 + ROUNDUP(strlen(arch) + 1) + sizeof(descr);
         nnote2 = 12 + ROUNDUP(strlen(rpaname) + 1) + sizeof(rpanote);
+        rpap = NULL;
 
         n = read(fd, buf, sizeof(buf));
         if (n < 0) {
@@ -124,16 +188,19 @@ main(int ac, char **av)
                 exit(1);
         }
 
-        ph = GET_32BE(E_PHOFF);
-        ps = GET_16BE(E_PHENTSIZE);
-        np = GET_16BE(E_PHNUM);
+        if (ac == 3)
+                rpap = read_rpanote(av[2], &nnote2);
+
+        ph = GET_32BE(buf, E_PHOFF);
+        ps = GET_16BE(buf, E_PHENTSIZE);
+        np = GET_16BE(buf, E_PHNUM);
         if (ph < E_HSIZE || ps < PH_HSIZE || np < 1)
                 goto notelf;
         if (ph + (np + 2) * ps + nnote + nnote2 > n)
                 goto nospace;
 
         for (i = 0; i < np; ++i) {
-                if (GET_32BE(ph + PH_TYPE) == PT_NOTE) {
+                if (GET_32BE(buf, ph + PH_TYPE) == PT_NOTE) {
                         fprintf(stderr, "%s already has a note entry\n",
                                 av[1]);
                         exit(0);
@@ -148,37 +215,42 @@ main(int ac, char **av)
 
         /* fill in the program header entry */
         ns = ph + 2 * ps;
-        PUT_32BE(ph + PH_TYPE, PT_NOTE);
-        PUT_32BE(ph + PH_OFFSET, ns);
-        PUT_32BE(ph + PH_FILESZ, nnote);
+        PUT_32BE(buf, ph + PH_TYPE, PT_NOTE);
+        PUT_32BE(buf, ph + PH_OFFSET, ns);
+        PUT_32BE(buf, ph + PH_FILESZ, nnote);
 
         /* fill in the note area we point to */
         /* XXX we should probably make this a proper section */
-        PUT_32BE(ns, strlen(arch) + 1);
-        PUT_32BE(ns + 4, N_DESCR * 4);
-        PUT_32BE(ns + 8, 0x1275);
+        PUT_32BE(buf, ns, strlen(arch) + 1);
+        PUT_32BE(buf, ns + 4, N_DESCR * 4);
+        PUT_32BE(buf, ns + 8, 0x1275);
         strcpy((char *) &buf[ns + 12], arch);
         ns += 12 + strlen(arch) + 1;
         for (i = 0; i < N_DESCR; ++i, ns += 4)
-                PUT_32BE(ns, descr[i]);
+                PUT_32BE(buf, ns, descr[i]);
 
         /* fill in the second program header entry and the RPA note area */
         ph += ps;
-        PUT_32BE(ph + PH_TYPE, PT_NOTE);
-        PUT_32BE(ph + PH_OFFSET, ns);
-        PUT_32BE(ph + PH_FILESZ, nnote2);
+        PUT_32BE(buf, ph + PH_TYPE, PT_NOTE);
+        PUT_32BE(buf, ph + PH_OFFSET, ns);
+        PUT_32BE(buf, ph + PH_FILESZ, nnote2);
 
         /* fill in the note area we point to */
-        PUT_32BE(ns, strlen(rpaname) + 1);
-        PUT_32BE(ns + 4, sizeof(rpanote));
-        PUT_32BE(ns + 8, 0x12759999);
-        strcpy((char *) &buf[ns + 12], rpaname);
-        ns += 12 + ROUNDUP(strlen(rpaname) + 1);
-        for (i = 0; i < N_RPA_DESCR; ++i, ns += 4)
-                PUT_32BE(ns, rpanote[i]);
+        if (rpap) {
+                /* RPA note supplied in file, just copy the whole thing over */
+                memcpy(buf + ns, rpap, nnote2);
+        } else {
+                PUT_32BE(buf, ns, strlen(rpaname) + 1);
+                PUT_32BE(buf, ns + 4, sizeof(rpanote));
+                PUT_32BE(buf, ns + 8, 0x12759999);
+                strcpy((char *) &buf[ns + 12], rpaname);
+                ns += 12 + ROUNDUP(strlen(rpaname) + 1);
+                for (i = 0; i < N_RPA_DESCR; ++i, ns += 4)
+                        PUT_32BE(buf, ns, rpanote[i]);
+        }
 
         /* Update the number of program headers */
-        PUT_16BE(E_PHNUM, np + 2);
+        PUT_16BE(buf, E_PHNUM, np + 2);
 
         /* write back */
         lseek(fd, (long) 0, SEEK_SET);
diff --git a/arch/powerpc/boot/dtc-src/Makefile.dtc b/arch/powerpc/boot/dtc-src/Makefile.dtc
index d607fdb8df8d..6ddf9ecac669 100644
--- a/arch/powerpc/boot/dtc-src/Makefile.dtc
+++ b/arch/powerpc/boot/dtc-src/Makefile.dtc
@@ -5,21 +5,5 @@
 #
 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_GEN_SRCS = dtc-lexer.lex.c dtc-parser.tab.c
 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
index 2ce961cd414d..95485796f253 100644
--- a/arch/powerpc/boot/dtc-src/checks.c
+++ b/arch/powerpc/boot/dtc-src/checks.c
@@ -242,6 +242,42 @@ static void check_duplicate_property_names(struct check *c, struct node *dt,
 }
 NODE_CHECK(duplicate_property_names, NULL, ERROR);
 
+#define LOWERCASE       "abcdefghijklmnopqrstuvwxyz"
+#define UPPERCASE       "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+#define DIGITS          "0123456789"
+#define PROPNODECHARS   LOWERCASE UPPERCASE DIGITS ",._+*#?-"
+
+static void check_node_name_chars(struct check *c, struct node *dt,
+                                  struct node *node)
+{
+        int n = strspn(node->name, c->data);
+
+        if (n < strlen(node->name))
+                FAIL(c, "Bad character '%c' in node %s",
+                     node->name[n], node->fullpath);
+}
+NODE_CHECK(node_name_chars, PROPNODECHARS "@", ERROR);
+
+static void check_node_name_format(struct check *c, struct node *dt,
+                                   struct node *node)
+{
+        if (strchr(get_unitname(node), '@'))
+                FAIL(c, "Node %s has multiple '@' characters in name",
+                     node->fullpath);
+}
+NODE_CHECK(node_name_format, NULL, ERROR, &node_name_chars);
+
+static void check_property_name_chars(struct check *c, struct node *dt,
+                                      struct node *node, struct property *prop)
+{
+        int n = strspn(prop->name, c->data);
+
+        if (n < strlen(prop->name))
+                FAIL(c, "Bad character '%c' in property name \"%s\", node %s",
+                     prop->name[n], prop->name, node->fullpath);
+}
+PROP_CHECK(property_name_chars, PROPNODECHARS, ERROR);
+
 static void check_explicit_phandles(struct check *c, struct node *root,
                                           struct node *node)
 {
@@ -280,16 +316,29 @@ NODE_CHECK(explicit_phandles, NULL, ERROR);
 static void check_name_properties(struct check *c, struct node *root,
                                   struct node *node)
 {
-        struct property *prop;
+        struct property **pp, *prop = NULL;
+
+        for (pp = &node->proplist; *pp; pp = &((*pp)->next))
+                if (streq((*pp)->name, "name")) {
+                        prop = *pp;
+                        break;
+                }
 
-        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))
+            || (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);
+        } else {
+                /* The name property is correct, and therefore redundant.
+                 * Delete it */
+                *pp = prop->next;
+                free(prop->name);
+                data_free(prop->val);
+                free(prop);
+        }
 }
 CHECK_IS_STRING(name_is_string, "name", ERROR);
 NODE_CHECK(name_properties, NULL, ERROR, &name_is_string);
@@ -301,23 +350,23 @@ NODE_CHECK(name_properties, NULL, ERROR, &name_is_string);
 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);
-      }
+        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_fdt32(phandle);
+        }
 }
 CHECK(phandle_references, NULL, NULL, fixup_phandle_references, NULL, ERROR,
       &duplicate_node_names, &explicit_phandles);
@@ -498,6 +547,7 @@ TREE_CHECK(obsolete_chosen_interrupt_controller, NULL, WARN);
 
 static struct check *check_table[] = {
         &duplicate_node_names, &duplicate_property_names,
+        &node_name_chars, &node_name_format, &property_name_chars,
         &name_is_string, &name_properties,
         &explicit_phandles,
         &phandle_references, &path_references,
@@ -511,10 +561,7 @@ static struct check *check_table[] = {
         &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)
+void process_checks(int force, struct boot_info *bi)
 {
         struct node *dt = bi->dt;
         int i;
@@ -537,214 +584,4 @@ void process_checks(int force, struct boot_info *bi,
                                 "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
index a94718c731a9..dd2e3d39d4c1 100644
--- a/arch/powerpc/boot/dtc-src/data.c
+++ b/arch/powerpc/boot/dtc-src/data.c
@@ -32,8 +32,6 @@ void data_free(struct data d)
                 m = nm;
         }
 
-        assert(!d.val || d.asize);
-
         if (d.val)
                 free(d.val);
 }
@@ -43,9 +41,6 @@ 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;
 
@@ -56,11 +51,8 @@ struct data data_grow_for(struct data d, int 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;
 }
 
@@ -83,16 +75,11 @@ static char get_oct_char(const char *s, int *i)
         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];
-        }
+        strncpy(x, s + *i, 3);
 
         val = strtol(x, &endx, 8);
-        if ((endx - x) == 0)
-                fprintf(stderr, "Empty \\nnn escape\n");
+
+        assert(endx > x);
 
         (*i) += endx - x;
         return val;
@@ -105,13 +92,11 @@ static char get_hex_char(const char *s, int *i)
         long val;
 
         x[2] = '\0';
-        x[0] = s[(*i)];
-        if (x[0])
-                x[1] = s[(*i)+1];
+        strncpy(x, s + *i, 2);
 
         val = strtol(x, &endx, 16);
-        if ((endx - x) == 0)
-                fprintf(stderr, "Empty \\x escape\n");
+        if (!(endx  > x))
+                die("\\x used with no following hex digits\n");
 
         (*i) += endx - x;
         return val;
@@ -182,14 +167,29 @@ struct data data_copy_escape_string(const char *s, int len)
         return d;
 }
 
-struct data data_copy_file(FILE *f, size_t len)
+struct data data_copy_file(FILE *f, size_t maxlen)
 {
-        struct data d;
+        struct data d = empty_data;
 
-        d = data_grow_for(empty_data, len);
+        while (!feof(f) && (d.len < maxlen)) {
+                size_t chunksize, ret;
 
-        d.len = len;
-        fread(d.val, len, 1, f);
+                if (maxlen == -1)
+                        chunksize = 4096;
+                else
+                        chunksize = maxlen - d.len;
+
+                d = data_grow_for(d, chunksize);
+                ret = fread(d.val + d.len, 1, chunksize, f);
+
+                if (ferror(f))
+                        die("Error reading file into data: %s", strerror(errno));
+
+                if (d.len + ret < d.len)
+                        die("Overflow reading file into data\n");
+
+                d.len += ret;
+        }
 
         return d;
 }
@@ -247,7 +247,7 @@ struct data data_merge(struct data d1, struct data d2)
 
 struct data data_append_cell(struct data d, cell_t word)
 {
-        cell_t beword = cpu_to_be32(word);
+        cell_t beword = cpu_to_fdt32(word);
 
         return data_append_data(d, &beword, sizeof(beword));
 }
@@ -256,15 +256,15 @@ 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);
+        bere.address = cpu_to_fdt64(re->address);
+        bere.size = cpu_to_fdt64(re->size);
 
         return data_append_data(d, &bere, sizeof(bere));
 }
 
-struct data data_append_addr(struct data d, u64 addr)
+struct data data_append_addr(struct data d, uint64_t addr)
 {
-        u64 beaddr = cpu_to_be64(addr);
+        uint64_t beaddr = cpu_to_fdt64(addr);
 
         return data_append_data(d, &beaddr, sizeof(beaddr));
 }
diff --git a/arch/powerpc/boot/dtc-src/dtc-lexer.l b/arch/powerpc/boot/dtc-src/dtc-lexer.l
index c811b221b31e..44dbfd3f0976 100644
--- a/arch/powerpc/boot/dtc-src/dtc-lexer.l
+++ b/arch/powerpc/boot/dtc-src/dtc-lexer.l
@@ -28,6 +28,10 @@
 PROPNODECHAR    [a-zA-Z0-9,._+*#?@-]
 PATHCHAR        ({PROPNODECHAR}|[/])
 LABEL           [a-zA-Z_][a-zA-Z0-9_]*
+STRING          \"([^\\"]|\\.)*\"
+WS              [[:space:]]
+COMMENT         "/*"([^*]|\*+[^*/])*\*+"/"
+LINECOMMENT     "//".*\n
 
 %{
 #include "dtc.h"
@@ -52,29 +56,26 @@ static int dts_version; /* = 0 */
                                 DPRINT("<V1>\n"); \
                                 BEGIN(V1); \
                         }
+
+static void push_input_file(const char *filename);
+static int pop_input_file(void);
 %}
 
 %%
-<*>"/include/"          BEGIN(INCLUDE);
-
-<INCLUDE>\"[^"\n]*\"    {
-                        yytext[strlen(yytext) - 1] = 0;
-                        if (!push_input_file(yytext + 1)) {
-                                /* Some unrecoverable error.*/
-                                exit(1);
-                        }
-                        BEGIN_DEFAULT();
+<*>"/include/"{WS}*{STRING} {
+                        char *name = strchr(yytext, '\"') + 1;
+                        yytext[yyleng-1] = '\0';
+                        push_input_file(name);
                 }
 
-
 <*><<EOF>>              {
                         if (!pop_input_file()) {
                                 yyterminate();
                         }
                 }
 
-<*>\"([^\\"]|\\.)*\"    {
-                        yylloc.filenum = srcpos_filenum;
+<*>{STRING}     {
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("String: %s\n", yytext);
                         yylval.data = data_copy_escape_string(yytext+1,
@@ -84,7 +85,7 @@ static int dts_version; /* = 0 */
                 }
 
 <*>"/dts-v1/"   {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("Keyword: /dts-v1/\n");
                         dts_version = 1;
@@ -93,7 +94,7 @@ static int dts_version; /* = 0 */
                 }
 
 <*>"/memreserve/"       {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("Keyword: /memreserve/\n");
                         BEGIN_DEFAULT();
@@ -101,7 +102,7 @@ static int dts_version; /* = 0 */
                 }
 
 <*>{LABEL}:     {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("Label: %s\n", yytext);
                         yylval.labelref = strdup(yytext);
@@ -110,7 +111,7 @@ static int dts_version; /* = 0 */
                 }
 
 <INITIAL>[bodh]# {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         if (*yytext == 'b')
                                 yylval.cbase = 2;
@@ -125,7 +126,7 @@ static int dts_version; /* = 0 */
                 }
 
 <INITIAL>[0-9a-fA-F]+   {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         yylval.literal = strdup(yytext);
                         DPRINT("Literal: '%s'\n", yylval.literal);
@@ -133,7 +134,7 @@ static int dts_version; /* = 0 */
                 }
 
 <V1>[0-9]+|0[xX][0-9a-fA-F]+      {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         yylval.literal = strdup(yytext);
                         DPRINT("Literal: '%s'\n", yylval.literal);
@@ -141,7 +142,7 @@ static int dts_version; /* = 0 */
                 }
 
 \&{LABEL}       {       /* label reference */
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("Ref: %s\n", yytext+1);
                         yylval.labelref = strdup(yytext+1);
@@ -149,7 +150,7 @@ static int dts_version; /* = 0 */
                 }
 
 "&{/"{PATHCHAR}+\}      {       /* new-style path reference */
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         yytext[yyleng-1] = '\0';
                         DPRINT("Ref: %s\n", yytext+2);
@@ -158,7 +159,7 @@ static int dts_version; /* = 0 */
                 }
 
 <INITIAL>"&/"{PATHCHAR}+ {      /* old-style path reference */
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("Ref: %s\n", yytext+1);
                         yylval.labelref = strdup(yytext+1);
@@ -166,7 +167,7 @@ static int dts_version; /* = 0 */
                 }
 
 <BYTESTRING>[0-9a-fA-F]{2} {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         yylval.byte = strtol(yytext, NULL, 16);
                         DPRINT("Byte: %02x\n", (int)yylval.byte);
@@ -174,7 +175,7 @@ static int dts_version; /* = 0 */
                 }
 
 <BYTESTRING>"]" {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("/BYTESTRING\n");
                         BEGIN_DEFAULT();
@@ -182,7 +183,7 @@ static int dts_version; /* = 0 */
                 }
 
 <PROPNODENAME>{PROPNODECHAR}+ {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("PropNodeName: %s\n", yytext);
                         yylval.propnodename = strdup(yytext);
@@ -190,20 +191,19 @@ static int dts_version; /* = 0 */
                         return DT_PROPNODENAME;
                 }
 
-
-<*>[[:space:]]+ /* eat whitespace */
-
-<*>"/*"([^*]|\*+[^*/])*\*+"/"   {
-                        yylloc.filenum = srcpos_filenum;
+"/incbin/"      {
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
-                        DPRINT("Comment: %s\n", yytext);
-                        /* eat comments */
+                        DPRINT("Binary Include\n");
+                        return DT_INCBIN;
                 }
 
-<*>"//".*\n     /* eat line comments */
+<*>{WS}+        /* eat whitespace */
+<*>{COMMENT}+   /* eat C-style comments */
+<*>{LINECOMMENT}+ /* eat C++-style comments */
 
 <*>.            {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("Char: %c (\\x%02x)\n", yytext[0],
                                 (unsigned)yytext[0]);
@@ -227,14 +227,13 @@ static int dts_version; /* = 0 */
  */
 
 struct incl_file {
-        int filenum;
-        FILE *file;
+        struct dtc_file *file;
         YY_BUFFER_STATE yy_prev_buf;
         int yy_prev_lineno;
         struct incl_file *prev;
 };
 
-struct incl_file *incl_file_stack;
+static struct incl_file *incl_file_stack;
 
 
 /*
@@ -245,36 +244,34 @@ struct incl_file *incl_file_stack;
 static int incl_depth = 0;
 
 
-int push_input_file(const char *filename)
+static void push_input_file(const char *filename)
 {
-        FILE *f;
         struct incl_file *incl_file;
+        struct dtc_file *newfile;
+        struct search_path search, *searchptr = NULL;
 
-        if (!filename) {
-                yyerror("No include file name given.");
-                return 0;
-        }
+        assert(filename);
 
-        if (incl_depth++ >= MAX_INCLUDE_DEPTH) {
-                yyerror("Includes nested too deeply");
-                return 0;
+        if (incl_depth++ >= MAX_INCLUDE_DEPTH)
+                die("Includes nested too deeply");
+
+        if (srcpos_file) {
+                search.dir = srcpos_file->dir;
+                search.next = NULL;
+                search.prev = NULL;
+                searchptr = &search;
         }
 
-        f = dtc_open_file(filename);
+        newfile = dtc_open_file(filename, searchptr);
 
-        incl_file = malloc(sizeof(struct incl_file));
-        if (!incl_file) {
-                yyerror("Can not allocate include file space.");
-                return 0;
-        }
+        incl_file = xmalloc(sizeof(struct incl_file));
 
         /*
          * 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->file = srcpos_file;
         incl_file->prev = incl_file_stack;
 
         incl_file_stack = incl_file;
@@ -282,23 +279,21 @@ int push_input_file(const char *filename)
         /*
          * Establish new context.
          */
-        srcpos_filenum = lookup_file_name(filename, 0);
+        srcpos_file = newfile;
         yylineno = 1;
-        yyin = f;
+        yyin = newfile->file;
         yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
-
-        return 1;
 }
 
 
-int pop_input_file(void)
+static int pop_input_file(void)
 {
         struct incl_file *incl_file;
 
         if (incl_file_stack == 0)
                 return 0;
 
-        fclose(yyin);
+        dtc_close_file(srcpos_file);
 
         /*
          * Pop.
@@ -313,16 +308,13 @@ int pop_input_file(void)
         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;
+        srcpos_file = incl_file->file;
+        yyin = incl_file->file ? incl_file->file->file : NULL;
 
         /*
          * 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
index d0f742460f92..ac392cb040f6 100644
--- a/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped
+++ b/arch/powerpc/boot/dtc-src/dtc-lexer.lex.c_shipped
@@ -9,7 +9,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
+#define YY_FLEX_SUBMINOR_VERSION 34
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -31,7 +31,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __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. 
@@ -94,11 +94,12 @@ typedef unsigned int flex_uint32_t;
 
 #else   /* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif  /* __STDC__ */
+#endif  /* defined (__STDC__) */
 #endif  /* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -194,11 +195,13 @@ extern FILE *yyin, *yyout;
 /* 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).
+ * Given that the standard has decreed that size_t exists since 1989,
+ * I guess we can afford to depend on it. Manoj.
  */
 
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
+typedef size_t yy_size_t;
 #endif
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -349,7 +352,7 @@ void yyfree (void *  );
 
 /* Begin user sect3 */
 
-#define yywrap() 1
+#define yywrap(n) 1
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
@@ -389,19 +392,20 @@ struct yy_trans_info
         flex_int32_t yy_verify;
         flex_int32_t yy_nxt;
         };
-static yyconst flex_int16_t yy_accept[94] =
+static yyconst flex_int16_t yy_accept[104] =
     {   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
-
+       21,   19,   16,   16,   19,   19,   19,    7,    7,   19,
+        7,   19,   19,   19,   19,   13,   14,   14,   19,    8,
+        8,   16,    0,    2,    0,    0,    9,    0,    0,    0,
+        0,    0,    0,    7,    7,    5,    0,    6,    0,   12,
+       12,   14,   14,    8,    0,   11,    9,    0,    0,    0,
+        0,   18,    0,    0,    0,    0,    8,    0,   17,    0,
+        0,    0,    0,    0,   10,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    3,   15,
+        0,    0,    0,    0,    0,    0,    0,    0,    1,    0,
+
+        0,    4,    0
     } ;
 
 static yyconst flex_int32_t yy_ec[256] =
@@ -444,122 +448,126 @@ static yyconst flex_int32_t yy_meta[36] =
         7,    7,    7,    8,    1
     } ;
 
-static yyconst flex_int16_t yy_base[107] =
+static yyconst flex_int16_t yy_base[117] =
     {   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
+        0,    0,   30,    0,   44,    0,   67,    0,   97,  105,
+      302,  303,   35,   44,   40,   94,  112,    0,  129,  152,
+      296,  295,  159,    0,  176,  303,    0,  116,   95,  165,
+       49,   46,  102,  303,  296,    0,    0,  288,  290,  293,
+      264,  266,  270,    0,    0,  303,    0,  303,  264,  303,
+        0,    0,  195,  101,    0,    0,    0,    0,  284,  125,
+      277,  265,  225,  230,  216,  218,    0,  202,  224,  221,
+      217,  107,  196,  188,  303,  206,  179,  186,  178,  185,
+      183,  162,  161,  150,  169,  160,  145,  125,  303,  303,
+      137,  109,  190,  103,  203,  167,  108,  197,  303,  123,
+
+       29,  303,  303,  215,  221,  226,  229,  234,  240,  246,
+      250,  257,  265,  270,  275,  282
     } ;
 
-static yyconst flex_int16_t yy_def[107] =
+static yyconst flex_int16_t yy_def[117] =
     {   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
+      103,    1,    1,    3,    3,    5,  103,    7,    3,    3,
+      103,  103,  103,  103,  104,  105,  103,  106,  103,   19,
+       19,   20,  103,  107,   20,  103,  108,  109,  105,  103,
+      103,  103,  104,  103,  104,  110,  111,  103,  112,  113,
+      103,  103,  103,  106,   19,  103,   20,  103,  103,  103,
+       20,  108,  109,  103,  114,  110,  111,  115,  112,  112,
+      113,  103,  103,  103,  103,  103,  114,  115,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  116,  103,  116,  103,  116,
+
+      103,  103,    0,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103
     } ;
 
-static yyconst flex_int16_t yy_nxt[324] =
+static yyconst flex_int16_t yy_nxt[339] =
     {   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
+       20,   20,   20,   12,   12,   12,   32,   32,  102,   23,
+       12,   12,   12,   34,   20,   32,   32,   32,   32,   20,
+       20,   20,   20,   20,   24,   24,   24,   35,   25,   54,
+       54,   54,   26,   25,   25,   25,   25,   12,   13,   14,
+       15,   27,   12,   27,   27,   27,   23,   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,   29,   36,  103,   34,   17,   30,   31,   31,
+       29,   54,   54,   54,   17,   30,   31,   31,   39,   35,
+       52,   40,   52,   52,   52,  103,   78,   38,   38,   46,
+      101,   60,   79,   41,   69,   97,   42,   94,   43,   45,
+       45,   45,   46,   45,   47,   47,   93,   92,   45,   45,
+       45,   45,   47,   47,   47,   47,   47,   47,   47,   47,
+       47,   47,   47,   47,   47,   39,   47,   91,   40,   90,
+       99,   47,   47,   47,   47,   54,   54,   54,   89,   88,
+       41,   55,   87,   49,  100,   43,   51,   51,   51,   86,
+       51,   95,   95,   96,   85,   51,   51,   51,   51,   52,
+
+       99,   52,   52,   52,   95,   95,   96,   84,   46,   83,
+       82,   81,   39,   79,  100,   33,   33,   33,   33,   33,
+       33,   33,   33,   37,   80,   77,   37,   37,   37,   44,
+       40,   44,   50,   76,   50,   52,   75,   52,   74,   52,
+       52,   53,   73,   53,   53,   53,   53,   56,   56,   56,
+       72,   56,   56,   57,   71,   57,   57,   59,   59,   59,
+       59,   59,   59,   59,   59,   61,   61,   61,   61,   61,
+       61,   61,   61,   67,   70,   67,   68,   68,   68,   62,
+       68,   68,   98,   98,   98,   98,   98,   98,   98,   98,
+       60,   66,   65,   64,   63,   62,   60,   58,  103,   48,
+
+       48,  103,   11,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103
     } ;
 
-static yyconst flex_int16_t yy_chk[324] =
+static yyconst flex_int16_t yy_chk[339] =
     {   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,
+        1,    1,    1,    1,    1,    3,   13,   13,  101,    3,
+        3,    3,    3,   15,    3,   14,   14,   32,   32,    3,
+        3,    3,    3,    3,    5,    5,    5,   15,    5,   31,
+       31,   31,    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,    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
+
+        7,    7,    9,   16,   29,   33,    9,    9,    9,    9,
+       10,   54,   54,   54,   10,   10,   10,   10,   17,   33,
+       28,   17,   28,   28,   28,  100,   72,   16,   29,   28,
+       97,   60,   72,   17,   60,   94,   17,   92,   17,   19,
+       19,   19,   19,   19,   19,   19,   91,   88,   19,   19,
+       19,   19,   19,   19,   19,   19,   19,   19,   19,   19,
+       19,   19,   20,   20,   20,   23,   20,   87,   23,   86,
+       96,   20,   20,   20,   20,   30,   30,   30,   85,   84,
+       23,   30,   83,   23,   96,   23,   25,   25,   25,   82,
+       25,   93,   93,   93,   81,   25,   25,   25,   25,   53,
+
+       98,   53,   53,   53,   95,   95,   95,   80,   53,   79,
+       78,   77,   76,   74,   98,  104,  104,  104,  104,  104,
+      104,  104,  104,  105,   73,   71,  105,  105,  105,  106,
+       70,  106,  107,   69,  107,  108,   68,  108,   66,  108,
+      108,  109,   65,  109,  109,  109,  109,  110,  110,  110,
+       64,  110,  110,  111,   63,  111,  111,  112,  112,  112,
+      112,  112,  112,  112,  112,  113,  113,  113,  113,  113,
+      113,  113,  113,  114,   62,  114,  115,  115,  115,   61,
+      115,  115,  116,  116,  116,  116,  116,  116,  116,  116,
+       59,   49,   43,   42,   41,   40,   39,   38,   35,   22,
+
+       21,   11,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103,  103,  103,
+      103,  103,  103,  103,  103,  103,  103,  103
     } ;
 
 /* 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, 
+1, 1, 0, 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;
@@ -600,7 +608,7 @@ char *yytext;
 
 
 
-#line 33 "dtc-lexer.l"
+#line 37 "dtc-lexer.l"
 #include "dtc.h"
 #include "srcpos.h"
 #include "dtc-parser.tab.h"
@@ -623,7 +631,10 @@ static int dts_version; /* = 0 */
                                 DPRINT("<V1>\n"); \
                                 BEGIN(V1); \
                         }
-#line 627 "dtc-lexer.lex.c"
+
+static void push_input_file(const char *filename);
+static int pop_input_file(void);
+#line 638 "dtc-lexer.lex.c"
 
 #define INITIAL 0
 #define INCLUDE 1
@@ -685,7 +696,7 @@ static int input (void );
 /* 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 )
+#define ECHO fwrite( yytext, yyleng, 1, yyout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -696,7 +707,7 @@ static int input (void );
         if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
                 { \
                 int c = '*'; \
-                size_t n; \
+                int n; \
                 for ( n = 0; n < max_size && \
                              (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
                         buf[n] = (char) c; \
@@ -778,9 +789,9 @@ YY_DECL
         register char *yy_cp, *yy_bp;
         register int yy_act;
     
-#line 57 "dtc-lexer.l"
+#line 64 "dtc-lexer.l"
 
-#line 784 "dtc-lexer.lex.c"
+#line 795 "dtc-lexer.lex.c"
 
         if ( !(yy_init) )
                 {
@@ -833,13 +844,13 @@ yy_match:
                         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 )
+                                if ( yy_current_state >= 104 )
                                         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 );
+                while ( yy_base[yy_current_state] != 303 );
 
 yy_find_action:
                 yy_act = yy_accept[yy_current_state];
@@ -874,20 +885,13 @@ do_action:	/* This label is used only to access EOF actions. */
                         goto yy_find_action;
 
 case 1:
+/* rule 1 can match eol */
 YY_RULE_SETUP
-#line 58 "dtc-lexer.l"
-BEGIN(INCLUDE);
-        YY_BREAK
-case 2:
-YY_RULE_SETUP
-#line 60 "dtc-lexer.l"
+#line 65 "dtc-lexer.l"
 {
-                        yytext[strlen(yytext) - 1] = 0;
-                        if (!push_input_file(yytext + 1)) {
-                                /* Some unrecoverable error.*/
-                                exit(1);
-                        }
-                        BEGIN_DEFAULT();
+                        char *name = strchr(yytext, '\"') + 1;
+                        yytext[yyleng-1] = '\0';
+                        push_input_file(name);
                 }
         YY_BREAK
 case YY_STATE_EOF(INITIAL):
@@ -895,19 +899,19 @@ 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"
+#line 71 "dtc-lexer.l"
 {
                         if (!pop_input_file()) {
                                 yyterminate();
                         }
                 }
         YY_BREAK
-case 3:
-/* rule 3 can match eol */
+case 2:
+/* rule 2 can match eol */
 YY_RULE_SETUP
-#line 76 "dtc-lexer.l"
+#line 77 "dtc-lexer.l"
 {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("String: %s\n", yytext);
                         yylval.data = data_copy_escape_string(yytext+1,
@@ -916,11 +920,11 @@ YY_RULE_SETUP
                         return DT_STRING;
                 }
         YY_BREAK
-case 4:
+case 3:
 YY_RULE_SETUP
-#line 86 "dtc-lexer.l"
+#line 87 "dtc-lexer.l"
 {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("Keyword: /dts-v1/\n");
                         dts_version = 1;
@@ -928,22 +932,22 @@ YY_RULE_SETUP
                         return DT_V1;
                 }
         YY_BREAK
-case 5:
+case 4:
 YY_RULE_SETUP
-#line 95 "dtc-lexer.l"
+#line 96 "dtc-lexer.l"
 {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("Keyword: /memreserve/\n");
                         BEGIN_DEFAULT();
                         return DT_MEMRESERVE;
                 }
         YY_BREAK
-case 6:
+case 5:
 YY_RULE_SETUP
-#line 103 "dtc-lexer.l"
+#line 104 "dtc-lexer.l"
 {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("Label: %s\n", yytext);
                         yylval.labelref = strdup(yytext);
@@ -951,11 +955,11 @@ YY_RULE_SETUP
                         return DT_LABEL;
                 }
         YY_BREAK
-case 7:
+case 6:
 YY_RULE_SETUP
-#line 112 "dtc-lexer.l"
+#line 113 "dtc-lexer.l"
 {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         if (*yytext == 'b')
                                 yylval.cbase = 2;
@@ -969,44 +973,44 @@ YY_RULE_SETUP
                         return DT_BASE;
                 }
         YY_BREAK
-case 8:
+case 7:
 YY_RULE_SETUP
-#line 127 "dtc-lexer.l"
+#line 128 "dtc-lexer.l"
 {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         yylval.literal = strdup(yytext);
                         DPRINT("Literal: '%s'\n", yylval.literal);
                         return DT_LEGACYLITERAL;
                 }
         YY_BREAK
-case 9:
+case 8:
 YY_RULE_SETUP
-#line 135 "dtc-lexer.l"
+#line 136 "dtc-lexer.l"
 {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         yylval.literal = strdup(yytext);
                         DPRINT("Literal: '%s'\n", yylval.literal);
                         return DT_LITERAL;
                 }
         YY_BREAK
-case 10:
+case 9:
 YY_RULE_SETUP
-#line 143 "dtc-lexer.l"
+#line 144 "dtc-lexer.l"
 {       /* label reference */
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("Ref: %s\n", yytext+1);
                         yylval.labelref = strdup(yytext+1);
                         return DT_REF;
                 }
         YY_BREAK
-case 11:
+case 10:
 YY_RULE_SETUP
-#line 151 "dtc-lexer.l"
+#line 152 "dtc-lexer.l"
 {       /* new-style path reference */
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         yytext[yyleng-1] = '\0';
                         DPRINT("Ref: %s\n", yytext+2);
@@ -1014,44 +1018,44 @@ YY_RULE_SETUP
                         return DT_REF;
                 }
         YY_BREAK
-case 12:
+case 11:
 YY_RULE_SETUP
-#line 160 "dtc-lexer.l"
+#line 161 "dtc-lexer.l"
 {       /* old-style path reference */
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("Ref: %s\n", yytext+1);
                         yylval.labelref = strdup(yytext+1);
                         return DT_REF;
                 }
         YY_BREAK
-case 13:
+case 12:
 YY_RULE_SETUP
-#line 168 "dtc-lexer.l"
+#line 169 "dtc-lexer.l"
 {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         yylval.byte = strtol(yytext, NULL, 16);
                         DPRINT("Byte: %02x\n", (int)yylval.byte);
                         return DT_BYTE;
                 }
         YY_BREAK
-case 14:
+case 13:
 YY_RULE_SETUP
-#line 176 "dtc-lexer.l"
+#line 177 "dtc-lexer.l"
 {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("/BYTESTRING\n");
                         BEGIN_DEFAULT();
                         return ']';
                 }
         YY_BREAK
-case 15:
+case 14:
 YY_RULE_SETUP
-#line 184 "dtc-lexer.l"
+#line 185 "dtc-lexer.l"
 {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("PropNodeName: %s\n", yytext);
                         yylval.propnodename = strdup(yytext);
@@ -1059,34 +1063,39 @@ YY_RULE_SETUP
                         return DT_PROPNODENAME;
                 }
         YY_BREAK
+case 15:
+YY_RULE_SETUP
+#line 194 "dtc-lexer.l"
+{
+                        yylloc.file = srcpos_file;
+                        yylloc.first_line = yylineno;
+                        DPRINT("Binary Include\n");
+                        return DT_INCBIN;
+                }
+        YY_BREAK
 case 16:
 /* rule 16 can match eol */
 YY_RULE_SETUP
-#line 194 "dtc-lexer.l"
+#line 201 "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 */
-                }
+#line 202 "dtc-lexer.l"
+/* eat C-style comments */
         YY_BREAK
 case 18:
 /* rule 18 can match eol */
 YY_RULE_SETUP
 #line 203 "dtc-lexer.l"
-/* eat line comments */
+/* eat C++-style comments */
         YY_BREAK
 case 19:
 YY_RULE_SETUP
 #line 205 "dtc-lexer.l"
 {
-                        yylloc.filenum = srcpos_filenum;
+                        yylloc.file = srcpos_file;
                         yylloc.first_line = yylineno;
                         DPRINT("Char: %c (\\x%02x)\n", yytext[0],
                                 (unsigned)yytext[0]);
@@ -1107,7 +1116,7 @@ YY_RULE_SETUP
 #line 222 "dtc-lexer.l"
 ECHO;
         YY_BREAK
-#line 1111 "dtc-lexer.lex.c"
+#line 1120 "dtc-lexer.lex.c"
 
         case YY_END_OF_BUFFER:
                 {
@@ -1360,6 +1369,14 @@ static int yy_get_next_buffer (void)
         else
                 ret_val = EOB_ACT_CONTINUE_SCAN;
 
+        if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+                /* Extend the array by 50%, plus the number we really need. */
+                yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+                YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+                if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+                        YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+        }
+
         (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;
@@ -1389,7 +1406,7 @@ static int yy_get_next_buffer (void)
                 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 )
+                        if ( yy_current_state >= 104 )
                                 yy_c = yy_meta[(unsigned int) yy_c];
                         }
                 yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1417,11 +1434,11 @@ static int yy_get_next_buffer (void)
         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 )
+                if ( yy_current_state >= 104 )
                         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);
+        yy_is_jam = (yy_current_state == 103);
 
         return yy_is_jam ? 0 : yy_current_state;
 }
@@ -1743,7 +1760,9 @@ static void yyensure_buffer_stack (void)
                 (yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
                                                                 (num_to_alloc * sizeof(struct yy_buffer_state*)
                                                                 );
-                
+                if ( ! (yy_buffer_stack) )
+                        YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+                                                                  
                 memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
                                 
                 (yy_buffer_stack_max) = num_to_alloc;
@@ -1761,6 +1780,8 @@ static void yyensure_buffer_stack (void)
                                                                 ((yy_buffer_stack),
                                                                 num_to_alloc * sizeof(struct yy_buffer_state*)
                                                                 );
+                if ( ! (yy_buffer_stack) )
+                        YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
 
                 /* zero only the new slots.*/
                 memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -2072,14 +2093,13 @@ void yyfree (void * ptr )
  */
 
 struct incl_file {
-        int filenum;
-        FILE *file;
+        struct dtc_file *file;
         YY_BUFFER_STATE yy_prev_buf;
         int yy_prev_lineno;
         struct incl_file *prev;
 };
 
-struct incl_file *incl_file_stack;
+static struct incl_file *incl_file_stack;
 
 
 /*
@@ -2090,36 +2110,34 @@ struct incl_file *incl_file_stack;
 static int incl_depth = 0;
 
 
-int push_input_file(const char *filename)
+static void push_input_file(const char *filename)
 {
-        FILE *f;
         struct incl_file *incl_file;
+        struct dtc_file *newfile;
+        struct search_path search, *searchptr = NULL;
 
-        if (!filename) {
-                yyerror("No include file name given.");
-                return 0;
-        }
+        assert(filename);
 
-        if (incl_depth++ >= MAX_INCLUDE_DEPTH) {
-                yyerror("Includes nested too deeply");
-                return 0;
+        if (incl_depth++ >= MAX_INCLUDE_DEPTH)
+                die("Includes nested too deeply");
+
+        if (srcpos_file) {
+                search.dir = srcpos_file->dir;
+                search.next = NULL;
+                search.prev = NULL;
+                searchptr = &search;
         }
 
-        f = dtc_open_file(filename);
+        newfile = dtc_open_file(filename, searchptr);
 
-        incl_file = malloc(sizeof(struct incl_file));
-        if (!incl_file) {
-                yyerror("Can not allocate include file space.");
-                return 0;
-        }
+        incl_file = xmalloc(sizeof(struct incl_file));
 
         /*
          * 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->file = srcpos_file;
         incl_file->prev = incl_file_stack;
 
         incl_file_stack = incl_file;
@@ -2127,23 +2145,21 @@ int push_input_file(const char *filename)
         /*
          * Establish new context.
          */
-        srcpos_filenum = lookup_file_name(filename, 0);
+        srcpos_file = newfile;
         yylineno = 1;
-        yyin = f;
+        yyin = newfile->file;
         yy_switch_to_buffer(yy_create_buffer(yyin,YY_BUF_SIZE));
-
-        return 1;
 }
 
 
-int pop_input_file(void)
+static int pop_input_file(void)
 {
         struct incl_file *incl_file;
 
         if (incl_file_stack == 0)
                 return 0;
 
-        fclose(yyin);
+        dtc_close_file(srcpos_file);
 
         /*
          * Pop.
@@ -2158,17 +2174,14 @@ int pop_input_file(void)
         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;
+        srcpos_file = incl_file->file;
+        yyin = incl_file->file ? incl_file->file->file : NULL;
 
         /*
          * 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
index 28e6ec0296a1..27129377e5d2 100644
--- a/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped
+++ b/arch/powerpc/boot/dtc-src/dtc-parser.tab.c_shipped
@@ -75,7 +75,8 @@
      DT_BYTE = 264,
      DT_STRING = 265,
      DT_LABEL = 266,
-     DT_REF = 267
+     DT_REF = 267,
+     DT_INCBIN = 268
    };
 #endif
 /* Tokens.  */
@@ -89,6 +90,7 @@
 #define DT_STRING 265
 #define DT_LABEL 266
 #define DT_REF 267
+#define DT_INCBIN 268
 
 
 
@@ -96,14 +98,17 @@
 /* Copy the first part of user declarations.  */
 #line 23 "dtc-parser.y"
 
+#include <stdio.h>
+
 #include "dtc.h"
 #include "srcpos.h"
 
-int yylex(void);
-unsigned long long eval_literal(const char *s, int base, int bits);
+extern int yylex(void);
 
 extern struct boot_info *the_boot_info;
+extern int treesource_error;
 
+static unsigned long long eval_literal(const char *s, int base, int bits);
 
 
 /* Enabling traces.  */
@@ -126,16 +131,16 @@ extern struct boot_info *the_boot_info;
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 34 "dtc-parser.y"
+#line 37 "dtc-parser.y"
 {
         char *propnodename;
         char *literal;
         char *labelref;
         unsigned int cbase;
-        u8 byte;
+        uint8_t byte;
         struct data data;
 
-        u64 addr;
+        uint64_t addr;
         cell_t cell;
         struct property *prop;
         struct property *proplist;
@@ -144,7 +149,7 @@ typedef union YYSTYPE
         struct reserve_info *re;
 }
 /* Line 187 of yacc.c.  */
-#line 148 "dtc-parser.tab.c"
+#line 153 "dtc-parser.tab.c"
         YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
@@ -169,7 +174,7 @@ typedef struct YYLTYPE
 
 
 /* Line 216 of yacc.c.  */
-#line 173 "dtc-parser.tab.c"
+#line 178 "dtc-parser.tab.c"
 
 #ifdef short
 # undef short
@@ -386,20 +391,20 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  9
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   60
+#define YYLAST   73
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  24
+#define YYNTOKENS  27
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  20
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  43
+#define YYNRULES  45
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  67
+#define YYNSTATES  76
 
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   267
+#define YYMAXUTOK   268
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -411,15 +416,15 @@ static const yytype_uint8 yytranslate[] =
        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,
+      24,    26,     2,     2,    25,    15,     2,    16,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,    14,
+      20,    19,    21,     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,    22,     2,    23,     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,    17,     2,    18,     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,
@@ -433,7 +438,7 @@ static const yytype_uint8 yytranslate[] =
        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
+       5,     6,     7,     8,     9,    10,    11,    12,    13
 };
 
 #if YYDEBUG
@@ -443,37 +448,39 @@ 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
+      64,    69,    74,    77,    87,    93,    96,    97,   100,   103,
+     104,   107,   110,   113,   114,   116,   118,   121,   122,   125,
+     128,   129,   132,   135,   139,   140
 };
 
 /* 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
+      28,     0,    -1,     3,    14,    29,    34,    -1,    31,    34,
+      -1,    -1,    30,    29,    -1,    46,     4,    33,    33,    14,
+      -1,    -1,    32,    31,    -1,    30,    -1,    46,     4,    33,
+      15,    33,    14,    -1,     6,    -1,     7,    -1,    16,    35,
+      -1,    17,    36,    44,    18,    14,    -1,    -1,    36,    37,
+      -1,    46,     5,    19,    38,    14,    -1,    46,     5,    14,
+      -1,    39,    10,    -1,    39,    20,    40,    21,    -1,    39,
+      22,    43,    23,    -1,    39,    12,    -1,    39,    13,    24,
+      10,    25,    33,    25,    33,    26,    -1,    39,    13,    24,
+      10,    26,    -1,    38,    11,    -1,    -1,    38,    25,    -1,
+      39,    11,    -1,    -1,    40,    42,    -1,    40,    12,    -1,
+      40,    11,    -1,    -1,     8,    -1,     6,    -1,    41,     7,
+      -1,    -1,    43,     9,    -1,    43,    11,    -1,    -1,    45,
+      44,    -1,    45,    37,    -1,    46,     5,    35,    -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
+       0,    89,    89,    93,   101,   104,   111,   119,   122,   129,
+     133,   140,   144,   151,   158,   166,   169,   176,   180,   187,
+     191,   195,   199,   203,   220,   231,   239,   242,   246,   254,
+     257,   261,   266,   274,   277,   281,   285,   293,   296,   300,
+     308,   311,   315,   323,   331,   334
 };
 #endif
 
@@ -484,12 +491,12 @@ 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
+  "DT_BYTE", "DT_STRING", "DT_LABEL", "DT_REF", "DT_INCBIN", "';'", "'-'",
+  "'/'", "'{'", "'}'", "'='", "'<'", "'>'", "'['", "']'", "'('", "','",
+  "')'", "$accept", "sourcefile", "memreserves", "memreserve",
+  "v0_memreserves", "v0_memreserve", "addr", "devicetree", "nodedef",
+  "proplist", "propdef", "propdata", "propdataprefix", "celllist",
+  "cellbase", "cellval", "bytestring", "subnodes", "subnode", "label", 0
 };
 #endif
 
@@ -499,19 +506,19 @@ static const char *const yytname[] =
 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
+     265,   266,   267,   268,    59,    45,    47,   123,   125,    61,
+      60,    62,    91,    93,    40,    44,    41
 };
 # 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
+       0,    27,    28,    28,    29,    29,    30,    31,    31,    32,
+      32,    33,    33,    34,    35,    36,    36,    37,    37,    38,
+      38,    38,    38,    38,    38,    38,    39,    39,    39,    40,
+      40,    40,    40,    41,    41,    42,    42,    43,    43,    43,
+      44,    44,    44,    45,    46,    46
 };
 
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
@@ -519,9 +526,9 @@ 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
+       4,     4,     2,     9,     5,     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
@@ -529,81 +536,86 @@ static const yytype_uint8 yyr2[] =
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       7,     0,    43,     0,     9,     0,     7,     0,     4,     1,
+       7,     0,    45,     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
+      12,     0,     2,     5,     0,    40,     0,     0,     0,    16,
+       0,    40,     0,     0,     6,     0,    42,    41,     0,    10,
+      14,    18,    26,    43,     0,     0,    25,    17,    27,    19,
+      28,    22,     0,    29,    37,     0,    33,     0,     0,    35,
+      34,    32,    31,    20,     0,    30,    38,    39,    21,     0,
+      24,    36,     0,     0,     0,    23
 };
 
 /* 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
+      29,    44,    45,    56,    64,    65,    57,    30,    31,     7
 };
 
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
    STATE-NUM.  */
-#define YYPACT_NINF -13
+#define YYPACT_NINF -14
 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
+      30,   -11,   -14,     7,   -14,    -1,    27,    13,    27,   -14,
+       8,   -14,   -14,    40,    -1,    27,    35,   -14,   -14,   -14,
+     -14,    21,   -14,   -14,    40,    24,    40,    28,    40,   -14,
+      32,    24,    46,    38,   -14,    39,   -14,   -14,    26,   -14,
+     -14,   -14,   -14,   -14,    -9,    10,   -14,   -14,   -14,   -14,
+     -14,   -14,    31,   -14,   -14,    44,    -2,     3,    23,   -14,
+     -14,   -14,   -14,   -14,    50,   -14,   -14,   -14,   -14,    40,
+     -14,   -14,    33,    40,    36,   -14
 };
 
 /* 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
+     -14,   -14,    48,    29,    53,   -14,   -13,    47,    34,   -14,
+      37,   -14,   -14,   -14,   -14,   -14,   -14,    42,   -14,    -7
 };
 
 /* 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
+#define YYTABLE_NINF -45
 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
+      21,    16,    46,     8,    59,    47,    60,     9,    16,    61,
+      62,    28,    66,    33,    67,    10,    48,    13,    32,    63,
+      49,    50,    51,    52,    32,    17,    68,    19,    20,   -44,
+      53,   -44,    54,     1,   -44,     2,    26,    15,     2,    24,
+      41,     2,    34,    17,    15,    42,    19,    20,    69,    70,
+      35,    38,    39,    40,    58,    55,    72,    71,    73,    12,
+      74,    22,    75,    23,     0,     0,     0,     0,    36,     0,
+       0,     0,    43,    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
+      13,     8,    11,    14,     6,    14,     8,     0,    15,    11,
+      12,    24,     9,    26,    11,    16,    25,     4,    25,    21,
+      10,    11,    12,    13,    31,    17,    23,     6,     7,     5,
+      20,     4,    22,     3,     4,    11,    15,     8,    11,     4,
+      14,    11,    14,    17,    15,    19,     6,     7,    25,    26,
+      18,     5,    14,    14,    10,    24,    69,     7,    25,     6,
+      73,    14,    26,    15,    -1,    -1,    -1,    -1,    31,    -1,
+      -1,    -1,    38,    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
+       0,     3,    11,    28,    30,    31,    32,    46,    14,     0,
+      16,    34,    31,     4,    29,    30,    46,    17,    35,     6,
+       7,    33,    34,    29,     4,    36,    15,    33,    33,    37,
+      44,    45,    46,    33,    14,    18,    37,    44,     5,    14,
+      14,    14,    19,    35,    38,    39,    11,    14,    25,    10,
+      11,    12,    13,    20,    22,    24,    40,    43,    10,     6,
+       8,    11,    12,    21,    41,    42,     9,    11,    23,    25,
+      26,     7,    33,    25,    33,    26
 };
 
 #define yyerrok         (yyerrstatus = 0)
@@ -1440,289 +1452,323 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 86 "dtc-parser.y"
+#line 90 "dtc-parser.y"
     {
-                        the_boot_info = build_boot_info((yyvsp[(3) - (4)].re), (yyvsp[(4) - (4)].node));
+                        the_boot_info = build_boot_info((yyvsp[(3) - (4)].re), (yyvsp[(4) - (4)].node), 0);
                 ;}
     break;
 
   case 3:
-#line 90 "dtc-parser.y"
+#line 94 "dtc-parser.y"
     {
-                        the_boot_info = build_boot_info((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].node));
+                        the_boot_info = build_boot_info((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].node), 0);
                 ;}
     break;
 
   case 4:
-#line 97 "dtc-parser.y"
+#line 101 "dtc-parser.y"
     {
                         (yyval.re) = NULL;
                 ;}
     break;
 
   case 5:
-#line 101 "dtc-parser.y"
+#line 105 "dtc-parser.y"
     {
                         (yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re));
                 ;}
     break;
 
   case 6:
-#line 108 "dtc-parser.y"
+#line 112 "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"
+#line 119 "dtc-parser.y"
     {
                         (yyval.re) = NULL;
                 ;}
     break;
 
   case 8:
-#line 119 "dtc-parser.y"
+#line 123 "dtc-parser.y"
     {
                         (yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re));
                 ;}
     break;
 
   case 9:
-#line 126 "dtc-parser.y"
+#line 130 "dtc-parser.y"
     {
                         (yyval.re) = (yyvsp[(1) - (1)].re);
                 ;}
     break;
 
   case 10:
-#line 130 "dtc-parser.y"
+#line 134 "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"
+#line 141 "dtc-parser.y"
     {
                         (yyval.addr) = eval_literal((yyvsp[(1) - (1)].literal), 0, 64);
                 ;}
     break;
 
   case 12:
-#line 141 "dtc-parser.y"
+#line 145 "dtc-parser.y"
     {
                         (yyval.addr) = eval_literal((yyvsp[(1) - (1)].literal), 16, 64);
                 ;}
     break;
 
   case 13:
-#line 148 "dtc-parser.y"
+#line 152 "dtc-parser.y"
     {
                         (yyval.node) = name_node((yyvsp[(2) - (2)].node), "", NULL);
                 ;}
     break;
 
   case 14:
-#line 155 "dtc-parser.y"
+#line 159 "dtc-parser.y"
     {
                         (yyval.node) = build_node((yyvsp[(2) - (5)].proplist), (yyvsp[(3) - (5)].nodelist));
                 ;}
     break;
 
   case 15:
-#line 162 "dtc-parser.y"
+#line 166 "dtc-parser.y"
     {
                         (yyval.proplist) = NULL;
                 ;}
     break;
 
   case 16:
-#line 166 "dtc-parser.y"
+#line 170 "dtc-parser.y"
     {
                         (yyval.proplist) = chain_property((yyvsp[(2) - (2)].prop), (yyvsp[(1) - (2)].proplist));
                 ;}
     break;
 
   case 17:
-#line 173 "dtc-parser.y"
+#line 177 "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"
+#line 181 "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"
+#line 188 "dtc-parser.y"
     {
                         (yyval.data) = data_merge((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].data));
                 ;}
     break;
 
   case 20:
-#line 188 "dtc-parser.y"
+#line 192 "dtc-parser.y"
     {
                         (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data));
                 ;}
     break;
 
   case 21:
-#line 192 "dtc-parser.y"
+#line 196 "dtc-parser.y"
     {
                         (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data));
                 ;}
     break;
 
   case 22:
-#line 196 "dtc-parser.y"
+#line 200 "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"
+#line 204 "dtc-parser.y"
     {
-                        (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
+                        struct search_path path = { srcpos_file->dir, NULL, NULL };
+                        struct dtc_file *file = dtc_open_file((yyvsp[(4) - (9)].data).val, &path);
+                        struct data d = empty_data;
+
+                        if ((yyvsp[(6) - (9)].addr) != 0)
+                                if (fseek(file->file, (yyvsp[(6) - (9)].addr), SEEK_SET) != 0)
+                                        yyerrorf("Couldn't seek to offset %llu in \"%s\": %s",
+                                                 (unsigned long long)(yyvsp[(6) - (9)].addr),
+                                                 (yyvsp[(4) - (9)].data).val, strerror(errno));
+
+                        d = data_copy_file(file->file, (yyvsp[(8) - (9)].addr));
+
+                        (yyval.data) = data_merge((yyvsp[(1) - (9)].data), d);
+                        dtc_close_file(file);
                 ;}
     break;
 
   case 24:
-#line 207 "dtc-parser.y"
+#line 221 "dtc-parser.y"
     {
-                        (yyval.data) = empty_data;
+                        struct search_path path = { srcpos_file->dir, NULL, NULL };
+                        struct dtc_file *file = dtc_open_file((yyvsp[(4) - (5)].data).val, &path);
+                        struct data d = empty_data;
+
+                        d = data_copy_file(file->file, -1);
+
+                        (yyval.data) = data_merge((yyvsp[(1) - (5)].data), d);
+                        dtc_close_file(file);
                 ;}
     break;
 
   case 25:
-#line 211 "dtc-parser.y"
+#line 232 "dtc-parser.y"
     {
-                        (yyval.data) = (yyvsp[(1) - (2)].data);
+                        (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
                 ;}
     break;
 
   case 26:
-#line 215 "dtc-parser.y"
+#line 239 "dtc-parser.y"
     {
-                        (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
+                        (yyval.data) = empty_data;
                 ;}
     break;
 
   case 27:
-#line 222 "dtc-parser.y"
+#line 243 "dtc-parser.y"
     {
-                        (yyval.data) = empty_data;
+                        (yyval.data) = (yyvsp[(1) - (2)].data);
                 ;}
     break;
 
   case 28:
-#line 226 "dtc-parser.y"
+#line 247 "dtc-parser.y"
     {
-                        (yyval.data) = data_append_cell((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].cell));
+                        (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref));
                 ;}
     break;
 
   case 29:
-#line 230 "dtc-parser.y"
+#line 254 "dtc-parser.y"
+    {
+                        (yyval.data) = empty_data;
+                ;}
+    break;
+
+  case 30:
+#line 258 "dtc-parser.y"
+    {
+                        (yyval.data) = data_append_cell((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].cell));
+                ;}
+    break;
+
+  case 31:
+#line 262 "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"
+  case 32:
+#line 267 "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"
+  case 33:
+#line 274 "dtc-parser.y"
     {
                         (yyval.cbase) = 16;
                 ;}
     break;
 
-  case 33:
-#line 250 "dtc-parser.y"
+  case 35:
+#line 282 "dtc-parser.y"
     {
                         (yyval.cell) = eval_literal((yyvsp[(1) - (1)].literal), 0, 32);
                 ;}
     break;
 
-  case 34:
-#line 254 "dtc-parser.y"
+  case 36:
+#line 286 "dtc-parser.y"
     {
                         (yyval.cell) = eval_literal((yyvsp[(2) - (2)].literal), (yyvsp[(1) - (2)].cbase), 32);
                 ;}
     break;
 
-  case 35:
-#line 261 "dtc-parser.y"
+  case 37:
+#line 293 "dtc-parser.y"
     {
                         (yyval.data) = empty_data;
                 ;}
     break;
 
-  case 36:
-#line 265 "dtc-parser.y"
+  case 38:
+#line 297 "dtc-parser.y"
     {
                         (yyval.data) = data_append_byte((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].byte));
                 ;}
     break;
 
-  case 37:
-#line 269 "dtc-parser.y"
+  case 39:
+#line 301 "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"
+  case 40:
+#line 308 "dtc-parser.y"
     {
                         (yyval.nodelist) = NULL;
                 ;}
     break;
 
-  case 39:
-#line 280 "dtc-parser.y"
+  case 41:
+#line 312 "dtc-parser.y"
     {
                         (yyval.nodelist) = chain_node((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].nodelist));
                 ;}
     break;
 
-  case 40:
-#line 284 "dtc-parser.y"
+  case 42:
+#line 316 "dtc-parser.y"
     {
-                        yyerror("syntax error: properties must precede subnodes\n");
+                        yyerror("syntax error: properties must precede subnodes");
                         YYERROR;
                 ;}
     break;
 
-  case 41:
-#line 292 "dtc-parser.y"
+  case 43:
+#line 324 "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"
+  case 44:
+#line 331 "dtc-parser.y"
     {
                         (yyval.labelref) = NULL;
                 ;}
     break;
 
-  case 43:
-#line 303 "dtc-parser.y"
+  case 45:
+#line 335 "dtc-parser.y"
     {
                         (yyval.labelref) = (yyvsp[(1) - (1)].labelref);
                 ;}
@@ -1730,7 +1776,7 @@ yyreduce:
 
 
 /* Line 1267 of yacc.c.  */
-#line 1734 "dtc-parser.tab.c"
+#line 1780 "dtc-parser.tab.c"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1950,21 +1996,32 @@ yyreturn:
 }
 
 
-#line 308 "dtc-parser.y"
+#line 340 "dtc-parser.y"
 
 
-void yyerror (char const *s)
+void yyerrorf(char const *s, ...)
 {
-        const char *fname = srcpos_filename_for_num(yylloc.filenum);
+        const char *fname = srcpos_file ? srcpos_file->name : "<no-file>";
+        va_list va;
+        va_start(va, s);
 
         if (strcmp(fname, "-") == 0)
                 fname = "stdin";
 
-        fprintf(stderr, "%s:%d %s\n",
-                fname, yylloc.first_line, s);
+        fprintf(stderr, "%s:%d ", fname, yylloc.first_line);
+        vfprintf(stderr, s, va);
+        fprintf(stderr, "\n");
+
+        treesource_error = 1;
+        va_end(va);
+}
+
+void yyerror (char const *s)
+{
+        yyerrorf("%s", s);
 }
 
-unsigned long long eval_literal(const char *s, int base, int bits)
+static unsigned long long eval_literal(const char *s, int base, int bits)
 {
         unsigned long long val;
         char *e;
diff --git a/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped b/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped
index 4707b029ed25..ba99100d55c9 100644
--- a/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped
+++ b/arch/powerpc/boot/dtc-src/dtc-parser.tab.h_shipped
@@ -48,7 +48,8 @@
      DT_BYTE = 264,
      DT_STRING = 265,
      DT_LABEL = 266,
-     DT_REF = 267
+     DT_REF = 267,
+     DT_INCBIN = 268
    };
 #endif
 /* Tokens.  */
@@ -62,22 +63,23 @@
 #define DT_STRING 265
 #define DT_LABEL 266
 #define DT_REF 267
+#define DT_INCBIN 268
 
 
 
 
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 34 "dtc-parser.y"
+#line 37 "dtc-parser.y"
 {
         char *propnodename;
         char *literal;
         char *labelref;
         unsigned int cbase;
-        u8 byte;
+        uint8_t byte;
         struct data data;
 
-        u64 addr;
+        uint64_t addr;
         cell_t cell;
         struct property *prop;
         struct property *proplist;
@@ -86,7 +88,7 @@ typedef union YYSTYPE
         struct reserve_info *re;
 }
 /* Line 1489 of yacc.c.  */
-#line 90 "dtc-parser.tab.h"
+#line 92 "dtc-parser.tab.h"
         YYSTYPE;
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
diff --git a/arch/powerpc/boot/dtc-src/dtc-parser.y b/arch/powerpc/boot/dtc-src/dtc-parser.y
index 002ea7fef184..b2ab562420ea 100644
--- a/arch/powerpc/boot/dtc-src/dtc-parser.y
+++ b/arch/powerpc/boot/dtc-src/dtc-parser.y
@@ -21,14 +21,17 @@
 %locations
 
 %{
+#include <stdio.h>
+
 #include "dtc.h"
 #include "srcpos.h"
 
-int yylex(void);
-unsigned long long eval_literal(const char *s, int base, int bits);
+extern int yylex(void);
 
 extern struct boot_info *the_boot_info;
+extern int treesource_error;
 
+static unsigned long long eval_literal(const char *s, int base, int bits);
 %}
 
 %union {
@@ -36,10 +39,10 @@ extern struct boot_info *the_boot_info;
         char *literal;
         char *labelref;
         unsigned int cbase;
-        u8 byte;
+        uint8_t byte;
         struct data data;
 
-        u64 addr;
+        uint64_t addr;
         cell_t cell;
         struct property *prop;
         struct property *proplist;
@@ -58,6 +61,7 @@ extern struct boot_info *the_boot_info;
 %token <data> DT_STRING
 %token <labelref> DT_LABEL
 %token <labelref> DT_REF
+%token DT_INCBIN
 
 %type <data> propdata
 %type <data> propdataprefix
@@ -84,11 +88,11 @@ extern struct boot_info *the_boot_info;
 sourcefile:
           DT_V1 ';' memreserves devicetree
                 {
-                        the_boot_info = build_boot_info($3, $4);
+                        the_boot_info = build_boot_info($3, $4, 0);
                 }
         | v0_memreserves devicetree
                 {
-                        the_boot_info = build_boot_info($1, $2);
+                        the_boot_info = build_boot_info($1, $2, 0);
                 }
         ;
 
@@ -196,6 +200,34 @@ propdata:
                 {
                         $$ = data_add_marker($1, REF_PATH, $2);
                 }
+        | propdataprefix DT_INCBIN '(' DT_STRING ',' addr ',' addr ')'
+                {
+                        struct search_path path = { srcpos_file->dir, NULL, NULL };
+                        struct dtc_file *file = dtc_open_file($4.val, &path);
+                        struct data d = empty_data;
+
+                        if ($6 != 0)
+                                if (fseek(file->file, $6, SEEK_SET) != 0)
+                                        yyerrorf("Couldn't seek to offset %llu in \"%s\": %s",
+                                                 (unsigned long long)$6,
+                                                 $4.val, strerror(errno));
+
+                        d = data_copy_file(file->file, $8);
+
+                        $$ = data_merge($1, d);
+                        dtc_close_file(file);
+                }
+        | propdataprefix DT_INCBIN '(' DT_STRING ')'
+                {
+                        struct search_path path = { srcpos_file->dir, NULL, NULL };
+                        struct dtc_file *file = dtc_open_file($4.val, &path);
+                        struct data d = empty_data;
+
+                        d = data_copy_file(file->file, -1);
+
+                        $$ = data_merge($1, d);
+                        dtc_close_file(file);
+                }
         | propdata DT_LABEL
                 {
                         $$ = data_add_marker($1, LABEL, $2);
@@ -282,7 +314,7 @@ subnodes:
                 }
         | subnode propdef
                 {
-                        yyerror("syntax error: properties must precede subnodes\n");
+                        yyerror("syntax error: properties must precede subnodes");
                         YYERROR;
                 }
         ;
@@ -307,18 +339,29 @@ label:
 
 %%
 
-void yyerror (char const *s)
+void yyerrorf(char const *s, ...)
 {
-        const char *fname = srcpos_filename_for_num(yylloc.filenum);
+        const char *fname = srcpos_file ? srcpos_file->name : "<no-file>";
+        va_list va;
+        va_start(va, s);
 
         if (strcmp(fname, "-") == 0)
                 fname = "stdin";
 
-        fprintf(stderr, "%s:%d %s\n",
-                fname, yylloc.first_line, s);
+        fprintf(stderr, "%s:%d ", fname, yylloc.first_line);
+        vfprintf(stderr, s, va);
+        fprintf(stderr, "\n");
+
+        treesource_error = 1;
+        va_end(va);
+}
+
+void yyerror (char const *s)
+{
+        yyerrorf("%s", s);
 }
 
-unsigned long long eval_literal(const char *s, int base, int bits)
+static unsigned long long eval_literal(const char *s, int base, int bits)
 {
         unsigned long long val;
         char *e;
diff --git a/arch/powerpc/boot/dtc-src/dtc.c b/arch/powerpc/boot/dtc-src/dtc.c
index 01131d7c2d5e..d8fd43b4ac1a 100644
--- a/arch/powerpc/boot/dtc-src/dtc.c
+++ b/arch/powerpc/boot/dtc-src/dtc.c
@@ -55,7 +55,7 @@ char *join_path(const char *path, const char *name)
         return str;
 }
 
-void fill_fullpaths(struct node *tree, const char *prefix)
+static void fill_fullpaths(struct node *tree, const char *prefix)
 {
         struct node *child;
         const char *unit;
@@ -106,7 +106,7 @@ static void  __attribute__ ((noreturn)) usage(void)
         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);
+        exit(3);
 }
 
 int main(int argc, char *argv[])
@@ -118,10 +118,9 @@ int main(int argc, char *argv[])
         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;
+        long long cmdline_boot_cpuid = -1;
 
         quiet      = 0;
         reservenum = 0;
@@ -161,11 +160,11 @@ int main(int argc, char *argv[])
                         quiet++;
                         break;
                 case 'b':
-                        boot_cpuid_phys = strtol(optarg, NULL, 0);
+                        cmdline_boot_cpuid = strtoll(optarg, NULL, 0);
                         break;
                 case 'v':
-                    printf("Version: %s\n", DTC_VERSION);
-                    exit(0);
+                        printf("Version: %s\n", DTC_VERSION);
+                        exit(0);
                 case 'h':
                 default:
                         usage();
@@ -180,31 +179,27 @@ int main(int argc, char *argv[])
                 arg = argv[optind];
 
         /* minsize and padsize are mutually exclusive */
-        if ((minsize) && (padsize)) {
+        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")) {
+        if (streq(inform, "dts"))
                 bi = dt_from_source(arg);
-        } else if (streq(inform, "fs")) {
+        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 {
+        else if(streq(inform, "dtb"))
+                bi = dt_from_blob(arg);
+        else
                 die("Unknown input format \"%s\"\n", inform);
-        }
 
-        if (inf && (inf != stdin))
-                fclose(inf);
+        if (cmdline_boot_cpuid != -1)
+                bi->boot_cpuid_phys = cmdline_boot_cpuid;
 
-        if (! bi || ! bi->dt)
-                die("Couldn't read input tree\n");
+        fill_fullpaths(bi->dt, "");
+        process_checks(force, bi);
 
-        process_checks(force, bi, check, outversion, boot_cpuid_phys);
 
         if (streq(outname, "-")) {
                 outf = stdout;
@@ -218,9 +213,9 @@ int main(int argc, char *argv[])
         if (streq(outform, "dts")) {
                 dt_to_source(outf, bi);
         } else if (streq(outform, "dtb")) {
-                dt_to_blob(outf, bi, outversion, boot_cpuid_phys);
+                dt_to_blob(outf, bi, outversion);
         } else if (streq(outform, "asm")) {
-                dt_to_asm(outf, bi, outversion, boot_cpuid_phys);
+                dt_to_asm(outf, bi, outversion);
         } else if (streq(outform, "null")) {
                 /* do nothing */
         } else {
diff --git a/arch/powerpc/boot/dtc-src/dtc.h b/arch/powerpc/boot/dtc-src/dtc.h
index 65281777a167..08d54c870086 100644
--- a/arch/powerpc/boot/dtc-src/dtc.h
+++ b/arch/powerpc/boot/dtc-src/dtc.h
@@ -30,10 +30,8 @@
 #include <ctype.h>
 #include <errno.h>
 #include <unistd.h>
-#include <netinet/in.h>
-#include <endian.h>
-#include <byteswap.h>
 
+#include <libfdt_env.h>
 #include <fdt.h>
 
 #define DEFAULT_FDT_VERSION     17
@@ -75,25 +73,8 @@ static inline void *xrealloc(void *p, size_t len)
         return new;
 }
 
-typedef uint8_t u8;
-typedef uint16_t u16;
-typedef uint32_t u32;
-typedef uint64_t u64;
-typedef u32 cell_t;
+typedef uint32_t 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)
@@ -118,7 +99,6 @@ struct  marker {
 struct data {
         int len;
         char *val;
-        int asize;
         struct marker *markers;
 };
 
@@ -145,7 +125,7 @@ struct data data_insert_at_marker(struct data d, struct marker *m,
 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_addr(struct data d, uint64_t 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);
@@ -223,7 +203,7 @@ struct reserve_info {
         char *label;
 };
 
-struct reserve_info *build_reserve_entry(u64 start, u64 len, char *label);
+struct reserve_info *build_reserve_entry(uint64_t start, uint64_t 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,
@@ -233,24 +213,22 @@ struct reserve_info *add_reserve_entry(struct reserve_info *list,
 struct boot_info {
         struct reserve_info *reservelist;
         struct node *dt;                /* the device tree */
+        uint32_t boot_cpuid_phys;
 };
 
 struct boot_info *build_boot_info(struct reserve_info *reservelist,
-                                  struct node *tree);
+                                  struct node *tree, uint32_t boot_cpuid_phys);
 
 /* Checks */
 
-void process_checks(int force, struct boot_info *bi,
-                    int checkflag, int outversion, int boot_cpuid_phys);
+void process_checks(int force, struct boot_info *bi);
 
 /* 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);
+void dt_to_blob(FILE *f, struct boot_info *bi, int version);
+void dt_to_asm(FILE *f, struct boot_info *bi, int version);
 
-struct boot_info *dt_from_blob(FILE *f);
+struct boot_info *dt_from_blob(const char *fname);
 
 /* Tree source */
 
@@ -264,6 +242,5 @@ 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
index a7cfb843d334..76acd28c068d 100644
--- a/arch/powerpc/boot/dtc-src/flattree.c
+++ b/arch/powerpc/boot/dtc-src/flattree.c
@@ -19,6 +19,7 @@
  */
 
 #include "dtc.h"
+#include "srcpos.h"
 
 #define FTF_FULLPATH    0x1
 #define FTF_VARALIGN    0x2
@@ -162,28 +163,18 @@ static void asm_emit_data(void *e, struct data d)
 {
         FILE *f = e;
         int off = 0;
-        struct marker *m;
+        struct marker *m = d.markers;
 
-        m = d.markers;
-        while (m) {
-                if (m->type == LABEL)
-                        emit_offset_label(f, m->ref, m->offset);
-                m = m->next;
-        }
+        for_each_marker_of_type(m, LABEL)
+                emit_offset_label(f, m->ref, m->offset);
 
-        while ((d.len - off) >= sizeof(u32)) {
+        while ((d.len - off) >= sizeof(uint32_t)) {
                 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);
+                        fdt32_to_cpu(*((uint32_t *)(d.val+off))));
+                off += sizeof(uint32_t);
         }
 
-        if ((d.len - off) >= 1) {
+        while ((d.len - off) >= 1) {
                 fprintf(f, "\t.byte\t0x%hhx\n", d.val[off]);
                 off += 1;
         }
@@ -336,29 +327,28 @@ static void make_fdt_header(struct fdt_header *fdt,
 
         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);
+        fdt->magic = cpu_to_fdt32(FDT_MAGIC);
+        fdt->version = cpu_to_fdt32(vi->version);
+        fdt->last_comp_version = cpu_to_fdt32(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
+        fdt->off_mem_rsvmap = cpu_to_fdt32(reserve_off);
+        fdt->off_dt_struct = cpu_to_fdt32(reserve_off + reservesize);
+        fdt->off_dt_strings = cpu_to_fdt32(reserve_off + reservesize
                                           + dtsize);
-        fdt->totalsize = cpu_to_be32(reserve_off + reservesize + dtsize + strsize);
+        fdt->totalsize = cpu_to_fdt32(reserve_off + reservesize + dtsize + strsize);
 
         if (vi->flags & FTF_BOOTCPUID)
-                fdt->boot_cpuid_phys = cpu_to_be32(boot_cpuid_phys);
+                fdt->boot_cpuid_phys = cpu_to_fdt32(boot_cpuid_phys);
         if (vi->flags & FTF_STRTABSIZE)
-                fdt->size_dt_strings = cpu_to_be32(strsize);
+                fdt->size_dt_strings = cpu_to_fdt32(strsize);
         if (vi->flags & FTF_STRUCTSIZE)
-                fdt->size_dt_struct = cpu_to_be32(dtsize);
+                fdt->size_dt_struct = cpu_to_fdt32(dtsize);
 }
 
-void dt_to_blob(FILE *f, struct boot_info *bi, int version,
-                int boot_cpuid_phys)
+void dt_to_blob(FILE *f, struct boot_info *bi, int version)
 {
         struct version_info *vi = NULL;
         int i;
@@ -383,26 +373,26 @@ void dt_to_blob(FILE *f, struct boot_info *bi, int version,
 
         /* Make header */
         make_fdt_header(&fdt, vi, reservebuf.len, dtbuf.len, strbuf.len,
-                        boot_cpuid_phys);
+                        bi->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);
+                padlen = minsize - fdt32_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);
+                                fdt32_to_cpu(fdt.totalsize), minsize);
         }
 
         if (padsize > 0)
                 padlen = padsize;
 
         if (padlen > 0) {
-                int tsize = be32_to_cpu(fdt.totalsize);
+                int tsize = fdt32_to_cpu(fdt.totalsize);
                 tsize += padlen;
-                fdt.totalsize = cpu_to_be32(tsize);
+                fdt.totalsize = cpu_to_fdt32(tsize);
         }
 
         /*
@@ -410,7 +400,7 @@ void dt_to_blob(FILE *f, struct boot_info *bi, int version,
          * 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_data(blob, &fdt, vi->hdr_size);
         blob = data_append_align(blob, 8);
         blob = data_merge(blob, reservebuf);
         blob = data_append_zeroes(blob, sizeof(struct fdt_reserve_entry));
@@ -449,7 +439,7 @@ static void dump_stringtable_asm(FILE *f, struct data strbuf)
         }
 }
 
-void dt_to_asm(FILE *f, struct boot_info *bi, int version, int boot_cpuid_phys)
+void dt_to_asm(FILE *f, struct boot_info *bi, int version)
 {
         struct version_info *vi = NULL;
         int i;
@@ -489,7 +479,7 @@ void dt_to_asm(FILE *f, struct boot_info *bi, int version, int boot_cpuid_phys)
 
         if (vi->flags & FTF_BOOTCPUID)
                 fprintf(f, "\t.long\t%i\t\t\t\t\t/* boot_cpuid_phys */\n",
-                        boot_cpuid_phys);
+                        bi->boot_cpuid_phys);
 
         if (vi->flags & FTF_STRTABSIZE)
                 fprintf(f, "\t.long\t_%s_strings_end - _%s_strings_start\t/* size_dt_strings */\n",
@@ -579,15 +569,15 @@ static void flat_read_chunk(struct inbuf *inb, void *p, int len)
         inb->ptr += len;
 }
 
-static u32 flat_read_word(struct inbuf *inb)
+static uint32_t flat_read_word(struct inbuf *inb)
 {
-        u32 val;
+        uint32_t val;
 
         assert(((inb->ptr - inb->base) % sizeof(val)) == 0);
 
         flat_read_chunk(inb, &val, sizeof(val));
 
-        return be32_to_cpu(val);
+        return fdt32_to_cpu(val);
 }
 
 static void flat_realign(struct inbuf *inb, int align)
@@ -615,7 +605,7 @@ static char *flat_read_string(struct inbuf *inb)
 
         inb->ptr += len;
 
-        flat_realign(inb, sizeof(u32));
+        flat_realign(inb, sizeof(uint32_t));
 
         return str;
 }
@@ -632,7 +622,7 @@ static struct data flat_read_data(struct inbuf *inb, int len)
 
         flat_read_chunk(inb, d.val, len);
 
-        flat_realign(inb, sizeof(u32));
+        flat_realign(inb, sizeof(uint32_t));
 
         return d;
 }
@@ -659,7 +649,7 @@ static char *flat_read_stringtable(struct inbuf *inb, int offset)
 static struct property *flat_read_property(struct inbuf *dtbuf,
                                            struct inbuf *strbuf, int flags)
 {
-        u32 proplen, stroff;
+        uint32_t proplen, stroff;
         char *name;
         struct data val;
 
@@ -693,8 +683,8 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)
         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);
+                re.address  = fdt64_to_cpu(re.address);
+                re.size = fdt64_to_cpu(re.size);
                 if (re.size == 0)
                         break;
 
@@ -708,77 +698,37 @@ static struct reserve_info *flat_read_mem_reserve(struct inbuf *inb)
 
 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;
+        plen = strlen(ppath);
 
-        atpos = strrchr(name, '@');
+        if (!strneq(ppath, cpath, plen))
+                die("Path \"%s\" is not valid as a child of \"%s\"\n",
+                    cpath, ppath);
 
-        if (atpos)
-                basenamelen = atpos - name;
-        else
-                basenamelen = strlen(name);
-
-        if (strspn(name, PROPCHAR) < basenamelen)
-                return -1;
+        /* root node is a special case */
+        if (!streq(ppath, "/"))
+                plen++;
 
-        if (atpos
-            && ((basenamelen + 1 + strspn(atpos+1, UNITCHAR)) < strlen(name)))
-                return -1;
-
-        return basenamelen;
+        return strdup(cpath + plen);
 }
 
 static struct node *unflatten_tree(struct inbuf *dtbuf,
                                    struct inbuf *strbuf,
-                                   const char *parent_path, int flags)
+                                   const char *parent_flatname, int flags)
 {
         struct node *node;
-        u32 val;
+        char *flatname;
+        uint32_t 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);
-        }
+        flatname = flat_read_string(dtbuf);
 
-        node->basenamelen = check_node_name(node->name);
-        if (node->basenamelen < 0) {
-                fprintf(stderr, "Warning \"%s\" has incorrect format\n", node->name);
-        }
+        if (flags & FTF_FULLPATH)
+                node->name = nodename_from_path(parent_flatname, flatname);
+        else
+                node->name = flatname;
 
         do {
                 struct property *prop;
@@ -795,8 +745,7 @@ static struct node *unflatten_tree(struct inbuf *dtbuf,
                         break;
 
                 case FDT_BEGIN_NODE:
-                        child = unflatten_tree(dtbuf,strbuf, node->fullpath,
-                                               flags);
+                        child = unflatten_tree(dtbuf,strbuf, flatname, flags);
                         add_child(node, child);
                         break;
 
@@ -825,10 +774,11 @@ static struct node *unflatten_tree(struct inbuf *dtbuf,
 }
 
 
-struct boot_info *dt_from_blob(FILE *f)
+struct boot_info *dt_from_blob(const char *fname)
 {
-        u32 magic, totalsize, version, size_str, size_dt;
-        u32 off_dt, off_str, off_mem_rsvmap;
+        struct dtc_file *dtcf;
+        uint32_t magic, totalsize, version, size_dt, boot_cpuid_phys;
+        uint32_t off_dt, off_str, off_mem_rsvmap;
         int rc;
         char *blob;
         struct fdt_header *fdt;
@@ -838,54 +788,56 @@ struct boot_info *dt_from_blob(FILE *f)
         int sizeleft;
         struct reserve_info *reservelist;
         struct node *tree;
-        u32 val;
+        uint32_t val;
         int flags = 0;
 
-        rc = fread(&magic, sizeof(magic), 1, f);
-        if (ferror(f))
+        dtcf = dtc_open_file(fname, NULL);
+
+        rc = fread(&magic, sizeof(magic), 1, dtcf->file);
+        if (ferror(dtcf->file))
                 die("Error reading DT blob magic number: %s\n",
                     strerror(errno));
         if (rc < 1) {
-                if (feof(f))
+                if (feof(dtcf->file))
                         die("EOF reading DT blob magic number\n");
                 else
                         die("Mysterious short read reading magic number\n");
         }
 
-        magic = be32_to_cpu(magic);
+        magic = fdt32_to_cpu(magic);
         if (magic != FDT_MAGIC)
                 die("Blob has incorrect magic number\n");
 
-        rc = fread(&totalsize, sizeof(totalsize), 1, f);
-        if (ferror(f))
+        rc = fread(&totalsize, sizeof(totalsize), 1, dtcf->file);
+        if (ferror(dtcf->file))
                 die("Error reading DT blob size: %s\n", strerror(errno));
         if (rc < 1) {
-                if (feof(f))
+                if (feof(dtcf->file))
                         die("EOF reading DT blob size\n");
                 else
                         die("Mysterious short read reading blob size\n");
         }
 
-        totalsize = be32_to_cpu(totalsize);
+        totalsize = fdt32_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);
+        fdt->magic = cpu_to_fdt32(magic);
+        fdt->totalsize = cpu_to_fdt32(totalsize);
 
         sizeleft = totalsize - sizeof(magic) - sizeof(totalsize);
         p = blob + sizeof(magic)  + sizeof(totalsize);
 
         while (sizeleft) {
-                if (feof(f))
+                if (feof(dtcf->file))
                         die("EOF before reading %d bytes of DT blob\n",
                             totalsize);
 
-                rc = fread(p, 1, sizeleft, f);
-                if (ferror(f))
+                rc = fread(p, 1, sizeleft, dtcf->file);
+                if (ferror(dtcf->file))
                         die("Error reading DT blob: %s\n",
                             strerror(errno));
 
@@ -893,19 +845,11 @@ struct boot_info *dt_from_blob(FILE *f)
                 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));
+        off_dt = fdt32_to_cpu(fdt->off_dt_struct);
+        off_str = fdt32_to_cpu(fdt->off_dt_strings);
+        off_mem_rsvmap = fdt32_to_cpu(fdt->off_mem_rsvmap);
+        version = fdt32_to_cpu(fdt->version);
+        boot_cpuid_phys = fdt32_to_cpu(fdt->boot_cpuid_phys);
 
         if (off_mem_rsvmap >= totalsize)
                 die("Mem Reserve structure offset exceeds total size\n");
@@ -916,21 +860,17 @@ struct boot_info *dt_from_blob(FILE *f)
         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);
+                uint32_t size_str = fdt32_to_cpu(fdt->size_dt_strings);
                 if (off_str+size_str > totalsize)
                         die("String table extends past total size\n");
+                inbuf_init(&strbuf, blob + off_str, blob + off_str + size_str);
+        } else {
+                inbuf_init(&strbuf, blob + off_str, blob + totalsize);
         }
 
         if (version >= 17) {
-                size_dt = be32_to_cpu(fdt->size_dt_struct);
-                fprintf(stderr, "\tsize_dt_struct:\t\t%d\n", size_dt);
+                size_dt = fdt32_to_cpu(fdt->size_dt_struct);
                 if (off_dt+size_dt > totalsize)
                         die("Structure block extends past total size\n");
         }
@@ -944,10 +884,6 @@ struct boot_info *dt_from_blob(FILE *f)
         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);
 
@@ -964,5 +900,7 @@ struct boot_info *dt_from_blob(FILE *f)
 
         free(blob);
 
-        return build_boot_info(reservelist, tree);
+        dtc_close_file(dtcf);
+
+        return build_boot_info(reservelist, tree, boot_cpuid_phys);
 }
diff --git a/arch/powerpc/boot/dtc-src/fstree.c b/arch/powerpc/boot/dtc-src/fstree.c
index 2a160a46998e..766b2694d935 100644
--- a/arch/powerpc/boot/dtc-src/fstree.c
+++ b/arch/powerpc/boot/dtc-src/fstree.c
@@ -31,8 +31,8 @@ static struct node *read_fstree(const char *dirname)
         struct node *tree;
 
         d = opendir(dirname);
-        if (! d)
-                die("opendir(): %s\n", strerror(errno));
+        if (!d)
+                die("Couldn't opendir() \"%s\": %s\n", dirname, strerror(errno));
 
         tree = build_node(NULL, NULL);
 
@@ -87,8 +87,6 @@ struct boot_info *dt_from_fs(const char *dirname)
         tree = read_fstree(dirname);
         tree = name_node(tree, "", NULL);
 
-        fill_fullpaths(tree, "");
-
-        return build_boot_info(NULL, tree);
+        return build_boot_info(NULL, tree, 0);
 }
 
diff --git a/arch/powerpc/boot/dtc-src/libfdt_env.h b/arch/powerpc/boot/dtc-src/libfdt_env.h
new file mode 100644
index 000000000000..449bf602daf1
--- /dev/null
+++ b/arch/powerpc/boot/dtc-src/libfdt_env.h
@@ -0,0 +1,23 @@
+#ifndef _LIBFDT_ENV_H
+#define _LIBFDT_ENV_H
+
+#include <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
+#define _B(n)   ((unsigned long long)((uint8_t *)&x)[n])
+static inline uint32_t fdt32_to_cpu(uint32_t x)
+{
+        return (_B(0) << 24) | (_B(1) << 16) | (_B(2) << 8) | _B(3);
+}
+#define cpu_to_fdt32(x) fdt32_to_cpu(x)
+
+static inline uint64_t fdt64_to_cpu(uint64_t x)
+{
+        return (_B(0) << 56) | (_B(1) << 48) | (_B(2) << 40) | (_B(3) << 32)
+                | (_B(4) << 24) | (_B(5) << 16) | (_B(6) << 8) | _B(7);
+}
+#define cpu_to_fdt64(x) fdt64_to_cpu(x)
+#undef _B
+
+#endif /* _LIBFDT_ENV_H */
diff --git a/arch/powerpc/boot/dtc-src/livetree.c b/arch/powerpc/boot/dtc-src/livetree.c
index 6ba0846b4310..0ca3de550b3f 100644
--- a/arch/powerpc/boot/dtc-src/livetree.c
+++ b/arch/powerpc/boot/dtc-src/livetree.c
@@ -115,6 +115,7 @@ void add_child(struct node *parent, struct node *child)
         struct node **p;
 
         child->next_sibling = NULL;
+        child->parent = parent;
 
         p = &parent->children;
         while (*p)
@@ -123,7 +124,8 @@ void add_child(struct node *parent, struct node *child)
         *p = child;
 }
 
-struct reserve_info *build_reserve_entry(u64 address, u64 size, char *label)
+struct reserve_info *build_reserve_entry(uint64_t address, uint64_t size,
+                                         char *label)
 {
         struct reserve_info *new = xmalloc(sizeof(*new));
 
@@ -165,13 +167,14 @@ struct reserve_info *add_reserve_entry(struct reserve_info *list,
 }
 
 struct boot_info *build_boot_info(struct reserve_info *reservelist,
-                                  struct node *tree)
+                                  struct node *tree, uint32_t boot_cpuid_phys)
 {
         struct boot_info *bi;
 
         bi = xmalloc(sizeof(*bi));
         bi->reservelist = reservelist;
         bi->dt = tree;
+        bi->boot_cpuid_phys = boot_cpuid_phys;
 
         return bi;
 }
@@ -202,7 +205,7 @@ struct property *get_property(struct node *node, const char *propname)
 cell_t propval_cell(struct property *prop)
 {
         assert(prop->val.len == sizeof(cell_t));
-        return be32_to_cpu(*((cell_t *)prop->val.val));
+        return fdt32_to_cpu(*((cell_t *)prop->val.val));
 }
 
 struct node *get_subnode(struct node *node, const char *nodename)
diff --git a/arch/powerpc/boot/dtc-src/srcpos.c b/arch/powerpc/boot/dtc-src/srcpos.c
index 352b0fe06fde..9641b7628b4d 100644
--- a/arch/powerpc/boot/dtc-src/srcpos.c
+++ b/arch/powerpc/boot/dtc-src/srcpos.c
@@ -20,86 +20,97 @@
 #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;
-
+struct dtc_file *srcpos_file;
 
-
-FILE *dtc_open_file(const char *fname)
+static int dtc_open_one(struct dtc_file *file,
+                        const char *search,
+                        const char *fname)
 {
-        FILE *f;
+        char *fullname;
 
-        if (lookup_file_name(fname, 1) < 0)
-                die("Too many files opened\n");
+        if (search) {
+                fullname = xmalloc(strlen(search) + strlen(fname) + 2);
 
-        if (streq(fname, "-"))
-                f = stdin;
-        else
-                f = fopen(fname, "r");
+                strcpy(fullname, search);
+                strcat(fullname, "/");
+                strcat(fullname, fname);
+        } else {
+                fullname = strdup(fname);
+        }
 
-        if (! f)
-                die("Couldn't open \"%s\": %s\n", fname, strerror(errno));
+        file->file = fopen(fullname, "r");
+        if (!file->file) {
+                free(fullname);
+                return 0;
+        }
 
-        return f;
+        file->name = fullname;
+        return 1;
 }
 
 
+struct dtc_file *dtc_open_file(const char *fname,
+                               const struct search_path *search)
+{
+        static const struct search_path default_search = { NULL, NULL, NULL };
 
-/*
- * 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
- */
+        struct dtc_file *file;
+        const char *slash;
 
-int lookup_file_name(const char *fname, int add_it)
-{
-        int i;
+        file = xmalloc(sizeof(struct dtc_file));
 
-        for (i = 0; i < n_file_names; i++) {
-                if (strcmp(file_names[i], fname) == 0)
-                        return i;
+        slash = strrchr(fname, '/');
+        if (slash) {
+                char *dir = xmalloc(slash - fname + 1);
+
+                memcpy(dir, fname, slash - fname);
+                dir[slash - fname] = 0;
+                file->dir = dir;
+        } else {
+                file->dir = NULL;
         }
 
-        if (add_it) {
-                if (n_file_names < MAX_N_FILE_NAMES) {
-                        file_names[n_file_names] = strdup(fname);
-                        return n_file_names++;
-                }
+        if (streq(fname, "-")) {
+                file->name = "stdin";
+                file->file = stdin;
+                return file;
         }
 
-        return -1;
-}
+        if (fname[0] == '/') {
+                file->file = fopen(fname, "r");
+                if (!file->file)
+                        goto fail;
+
+                file->name = strdup(fname);
+                return file;
+        }
 
+        if (!search)
+                search = &default_search;
 
-const char *srcpos_filename_for_num(int filenum)
-{
-        if (0 <= filenum && filenum < n_file_names) {
-                return file_names[filenum];
+        while (search) {
+                if (dtc_open_one(file, search->dir, fname))
+                        return file;
+
+                if (errno != ENOENT)
+                        goto fail;
+
+                search = search->next;
         }
 
-        return 0;
+fail:
+        die("Couldn't open \"%s\": %s\n", fname, strerror(errno));
 }
 
-
-const char *srcpos_get_filename(void)
+void dtc_close_file(struct dtc_file *file)
 {
-        return srcpos_filename_for_num(srcpos_filenum);
+        if (fclose(file->file))
+                die("Error closing \"%s\": %s\n", file->name, strerror(errno));
+
+        free(file->dir);
+        free(file);
 }
diff --git a/arch/powerpc/boot/dtc-src/srcpos.h b/arch/powerpc/boot/dtc-src/srcpos.h
index ce7ab5ba5b46..e17c7c04db8e 100644
--- a/arch/powerpc/boot/dtc-src/srcpos.h
+++ b/arch/powerpc/boot/dtc-src/srcpos.h
@@ -22,13 +22,21 @@
  * array of all opened filenames.
  */
 
+#include <stdio.h>
+
+struct dtc_file {
+        char *dir;
+        const char *name;
+        FILE *file;
+};
+
 #if ! defined(YYLTYPE) && ! defined(YYLTYPE_IS_DECLARED)
 typedef struct YYLTYPE {
     int first_line;
     int first_column;
     int last_line;
     int last_column;
-    int filenum;
+    struct dtc_file *file;
 } YYLTYPE;
 
 #define YYLTYPE_IS_DECLARED     1
@@ -48,7 +56,7 @@ typedef struct YYLTYPE {
           (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;           \
+          (Current).file         = YYRHSLOC (Rhs, N).file;              \
         }                                                               \
       else                                                              \
         {                                                               \
@@ -56,20 +64,22 @@ typedef struct YYLTYPE {
             YYRHSLOC (Rhs, 0).last_line;                                \
           (Current).first_column = (Current).last_column =              \
             YYRHSLOC (Rhs, 0).last_column;                              \
-          (Current).filenum      = YYRHSLOC (Rhs, 0).filenum;           \
+          (Current).file         = YYRHSLOC (Rhs, 0).file;              \
         }                                                               \
     while (YYID (0))
 
 
 
 extern void yyerror(char const *);
+extern void yyerrorf(char const *, ...) __attribute__((format(printf, 1, 2)));
 
-extern int srcpos_filenum;
+extern struct dtc_file *srcpos_file;
 
-extern int push_input_file(const char *filename);
-extern int pop_input_file(void);
+struct search_path {
+        const char *dir; /* NULL for current directory */
+        struct search_path *prev, *next;
+};
 
-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);
+extern struct dtc_file *dtc_open_file(const char *fname,
+                                      const struct search_path *search);
+extern void dtc_close_file(struct dtc_file *file);
diff --git a/arch/powerpc/boot/dtc-src/treesource.c b/arch/powerpc/boot/dtc-src/treesource.c
index a6a776797636..ebeb6eb27907 100644
--- a/arch/powerpc/boot/dtc-src/treesource.c
+++ b/arch/powerpc/boot/dtc-src/treesource.c
@@ -23,20 +23,23 @@
 
 extern FILE *yyin;
 extern int yyparse(void);
-extern void yyerror(char const *);
 
 struct boot_info *the_boot_info;
+int treesource_error;
 
 struct boot_info *dt_from_source(const char *fname)
 {
         the_boot_info = NULL;
+        treesource_error = 0;
 
-        push_input_file(fname);
+        srcpos_file = dtc_open_file(fname, NULL);
+        yyin = srcpos_file->file;
 
         if (yyparse() != 0)
-                return NULL;
+                die("Unable to parse input tree\n");
 
-        fill_fullpaths(the_boot_info->dt, "");
+        if (treesource_error)
+                die("Syntax error parsing input tree\n");
 
         return the_boot_info;
 }
@@ -144,7 +147,7 @@ static void write_propval_cells(FILE *f, struct data val)
                         m = m->next;
                 }
 
-                fprintf(f, "0x%x", be32_to_cpu(*cp++));
+                fprintf(f, "0x%x", fdt32_to_cpu(*cp++));
                 if ((void *)cp >= propend)
                         break;
                 fprintf(f, " ");
@@ -173,7 +176,7 @@ static void write_propval_bytes(FILE *f, struct data val)
                 }
 
                 fprintf(f, "%02hhx", *bp++);
-                if ((void *)bp >= propend)
+                if ((const void *)bp >= propend)
                         break;
                 fprintf(f, " ");
         }
diff --git a/arch/powerpc/boot/dtc-src/version_gen.h b/arch/powerpc/boot/dtc-src/version_gen.h
index 6c343031538e..658ff42429d6 100644
--- a/arch/powerpc/boot/dtc-src/version_gen.h
+++ b/arch/powerpc/boot/dtc-src/version_gen.h
@@ -1 +1 @@
-#define DTC_VERSION "DTC 1.0.0-gd6f9b62f"
+#define DTC_VERSION "DTC 1.2.0"
diff --git a/arch/powerpc/boot/dts/arches.dts b/arch/powerpc/boot/dts/arches.dts
new file mode 100644
index 000000000000..d9113b1e8c1d
--- /dev/null
+++ b/arch/powerpc/boot/dts/arches.dts
@@ -0,0 +1,293 @@
+/*
+ * Device Tree Source for AMCC Arches (dual 460GT board)
+ *
+ * (C) Copyright 2008 Applied Micro Circuits Corporation
+ * Victor Gallardo <vgallardo@amcc.com>
+ * Adam Graham <agraham@amcc.com>
+ *
+ * Based on the glacier.dts file
+ *   Stefan Roese <sr@denx.de>
+ *   Copyright 2008 DENX Software Engineering
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+/dts-v1/;
+
+/ {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        model = "amcc,arches";
+        compatible = "amcc,arches";
+        dcr-parent = <&{/cpus/cpu@0}>;
+
+        aliases {
+                ethernet0 = &EMAC0;
+                ethernet1 = &EMAC1;
+                ethernet2 = &EMAC2;
+                serial0 = &UART0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        device_type = "cpu";
+                        model = "PowerPC,460GT";
+                        reg = <0x00000000>;
+                        clock-frequency = <0>; /* Filled in by U-Boot */
+                        timebase-frequency = <0>; /* Filled in by U-Boot */
+                        i-cache-line-size = <32>;
+                        d-cache-line-size = <32>;
+                        i-cache-size = <32768>;
+                        d-cache-size = <32768>;
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by U-Boot */
+        };
+
+        UIC0: interrupt-controller0 {
+                compatible = "ibm,uic-460gt","ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0x0c0 0x009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+
+        UIC1: interrupt-controller1 {
+                compatible = "ibm,uic-460gt","ibm,uic";
+                interrupt-controller;
+                cell-index = <1>;
+                dcr-reg = <0x0d0 0x009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        UIC2: interrupt-controller2 {
+                compatible = "ibm,uic-460gt","ibm,uic";
+                interrupt-controller;
+                cell-index = <2>;
+                dcr-reg = <0x0e0 0x009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <0xa 0x4 0xb 0x4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        UIC3: interrupt-controller3 {
+                compatible = "ibm,uic-460gt","ibm,uic";
+                interrupt-controller;
+                cell-index = <3>;
+                dcr-reg = <0x0f0 0x009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <0x10 0x4 0x11 0x4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+
+        SDR0: sdr {
+                compatible = "ibm,sdr-460gt";
+                dcr-reg = <0x00e 0x002>;
+        };
+
+        CPR0: cpr {
+                compatible = "ibm,cpr-460gt";
+                dcr-reg = <0x00c 0x002>;
+        };
+
+        plb {
+                compatible = "ibm,plb-460gt", "ibm,plb4";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by U-Boot */
+
+                SDRAM0: sdram {
+                        compatible = "ibm,sdram-460gt", "ibm,sdram-405gp";
+                        dcr-reg = <0x010 0x002>;
+                };
+
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-460gt", "ibm,mcmal2";
+                        dcr-reg = <0x180 0x062>;
+                        num-tx-chans = <3>;
+                        num-rx-chans = <24>;
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        interrupt-parent = <&UIC2>;
+                        interrupts = <  /*TXEOB*/ 0x6 0x4
+                                        /*RXEOB*/ 0x7 0x4
+                                        /*SERR*/  0x3 0x4
+                                        /*TXDE*/  0x4 0x4
+                                        /*RXDE*/  0x5 0x4>;
+                        desc-base-addr-high = <0x8>;
+                };
+
+                POB0: opb {
+                        compatible = "ibm,opb-460gt", "ibm,opb";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <0xb0000000 0x00000004 0xb0000000 0x50000000>;
+                        clock-frequency = <0>; /* Filled in by U-Boot */
+
+                        EBC0: ebc {
+                                compatible = "ibm,ebc-460gt", "ibm,ebc";
+                                dcr-reg = <0x012 0x002>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                /* ranges property is supplied by U-Boot */
+                                interrupts = <0x6 0x4>;
+                                interrupt-parent = <&UIC1>;
+                        };
+
+                        UART0: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <0xef600300 0x00000008>;
+                                virtual-reg = <0xef600300>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>; /* Filled in by U-Boot */
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <0x1 0x4>;
+                        };
+
+                        IIC0: i2c@ef600700 {
+                                compatible = "ibm,iic-460gt", "ibm,iic";
+                                reg = <0xef600700 0x00000014>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <0x2 0x4>;
+                        };
+
+                        IIC1: i2c@ef600800 {
+                                compatible = "ibm,iic-460gt", "ibm,iic";
+                                reg = <0xef600800 0x00000014>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <0x3 0x4>;
+                        };
+
+                        TAH0: emac-tah@ef601350 {
+                                compatible = "ibm,tah-460gt", "ibm,tah";
+                                reg = <0xef601350 0x00000030>;
+                        };
+
+                        TAH1: emac-tah@ef601450 {
+                                compatible = "ibm,tah-460gt", "ibm,tah";
+                                reg = <0xef601450 0x00000030>;
+                        };
+
+                        EMAC0: ethernet@ef600e00 {
+                                device_type = "network";
+                                compatible = "ibm,emac-460gt", "ibm,emac4sync";
+                                interrupt-parent = <&EMAC0>;
+                                interrupts = <0x0 0x1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4
+                                                 /*Wake*/   0x1 &UIC2 0x14 0x4>;
+                                reg = <0xef600e00 0x000000c4>;
+                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <0>;
+                                mal-rx-channel = <0>;
+                                cell-index = <0>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
+                                phy-mode = "sgmii";
+                                phy-map = <0xffffffff>;
+                                gpcs-address = <0x0000000a>;
+                                tah-device = <&TAH0>;
+                                tah-channel = <0>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                        };
+
+                        EMAC1: ethernet@ef600f00 {
+                                device_type = "network";
+                                compatible = "ibm,emac-460gt", "ibm,emac4sync";
+                                interrupt-parent = <&EMAC1>;
+                                interrupts = <0x0 0x1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0x0 &UIC2 0x11 0x4
+                                                 /*Wake*/   0x1 &UIC2 0x15 0x4>;
+                                reg = <0xef600f00 0x000000c4>;
+                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <1>;
+                                mal-rx-channel = <8>;
+                                cell-index = <1>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
+                                phy-mode = "sgmii";
+                                phy-map = <0x00000000>;
+                                gpcs-address = <0x0000000b>;
+                                tah-device = <&TAH1>;
+                                tah-channel = <1>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                                mdio-device = <&EMAC0>;
+                        };
+
+                        EMAC2: ethernet@ef601100 {
+                                device_type = "network";
+                                compatible = "ibm,emac-460gt", "ibm,emac4sync";
+                                interrupt-parent = <&EMAC2>;
+                                interrupts = <0x0 0x1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0x0 &UIC2 0x12 0x4
+                                                 /*Wake*/   0x1 &UIC2 0x16 0x4>;
+                                reg = <0xef601100 0x000000c4>;
+                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <2>;
+                                mal-rx-channel = <16>;
+                                cell-index = <2>;
+                                max-frame-size = <9000>;
+                                rx-fifo-size = <4096>;
+                                tx-fifo-size = <2048>;
+                                phy-mode = "sgmii";
+                                phy-map = <0x00000001>;
+                                gpcs-address = <0x0000000C>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                                mdio-device = <&EMAC0>;
+                        };
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/asp834x-redboot.dts b/arch/powerpc/boot/dts/asp834x-redboot.dts
index 8b1bb0e41905..6235fca445de 100644
--- a/arch/powerpc/boot/dts/asp834x-redboot.dts
+++ b/arch/powerpc/boot/dts/asp834x-redboot.dts
@@ -130,24 +130,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8347-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
diff --git a/arch/powerpc/boot/dts/gef_sbc610.dts b/arch/powerpc/boot/dts/gef_sbc610.dts
new file mode 100644
index 000000000000..6ed608322ddc
--- /dev/null
+++ b/arch/powerpc/boot/dts/gef_sbc610.dts
@@ -0,0 +1,293 @@
+/*
+ * GE Fanuc SBC610 Device Tree Source
+ *
+ * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, 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.
+ *
+ * Based on: SBS CM6 Device Tree Source
+ * Copyright 2007 SBS Technologies GmbH & Co. KG
+ * And: mpc8641_hpcn.dts (MPC8641 HPCN Device Tree Source)
+ * Copyright 2006 Freescale Semiconductor Inc.
+ */
+
+/*
+ * Compiled with dtc -I dts -O dtb -o gef_sbc610.dtb gef_sbc610.dts
+ */
+
+/dts-v1/;
+
+/ {
+        model = "GEF_SBC610";
+        compatible = "gef,sbc610";
+        #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,8641@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        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 = <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 = <32>;       // 32 bytes
+                        i-cache-line-size = <32>;       // 32 bytes
+                        d-cache-size = <32768>;         // L1, 32K
+                        i-cache-size = <32768>;         // L1, 32K
+                        timebase-frequency = <0>;       // From uboot
+                        bus-frequency = <0>;            // From uboot
+                        clock-frequency = <0>;          // From uboot
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x0 0x40000000>; // set by uboot
+        };
+
+        localbus@fef05000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8641-localbus", "simple-bus";
+                reg = <0xf8005000 0x1000>;
+                interrupts = <19 2>;
+                interrupt-parent = <&mpic>;
+
+                ranges = <0 0 0xff000000 0x01000000     // 16MB Boot flash
+                          1 0 0xe8000000 0x08000000     // Paged Flash 0
+                          2 0 0xe0000000 0x08000000     // Paged Flash 1
+                          3 0 0xfc100000 0x00020000     // NVRAM
+                          4 0 0xfc000000 0x00008000     // FPGA
+                          5 0 0xfc008000 0x00008000     // AFIX FPGA
+                          6 0 0xfd000000 0x00800000     // IO FPGA (8-bit)
+                          7 0 0xfd800000 0x00800000>;   // IO FPGA (32-bit)
+
+                fpga@4,0 {
+                        compatible = "gef,fpga-regs";
+                        reg = <0x4 0x0 0x40>;
+                };
+                gef_pic: pic@4,4000 {
+                        #interrupt-cells = <1>;
+                        interrupt-controller;
+                        compatible = "gef,fpga-pic";
+                        reg = <0x4 0x4000 0x20>;
+                        interrupts = <0x8
+                                      0x9>;
+                        interrupt-parent = <&mpic>;
+
+                };
+        };
+
+        soc@fef00000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                #interrupt-cells = <2>;
+                device_type = "soc";
+                compatible = "simple-bus";
+                ranges = <0x0 0xfef00000 0x00100000>;
+                reg = <0xfef00000 0x100000>;    // CCSRBAR 1M
+                bus-frequency = <0>;
+
+                i2c1: i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <0x2b 0x2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+
+                        eti@6b {
+                                compatible = "dallas,ds1682";
+                                reg = <0x6b>;
+                        };
+                };
+
+                i2c2: i2c@3100 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3100 0x100>;
+                        interrupts = <0x2b 0x2>;
+                        interrupt-parent = <&mpic>;
+                        dfsrr;
+                };
+
+                dma@21300 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8641-dma", "fsl,eloplus-dma";
+                        reg = <0x21300 0x4>;
+                        ranges = <0x0 0x21100 0x200>;
+                        cell-index = <0>;
+                        dma-channel@0 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                           "fsl,eloplus-dma-channel";
+                                reg = <0x0 0x80>;
+                                cell-index = <0>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <20 2>;
+                        };
+                        dma-channel@80 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                           "fsl,eloplus-dma-channel";
+                                reg = <0x80 0x80>;
+                                cell-index = <1>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <21 2>;
+                        };
+                        dma-channel@100 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                           "fsl,eloplus-dma-channel";
+                                reg = <0x100 0x80>;
+                                cell-index = <2>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <22 2>;
+                        };
+                        dma-channel@180 {
+                                compatible = "fsl,mpc8641-dma-channel",
+                                           "fsl,eloplus-dma-channel";
+                                reg = <0x180 0x80>;
+                                cell-index = <3>;
+                                interrupt-parent = <&mpic>;
+                                interrupts = <23 2>;
+                        };
+                };
+
+                mdio@24520 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+
+                        phy0: ethernet-phy@0 {
+                                interrupt-parent = <&gef_pic>;
+                                interrupts = <0x9 0x4>;
+                                reg = <1>;
+                        };
+                        phy2: ethernet-phy@2 {
+                                interrupt-parent = <&gef_pic>;
+                                interrupts = <0x8 0x4>;
+                                reg = <3>;
+                        };
+                };
+
+                enet0: ethernet@24000 {
+                        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>;
+                        phy-connection-type = "gmii";
+                };
+
+                enet1: ethernet@26000 {
+                        device_type = "network";
+                        model = "eTSEC";
+                        compatible = "gianfar";
+                        reg = <0x26000 0x1000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <0x1f 0x2 0x20 0x2 0x21 0x2>;
+                        interrupt-parent = <&mpic>;
+                        phy-handle = <&phy2>;
+                        phy-connection-type = "gmii";
+                };
+
+                serial0: serial@4500 {
+                        cell-index = <0>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4500 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <0x2a 0x2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                serial1: serial@4600 {
+                        cell-index = <1>;
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0x4600 0x100>;
+                        clock-frequency = <0>;
+                        interrupts = <0x1c 0x2>;
+                        interrupt-parent = <&mpic>;
+                };
+
+                mpic: pic@40000 {
+                        clock-frequency = <0>;
+                        interrupt-controller;
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        reg = <0x40000 0x40000>;
+                        compatible = "chrp,open-pic";
+                        device_type = "open-pic";
+                };
+
+                global-utilities@e0000 {
+                        compatible = "fsl,mpc8641-guts";
+                        reg = <0xe0000 0x1000>;
+                        fsl,has-rstcr;
+                };
+        };
+
+        pci0: pcie@fef08000 {
+                compatible = "fsl,mpc8641-pcie";
+                device_type = "pci";
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                reg = <0xfef08000 0x1000>;
+                bus-range = <0x0 0xff>;
+                ranges = <0x02000000 0x0 0x80000000 0x80000000 0x0 0x40000000
+                          0x01000000 0x0 0x00000000 0xfe000000 0x0 0x00400000>;
+                clock-frequency = <33333333>;
+                interrupt-parent = <&mpic>;
+                interrupts = <0x18 0x2>;
+                interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
+                interrupt-map = <
+                        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
+                >;
+
+                pcie@0 {
+                        reg = <0 0 0 0 0>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        device_type = "pci";
+                        ranges = <0x02000000 0x0 0x80000000
+                                  0x02000000 0x0 0x80000000
+                                  0x0 0x40000000
+
+                                  0x01000000 0x0 0x00000000
+                                  0x01000000 0x0 0x00000000
+                                  0x0 0x00400000>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
index 24cf0dba120c..f3787a27f634 100644
--- a/arch/powerpc/boot/dts/glacier.dts
+++ b/arch/powerpc/boot/dts/glacier.dts
@@ -14,7 +14,7 @@
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,glacier";
-        compatible = "amcc,glacier", "amcc,canyonlands";
+        compatible = "amcc,glacier";
         dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
diff --git a/arch/powerpc/boot/dts/mgcoge.dts b/arch/powerpc/boot/dts/mgcoge.dts
new file mode 100644
index 000000000000..633255a97557
--- /dev/null
+++ b/arch/powerpc/boot/dts/mgcoge.dts
@@ -0,0 +1,174 @@
+/*
+ * Device Tree for the MGCOGE plattform from keymile
+ *
+ * Copyright 2008 DENX Software Engineering GmbH
+ * Heiko Schocher <hs@denx.de>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+/ {
+        model = "MGCOGE";
+        compatible = "keymile,mgcoge";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        aliases {
+                ethernet0 = &eth0;
+                serial0 = &smc2;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,8247@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>; /* Filled in by U-Boot */
+                        clock-frequency = <0>; /* Filled in by U-Boot */
+                        bus-frequency = <0>; /* Filled in by U-Boot */
+                };
+        };
+
+        localbus@f0010100 {
+                compatible = "fsl,mpc8247-localbus",
+                             "fsl,pq2-localbus",
+                             "simple-bus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <0xf0010100 0x40>;
+
+                ranges = <0 0 0xfe000000 0x00400000
+                          5 0 0x50000000 0x20000000
+                        >; /* Filled in by U-Boot */
+
+                flash@0,0 {
+                        compatible = "cfi-flash";
+                        reg = <0 0x0 0x400000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        bank-width = <1>;
+                        device-width = <1>;
+                        partition@0 {
+                                label = "u-boot";
+                                reg = <0 0x40000>;
+                        };
+                        partition@40000 {
+                                label = "env";
+                                reg = <0x40000 0x20000>;
+                        };
+                        partition@60000 {
+                                label = "kernel";
+                                reg = <0x60000 0x220000>;
+                        };
+                        partition@280000 {
+                                label = "dtb";
+                                reg = <0x280000 0x20000>;
+                        };
+                };
+
+                flash@5,0 {
+                        compatible = "cfi-flash";
+                        reg = <5 0x0 0x2000000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        bank-width = <2>;
+                        device-width = <2>;
+                        partition@0 {
+                                label = "ramdisk";
+                                reg = <0 0x7a0000>;
+                        };
+                        partition@7a0000 {
+                                label = "user";
+                                reg = <0x7a0000 0x1860000>;
+                        };
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0 0>; /* Filled in by U-Boot */
+        };
+
+        soc@f0000000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8247-immr", "fsl,pq2-soc", "simple-bus";
+                ranges = <0x00000000 0xf0000000 0x00053000>;
+
+                // Temporary until code stops depending on it.
+                device_type = "soc";
+
+                cpm@119c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        #interrupt-cells = <2>;
+                        compatible = "fsl,mpc8247-cpm", "fsl,cpm2",
+                                        "simple-bus";
+                        reg = <0x119c0 0x30>;
+                        ranges;
+
+                        muram {
+                                compatible = "fsl,cpm-muram";
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0 0x10000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0x80 0x1f80 0x9800 0x800>;
+                                };
+                        };
+
+                        brg@119f0 {
+                                compatible = "fsl,mpc8247-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <0x119f0 0x10 0x115f0 0x10>;
+                        };
+
+                        /* Monitor port/SMC2 */
+                        smc2: serial@11a90 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc8247-smc-uart",
+                                             "fsl,cpm2-smc-uart";
+                                reg = <0x11a90 0x20 0x88fc 0x02>;
+                                interrupts = <5 8>;
+                                interrupt-parent = <&PIC>;
+                                fsl,cpm-brg = <2>;
+                                fsl,cpm-command = <0x21200000>;
+                                current-speed = <0>; /* Filled in by U-Boot */
+                        };
+
+                        eth0: ethernet@11a60 {
+                                device_type = "network";
+                                compatible = "fsl,mpc8247-scc-enet",
+                                             "fsl,cpm2-scc-enet";
+                                reg = <0x11a60 0x20 0x8300 0x100 0x11390 1>;
+                                local-mac-address = [ 00 00 00 00 00 00 ]; /* Filled in by U-Boot */
+                                interrupts = <43 8>;
+                                interrupt-parent = <&PIC>;
+                                linux,network-index = <0>;
+                                fsl,cpm-command = <0xce00000>;
+                                fixed-link = <0 0 10 0 0>;
+                        };
+
+                };
+
+                PIC: interrupt-controller@10c00 {
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        reg = <0x10c00 0x80>;
+                        compatible = "fsl,mpc8247-pic", "fsl,pq2-pic";
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/mgsuvd.dts b/arch/powerpc/boot/dts/mgsuvd.dts
new file mode 100644
index 000000000000..e4fc53ab42bd
--- /dev/null
+++ b/arch/powerpc/boot/dts/mgsuvd.dts
@@ -0,0 +1,163 @@
+/*
+ * MGSUVD Device Tree Source
+ *
+ * Copyright 2008 DENX Software Engineering GmbH
+ * Heiko Schocher <hs@denx.de>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/dts-v1/;
+/ {
+        model = "MGSUVD";
+        compatible = "keymile,mgsuvd";
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,852@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>;       /* Filled in by u-boot */
+                        bus-frequency = <0>;            /* Filled in by u-boot */
+                        clock-frequency = <0>;          /* Filled in by u-boot */
+                        interrupts = <15 2>;            /* decrementer interrupt */
+                        interrupt-parent = <&PIC>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <00000000 0x4000000>;  /* Filled in by u-boot */
+        };
+
+        localbus@fff00100 {
+                compatible = "fsl,mpc852-localbus", "fsl,pq1-localbus", "simple-bus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                reg = <0xfff00100 0x40>;
+
+                ranges = <0 0 0xf0000000 0x01000000>;  /* Filled in by u-boot */
+
+                flash@0,0 {
+                        compatible = "cfi-flash";
+                        reg = <0 0 0x1000000>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        bank-width = <1>;
+                        device-width = <1>;
+                        partition@0 {
+                                label = "u-boot";
+                                reg = <0 0x80000>;
+                        };
+                        partition@80000 {
+                                label = "env";
+                                reg = <0x80000 0x20000>;
+                        };
+                        partition@a0000 {
+                                label = "kernel";
+                                reg = <0xa0000 0x1e0000>;
+                        };
+                        partition@280000 {
+                                label = "dtb";
+                                reg = <0x280000 0x20000>;
+                        };
+                        partition@2a0000 {
+                                label = "root";
+                                reg = <0x2a0000 0x500000>;
+                        };
+                        partition@7a0000 {
+                                label = "user";
+                                reg = <0x7a0000 0x860000>;
+                        };
+                };
+        };
+
+        soc@fff00000 {
+                compatible = "fsl,mpc852", "fsl,pq1-soc", "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0 0xfff00000 0x00004000>;
+
+                PIC: interrupt-controller@0 {
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+                        reg = <0 24>;
+                        compatible = "fsl,mpc852-pic", "fsl,pq1-pic";
+                };
+
+                cpm@9c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc852-cpm", "fsl,cpm1", "simple-bus";
+                        interrupts = <0>;       /* cpm error interrupt */
+                        interrupt-parent = <&CPM_PIC>;
+                        reg = <0x9c0 10>;
+                        ranges;
+
+                        muram@2000 {
+                                compatible = "fsl,cpm-muram";
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0 0x2000 0x2000>;
+
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0x800 0x1800>;
+                                };
+                        };
+
+                        brg@9f0 {
+                                compatible = "fsl,mpc852-brg",
+                                             "fsl,cpm1-brg",
+                                             "fsl,cpm-brg";
+                                reg = <0x9f0 0x10>;
+                                clock-frequency = <0>; /* Filled in by u-boot */
+                        };
+
+                        CPM_PIC: interrupt-controller@930 {
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                                interrupts = <5 2 0 2>;
+                                interrupt-parent = <&PIC>;
+                                reg = <0x930 0x20>;
+                                compatible = "fsl,cpm1-pic";
+                        };
+
+                        /* MON-1 */
+                        serial@a80 {
+                                device_type = "serial";
+                                compatible = "fsl,cpm1-smc-uart";
+                                reg = <0xa80 0x10 0x3fc0 0x40>;
+                                interrupts = <4>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-brg = <1>;
+                                fsl,cpm-command = <0x0090>;
+                                current-speed = <0>; /* Filled in by u-boot */
+                        };
+
+                        ethernet@a40 {
+                                device_type = "network";
+                                compatible  = "fsl,mpc866-scc-enet",
+                                              "fsl,cpm1-scc-enet";
+                                reg = <0xa40 0x18 0x3e00 0x100>;
+                                local-mac-address = [ 00 00 00 00 00 00 ];  /* Filled in by u-boot */
+                                interrupts = <28>;
+                                interrupt-parent = <&CPM_PIC>;
+                                fsl,cpm-command = <0x80>;
+                                fixed-link = <0 0 10 0 0>;
+                        };
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
index 1f9036c317b4..c2b8dbfab79e 100644
--- a/arch/powerpc/boot/dts/mpc5121ads.dts
+++ b/arch/powerpc/boot/dts/mpc5121ads.dts
@@ -403,7 +403,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0x80008500 0x100>;
+                reg = <0x80008500 0x100         /* internal registers */
+                       0x80008300 0x8>;         /* config space access registers */
                 compatible = "fsl,mpc5121-pci";
                 device_type = "pci";
         };
diff --git a/arch/powerpc/boot/dts/mpc8313erdb.dts b/arch/powerpc/boot/dts/mpc8313erdb.dts
index 2a94ae0dc8b8..747f27676332 100644
--- a/arch/powerpc/boot/dts/mpc8313erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8313erdb.dts
@@ -176,24 +176,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8313-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -359,7 +363,8 @@
                         #interrupt-cells = <1>;
                         #size-cells = <2>;
                         #address-cells = <3>;
-                        reg = <0xe0008500 0x100>;
+                        reg = <0xe0008500 0x100         /* internal registers */
+                               0xe0008300 0x8>;         /* config space access registers */
                         compatible = "fsl,mpc8349-pci";
                         device_type = "pci";
                 };
diff --git a/arch/powerpc/boot/dts/mpc8315erdb.dts b/arch/powerpc/boot/dts/mpc8315erdb.dts
index f704513fb930..7449e54c1a90 100644
--- a/arch/powerpc/boot/dts/mpc8315erdb.dts
+++ b/arch/powerpc/boot/dts/mpc8315erdb.dts
@@ -144,24 +144,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8315-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -314,7 +318,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 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 fbc930410ff6..e4cc1768f241 100644
--- a/arch/powerpc/boot/dts/mpc832x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc832x_mds.dts
@@ -127,24 +127,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -419,7 +423,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 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 b157d1885a28..226ff066652b 100644
--- a/arch/powerpc/boot/dts/mpc832x_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc832x_rdb.dts
@@ -105,24 +105,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8323-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -327,7 +331,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
diff --git a/arch/powerpc/boot/dts/mpc8349emitx.dts b/arch/powerpc/boot/dts/mpc8349emitx.dts
index 700e076ef3f5..5cedf373a1d8 100644
--- a/arch/powerpc/boot/dts/mpc8349emitx.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitx.dts
@@ -106,24 +106,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -250,7 +254,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
@@ -276,7 +281,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008600 0x100>;
+                reg = <0xe0008600 0x100         /* internal registers */
+                       0xe0008380 0x8>;         /* config space access registers */
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
diff --git a/arch/powerpc/boot/dts/mpc8349emitxgp.dts b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
index cdd3063258ea..81ae1d3e9440 100644
--- a/arch/powerpc/boot/dts/mpc8349emitxgp.dts
+++ b/arch/powerpc/boot/dts/mpc8349emitxgp.dts
@@ -104,24 +104,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -224,7 +228,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008600 0x100>;
+                reg = <0xe0008600 0x100         /* internal registers */
+                       0xe0008380 0x8>;         /* config space access registers */
                 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 783241c00240..04bfde3ea605 100644
--- a/arch/powerpc/boot/dts/mpc834x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc834x_mds.dts
@@ -116,24 +116,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -311,7 +315,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
@@ -372,7 +377,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008600 0x100>;
+                reg = <0xe0008600 0x100         /* internal registers */
+                       0xe0008380 0x8>;         /* config space access registers */
                 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 a3b76a709951..66a12d2631fb 100644
--- a/arch/powerpc/boot/dts/mpc836x_mds.dts
+++ b/arch/powerpc/boot/dts/mpc836x_mds.dts
@@ -52,9 +52,26 @@
                 reg = <0x00000000 0x10000000>;
         };
 
-        bcsr@f8000000 {
-                device_type = "board-control";
-                reg = <0xf8000000 0x8000>;
+        localbus@e0005000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8360-localbus", "fsl,pq2pro-localbus",
+                             "simple-bus";
+                reg = <0xe0005000 0xd8>;
+                ranges = <0 0 0xfe000000 0x02000000
+                          1 0 0xf8000000 0x00008000>;
+
+                flash@0,0 {
+                        compatible = "cfi-flash";
+                        reg = <0 0 0x2000000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+                };
+
+                bcsr@1,0 {
+                        device_type = "board-control";
+                        reg = <1 0 0x8000>;
+                };
         };
 
         soc8360@e0000000 {
@@ -131,24 +148,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -405,7 +426,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
diff --git a/arch/powerpc/boot/dts/mpc836x_rdk.dts b/arch/powerpc/boot/dts/mpc836x_rdk.dts
index 89c9202f8bd7..decadf3d9e98 100644
--- a/arch/powerpc/boot/dts/mpc836x_rdk.dts
+++ b/arch/powerpc/boot/dts/mpc836x_rdk.dts
@@ -125,24 +125,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8360-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -383,6 +387,18 @@
                         device-width = <1>;
                 };
 
+                upm@1,0 {
+                        compatible = "fsl,upm-nand";
+                        reg = <1 0 1>;
+                        fsl,upm-addr-offset = <16>;
+                        fsl,upm-cmd-offset = <8>;
+                        gpios = <&qe_pio_e 18 0>;
+
+                        flash {
+                                compatible = "stm,nand512-a";
+                        };
+                };
+
                 display@2,0 {
                         device_type = "display";
                         compatible = "fujitsu,MB86277", "fujitsu,mint";
@@ -405,7 +421,8 @@
                 #interrupt-cells = <1>;
                 device_type = "pci";
                 compatible = "fsl,mpc8360-pci", "fsl,mpc8349-pci";
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 ranges = <0x02000000 0 0x90000000 0x90000000 0 0x10000000
                           0x42000000 0 0x80000000 0x80000000 0 0x10000000
                           0x01000000 0 0xe0300000 0xe0300000 0 0x00100000>;
diff --git a/arch/powerpc/boot/dts/mpc8377_mds.dts b/arch/powerpc/boot/dts/mpc8377_mds.dts
index 432782b6d20a..0484561bd2c0 100644
--- a/arch/powerpc/boot/dts/mpc8377_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8377_mds.dts
@@ -136,6 +136,13 @@
                         interrupts = <14 0x8>;
                         interrupt-parent = <&ipic>;
                         dfsrr;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1374";
+                                reg = <0x68>;
+                                interrupts = <19 0x8>;
+                                interrupt-parent = <&ipic>;
+                        };
                 };
 
                 i2c@3100 {
@@ -246,24 +253,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <0x47 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <0x47 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <0x47 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <0x47 8>;
                         };
@@ -374,7 +385,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 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
index ed137aa83d5f..53191ba67aaa 100644
--- a/arch/powerpc/boot/dts/mpc8377_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8377_rdb.dts
@@ -155,24 +155,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8377-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -315,7 +319,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 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
index ed32c8ddafe3..67a08d2e2ff2 100644
--- a/arch/powerpc/boot/dts/mpc8378_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8378_mds.dts
@@ -136,6 +136,13 @@
                         interrupts = <14 0x8>;
                         interrupt-parent = <&ipic>;
                         dfsrr;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1374";
+                                reg = <0x68>;
+                                interrupts = <19 0x8>;
+                                interrupt-parent = <&ipic>;
+                        };
                 };
 
                 i2c@3100 {
@@ -170,24 +177,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -360,7 +371,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 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
index 34a7f2f935e1..4a09153d160c 100644
--- a/arch/powerpc/boot/dts/mpc8378_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8378_rdb.dts
@@ -155,24 +155,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8378-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -301,7 +305,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 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
index f4db9ed4a301..323370a2b5ff 100644
--- a/arch/powerpc/boot/dts/mpc8379_mds.dts
+++ b/arch/powerpc/boot/dts/mpc8379_mds.dts
@@ -136,6 +136,13 @@
                         interrupts = <14 0x8>;
                         interrupt-parent = <&ipic>;
                         dfsrr;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1374";
+                                reg = <0x68>;
+                                interrupts = <19 0x8>;
+                                interrupt-parent = <&ipic>;
+                        };
                 };
 
                 i2c@3100 {
@@ -170,24 +177,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -388,7 +399,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 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
index e4d7030d50e5..bbd884ac9dc0 100644
--- a/arch/powerpc/boot/dts/mpc8379_rdb.dts
+++ b/arch/powerpc/boot/dts/mpc8379_rdb.dts
@@ -155,24 +155,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8379-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -329,7 +333,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
diff --git a/arch/powerpc/boot/dts/mpc8536ds.dts b/arch/powerpc/boot/dts/mpc8536ds.dts
index 1505d6855eff..93fdd99901b6 100644
--- a/arch/powerpc/boot/dts/mpc8536ds.dts
+++ b/arch/powerpc/boot/dts/mpc8536ds.dts
@@ -91,6 +91,8 @@
                         rtc@68 {
                                 compatible = "dallas,ds3232";
                                 reg = <0x68>;
+                                interrupts = <0 0x1>;
+                                interrupt-parent = <&mpic>;
                         };
                 };
 
diff --git a/arch/powerpc/boot/dts/mpc8610_hpcd.dts b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
index 584a4f184eb2..f724d72c7b92 100644
--- a/arch/powerpc/boot/dts/mpc8610_hpcd.dts
+++ b/arch/powerpc/boot/dts/mpc8610_hpcd.dts
@@ -207,7 +207,7 @@
                         reg = <0xe4000 0x100>;
                 };
 
-                i2s@16000 {
+                ssi@16000 {
                         compatible = "fsl,mpc8610-ssi";
                         cell-index = <0>;
                         reg = <0x16000 0x100>;
@@ -215,6 +215,8 @@
                         interrupts = <62 2>;
                         fsl,mode = "i2s-slave";
                         codec-handle = <&cs4270>;
+                        fsl,playback-dma = <&dma00>;
+                        fsl,capture-dma = <&dma01>;
                 };
 
                 ssi@16100 {
@@ -233,17 +235,17 @@
                         reg = <0x21300 0x4>; /* DMA general status register */
                         ranges = <0x0 0x21100 0x200>;
 
-                        dma-channel@0 {
+                        dma00: dma-channel@0 {
                                 compatible = "fsl,mpc8610-dma-channel",
-                                        "fsl,eloplus-dma-channel";
+                                        "fsl,ssi-dma-channel";
                                 cell-index = <0>;
                                 reg = <0x0 0x80>;
                                 interrupt-parent = <&mpic>;
                                 interrupts = <20 2>;
                         };
-                        dma-channel@1 {
+                        dma01: dma-channel@1 {
                                 compatible = "fsl,mpc8610-dma-channel",
-                                        "fsl,eloplus-dma-channel";
+                                        "fsl,ssi-dma-channel";
                                 cell-index = <1>;
                                 reg = <0x80 0x80>;
                                 interrupt-parent = <&mpic>;
diff --git a/arch/powerpc/boot/dts/sbc8349.dts b/arch/powerpc/boot/dts/sbc8349.dts
index 45f789b56709..0f941f310e44 100644
--- a/arch/powerpc/boot/dts/sbc8349.dts
+++ b/arch/powerpc/boot/dts/sbc8349.dts
@@ -107,24 +107,28 @@
                         dma-channel@0 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0 0x80>;
+                                cell-index = <0>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@80 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x80 0x80>;
+                                cell-index = <1>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@100 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x100 0x80>;
+                                cell-index = <2>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
                         dma-channel@180 {
                                 compatible = "fsl,mpc8349-dma-channel", "fsl,elo-dma-channel";
                                 reg = <0x180 0x28>;
+                                cell-index = <3>;
                                 interrupt-parent = <&ipic>;
                                 interrupts = <71 8>;
                         };
@@ -268,7 +272,8 @@
                 #interrupt-cells = <1>;
                 #size-cells = <2>;
                 #address-cells = <3>;
-                reg = <0xe0008500 0x100>;
+                reg = <0xe0008500 0x100         /* internal registers */
+                       0xe0008300 0x8>;         /* config space access registers */
                 compatible = "fsl,mpc8349-pci";
                 device_type = "pci";
         };
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 72d15f075d34..3b295e8df53f 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -246,13 +246,22 @@
                         };
 
                         IIC0: i2c@ef600700 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
                                 compatible = "ibm,iic-440epx", "ibm,iic";
                                 reg = <0xef600700 0x00000014>;
                                 interrupt-parent = <&UIC0>;
                                 interrupts = <0x2 0x4>;
+
+                                hwmon@48 {
+                                        compatible = "adi,ad7414";
+                                        reg = <0x48>;
+                                };
                         };
 
                         IIC1: i2c@ef600800 {
+                                #address-cells = <1>;
+                                #size-cells = <0>;
                                 compatible = "ibm,iic-440epx", "ibm,iic";
                                 reg = <0xef600800 0x00000014>;
                                 interrupt-parent = <&UIC0>;
diff --git a/arch/powerpc/boot/dts/yosemite.dts b/arch/powerpc/boot/dts/yosemite.dts
index e39422aa0d85..1fa3cb4c4ebb 100644
--- a/arch/powerpc/boot/dts/yosemite.dts
+++ b/arch/powerpc/boot/dts/yosemite.dts
@@ -15,7 +15,7 @@
         #address-cells = <2>;
         #size-cells = <1>;
         model = "amcc,yosemite";
-        compatible = "amcc,yosemite","amcc,bamboo";
+        compatible = "amcc,yosemite";
         dcr-parent = <&{/cpus/cpu@0}>;
 
         aliases {
diff --git a/arch/powerpc/boot/elf_util.c b/arch/powerpc/boot/elf_util.c
index 7454aa4cc20c..1567a0c0f05c 100644
--- a/arch/powerpc/boot/elf_util.c
+++ b/arch/powerpc/boot/elf_util.c
@@ -27,7 +27,8 @@ int parse_elf64(void *hdr, struct elf_info *info)
               elf64->e_ident[EI_MAG3]  == ELFMAG3       &&
               elf64->e_ident[EI_CLASS] == ELFCLASS64    &&
               elf64->e_ident[EI_DATA]  == ELFDATA2MSB   &&
-              elf64->e_type            == ET_EXEC       &&
+              (elf64->e_type            == ET_EXEC ||
+               elf64->e_type            == ET_DYN)      &&
               elf64->e_machine         == EM_PPC64))
                 return 0;
 
@@ -58,7 +59,8 @@ int parse_elf32(void *hdr, struct elf_info *info)
               elf32->e_ident[EI_MAG3]  == ELFMAG3       &&
               elf32->e_ident[EI_CLASS] == ELFCLASS32    &&
               elf32->e_ident[EI_DATA]  == ELFDATA2MSB   &&
-              elf32->e_type            == ET_EXEC       &&
+              (elf32->e_type            == ET_EXEC ||
+               elf32->e_type            == ET_DYN)      &&
               elf32->e_machine         == EM_PPC))
                 return 0;
 
diff --git a/arch/powerpc/boot/libfdt/Makefile.libfdt b/arch/powerpc/boot/libfdt/Makefile.libfdt
index 82f9c6a8287b..6c42acfa21ec 100644
--- a/arch/powerpc/boot/libfdt/Makefile.libfdt
+++ b/arch/powerpc/boot/libfdt/Makefile.libfdt
@@ -3,12 +3,6 @@
 # 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_SRCS = fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
 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
index 586a36136db2..2acaec5923ae 100644
--- a/arch/powerpc/boot/libfdt/fdt.c
+++ b/arch/powerpc/boot/libfdt/fdt.c
@@ -63,7 +63,7 @@ int fdt_check_header(const void *fdt)
                         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) {
+        } else if (fdt_magic(fdt) == FDT_SW_MAGIC) {
                 /* Unfinished sequential-write blob */
                 if (fdt_size_dt_struct(fdt) == 0)
                         return -FDT_ERR_BADSTATE;
@@ -76,7 +76,7 @@ int fdt_check_header(const void *fdt)
 
 const void *fdt_offset_ptr(const void *fdt, int offset, int len)
 {
-        const void *p;
+        const char *p;
 
         if (fdt_version(fdt) >= 0x11)
                 if (((offset + len) < offset)
@@ -124,11 +124,59 @@ uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset)
         }
 
         if (nextoffset)
-                *nextoffset = ALIGN(offset, FDT_TAGSIZE);
+                *nextoffset = FDT_TAGALIGN(offset);
 
         return tag;
 }
 
+int _fdt_check_node_offset(const void *fdt, int offset)
+{
+        if ((offset < 0) || (offset % FDT_TAGSIZE)
+            || (fdt_next_tag(fdt, offset, &offset) != FDT_BEGIN_NODE))
+                return -FDT_ERR_BADOFFSET;
+
+        return offset;
+}
+
+int fdt_next_node(const void *fdt, int offset, int *depth)
+{
+        int nextoffset = 0;
+        uint32_t tag;
+
+        if (offset >= 0)
+                if ((nextoffset = _fdt_check_node_offset(fdt, offset)) < 0)
+                        return nextoffset;
+
+        do {
+                offset = nextoffset;
+                tag = fdt_next_tag(fdt, offset, &nextoffset);
+
+                switch (tag) {
+                case FDT_PROP:
+                case FDT_NOP:
+                        break;
+
+                case FDT_BEGIN_NODE:
+                        if (depth)
+                                (*depth)++;
+                        break;
+
+                case FDT_END_NODE:
+                        if (depth)
+                                (*depth)--;
+                        break;
+
+                case FDT_END:
+                        return -FDT_ERR_NOTFOUND;
+
+                default:
+                        return -FDT_ERR_BADSTRUCTURE;
+                }
+        } while (tag != FDT_BEGIN_NODE);
+
+        return offset;
+}
+
 const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)
 {
         int len = strlen(s) + 1;
@@ -136,17 +184,14 @@ const char *_fdt_find_string(const char *strtab, int tabsize, const char *s)
         const char *p;
 
         for (p = strtab; p <= last; p++)
-                if (memeq(p, s, len))
+                if (memcmp(p, s, len) == 0)
                         return p;
         return NULL;
 }
 
 int fdt_move(const void *fdt, void *buf, int bufsize)
 {
-        int err = fdt_check_header(fdt);
-
-        if (err)
-                return err;
+        FDT_CHECK_HEADER(fdt);
 
         if (fdt_totalsize(fdt) > bufsize)
                 return -FDT_ERR_NOSPACE;
diff --git a/arch/powerpc/boot/libfdt/fdt_ro.c b/arch/powerpc/boot/libfdt/fdt_ro.c
index 12a37d59f96e..129b532bcc1a 100644
--- a/arch/powerpc/boot/libfdt/fdt_ro.c
+++ b/arch/powerpc/boot/libfdt/fdt_ro.c
@@ -55,17 +55,10 @@
 
 #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)
+static int _fdt_nodename_eq(const void *fdt, int offset,
+                            const char *s, int len)
 {
-        const char *p = fdt_offset_ptr(fdt, offset, len+1);
+        const char *p = fdt_offset_ptr(fdt, offset + FDT_TAGSIZE, len+1);
 
         if (! p)
                 /* short match */
@@ -84,12 +77,12 @@ static int nodename_eq(const void *fdt, int offset,
 
 const char *fdt_string(const void *fdt, int stroffset)
 {
-        return (char *)fdt + fdt_off_dt_strings(fdt) + stroffset;
+        return (const 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);
+        FDT_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;
@@ -104,50 +97,24 @@ int fdt_num_mem_rsv(const void *fdt)
         return i;
 }
 
-int fdt_subnode_offset_namelen(const void *fdt, int parentoffset,
+int fdt_subnode_offset_namelen(const void *fdt, int offset,
                                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;
+        int depth;
 
-                case FDT_PROP:
-                case FDT_NOP:
-                        break;
+        FDT_CHECK_HEADER(fdt);
 
-                default:
-                        return -FDT_ERR_BADSTRUCTURE;
-                }
-        } while (level >= 0);
+        for (depth = 0;
+             offset >= 0;
+             offset = fdt_next_node(fdt, offset, &depth)) {
+                if (depth < 0)
+                        return -FDT_ERR_NOTFOUND;
+                else if ((depth == 1)
+                         && _fdt_nodename_eq(fdt, offset, name, namelen))
+                        return offset;
+        }
 
-        return -FDT_ERR_NOTFOUND;
+        return offset; /* error */
 }
 
 int fdt_subnode_offset(const void *fdt, int parentoffset,
@@ -162,7 +129,7 @@ int fdt_path_offset(const void *fdt, const char *path)
         const char *p = path;
         int offset = 0;
 
-        CHECK_HEADER(fdt);
+        FDT_CHECK_HEADER(fdt);
 
         if (*path != '/')
                 return -FDT_ERR_BADPATH;
@@ -190,16 +157,12 @@ int fdt_path_offset(const void *fdt, const char *path)
 
 const char *fdt_get_name(const void *fdt, int nodeoffset, int *len)
 {
-        const struct fdt_node_header *nh;
+        const struct fdt_node_header *nh = _fdt_offset_ptr(fdt, nodeoffset);
         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 (((err = fdt_check_header(fdt)) != 0)
+            || ((err = _fdt_check_node_offset(fdt, nodeoffset)) < 0))
+                        goto fail;
 
         if (len)
                 *len = strlen(nh->name);
@@ -222,17 +185,11 @@ const struct fdt_property *fdt_get_property(const void *fdt,
         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;
+        if (((err = fdt_check_header(fdt)) != 0)
+            || ((err = _fdt_check_node_offset(fdt, nodeoffset)) < 0))
+                        goto fail;
 
+        nextoffset = err;
         do {
                 offset = nextoffset;
 
@@ -253,7 +210,7 @@ const struct fdt_property *fdt_get_property(const void *fdt,
                         if (! prop)
                                 goto fail;
                         namestroff = fdt32_to_cpu(prop->nameoff);
-                        if (streq(fdt_string(fdt, namestroff), name)) {
+                        if (strcmp(fdt_string(fdt, namestroff), name) == 0) {
                                 /* Found it! */
                                 int len = fdt32_to_cpu(prop->len);
                                 prop = fdt_offset_ptr(fdt, offset,
@@ -307,115 +264,91 @@ uint32_t fdt_get_phandle(const void *fdt, int nodeoffset)
 
 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;
+        int pdepth = 0, p = 0;
+        int offset, depth, namelen;
         const char *name;
 
-        CHECK_HEADER(fdt);
-
-        tag = fdt_next_tag(fdt, 0, &nextoffset);
-        if (tag != FDT_BEGIN_NODE)
-                return -FDT_ERR_BADSTRUCTURE;
+        FDT_CHECK_HEADER(fdt);
 
         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;
+        for (offset = 0, depth = 0;
+             (offset >= 0) && (offset <= nodeoffset);
+             offset = fdt_next_node(fdt, offset, &depth)) {
+                if (pdepth < depth)
+                        continue; /* overflowed buffer */
 
-                case FDT_BEGIN_NODE:
-                        name = fdt_get_name(fdt, offset, &namelen);
-                        if (!name)
-                                return namelen;
-                        if (overflow || ((p + namelen + 1) > buflen)) {
-                                overflow++;
-                                break;
-                        }
+                while (pdepth > depth) {
+                        do {
+                                p--;
+                        } while (buf[p-1] != '/');
+                        pdepth--;
+                }
+
+                name = fdt_get_name(fdt, offset, &namelen);
+                if (!name)
+                        return namelen;
+                if ((p + namelen + 1) <= buflen) {
                         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;
+                        pdepth++;
+                }
 
-                case FDT_PROP:
-                case FDT_NOP:
-                        break;
+                if (offset == nodeoffset) {
+                        if (pdepth < (depth + 1))
+                                return -FDT_ERR_NOSPACE;
 
-                default:
-                        return -FDT_ERR_BADSTRUCTURE;
+                        if (p > 1) /* special case so that root path is "/", not "" */
+                                p--;
+                        buf[p] = '\0';
+                        return p;
                 }
         }
 
-        if (overflow)
-                return -FDT_ERR_NOSPACE;
+        if ((offset == -FDT_ERR_NOTFOUND) || (offset >= 0))
+                return -FDT_ERR_BADOFFSET;
+        else if (offset == -FDT_ERR_BADOFFSET)
+                return -FDT_ERR_BADSTRUCTURE;
 
-        if (p > 1) /* special case so that root path is "/", not "" */
-                p--;
-        buf[p] = '\0';
-        return p;
+        return offset; /* error from fdt_next_node() */
 }
 
 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 offset, depth;
         int supernodeoffset = -FDT_ERR_INTERNAL;
 
-        CHECK_HEADER(fdt);
+        FDT_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;
+        for (offset = 0, depth = 0;
+             (offset >= 0) && (offset <= nodeoffset);
+             offset = fdt_next_node(fdt, offset, &depth)) {
+                if (depth == supernodedepth)
+                        supernodeoffset = offset;
 
-                case FDT_PROP:
-                case FDT_NOP:
-                        break;
+                if (offset == nodeoffset) {
+                        if (nodedepth)
+                                *nodedepth = depth;
 
-                default:
-                        return -FDT_ERR_BADSTRUCTURE;
+                        if (supernodedepth > depth)
+                                return -FDT_ERR_NOTFOUND;
+                        else
+                                return supernodeoffset;
                 }
-        } while (offset < nodeoffset);
+        }
 
-        if (nodedepth)
-                *nodedepth = level;
+        if ((offset == -FDT_ERR_NOTFOUND) || (offset >= 0))
+                return -FDT_ERR_BADOFFSET;
+        else if (offset == -FDT_ERR_BADOFFSET)
+                return -FDT_ERR_BADSTRUCTURE;
 
-        if (supernodedepth > level)
-                return -FDT_ERR_NOTFOUND;
-        return supernodeoffset;
+        return offset; /* error from fdt_next_node() */
 }
 
 int fdt_node_depth(const void *fdt, int nodeoffset)
@@ -443,51 +376,27 @@ 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;
+        int offset;
         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;
-        }
+        FDT_CHECK_HEADER(fdt);
 
         /* 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);
+        for (offset = fdt_next_node(fdt, startoffset, NULL);
+             offset >= 0;
+             offset = fdt_next_node(fdt, offset, NULL)) {
+                val = fdt_getprop(fdt, offset, propname, &len);
+                if (val && (len == proplen)
+                    && (memcmp(val, propval, len) == 0))
+                        return offset;
+        }
 
-        return -FDT_ERR_NOTFOUND;
+        return offset; /* error from fdt_next_node() */
 }
 
 int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle)
@@ -499,10 +408,10 @@ int fdt_node_offset_by_phandle(const void *fdt, uint32_t phandle)
                                              &phandle, sizeof(phandle));
 }
 
-int _stringlist_contains(const void *strlist, int listlen, const char *str)
+int _stringlist_contains(const char *strlist, int listlen, const char *str)
 {
         int len = strlen(str);
-        const void *p;
+        const char *p;
 
         while (listlen >= len) {
                 if (memcmp(str, strlist, len+1) == 0)
@@ -534,50 +443,24 @@ int fdt_node_check_compatible(const void *fdt, int nodeoffset,
 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);
+        int offset, err;
 
-        if (startoffset >= 0) {
-                tag = fdt_next_tag(fdt, startoffset, &nextoffset);
-                if (tag != FDT_BEGIN_NODE)
-                        return -FDT_ERR_BADOFFSET;
-        } else {
-                nextoffset = 0;
-        }
+        FDT_CHECK_HEADER(fdt);
 
         /* 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);
+        for (offset = fdt_next_node(fdt, startoffset, NULL);
+             offset >= 0;
+             offset = fdt_next_node(fdt, offset, NULL)) {
+                err = fdt_node_check_compatible(fdt, offset, compatible);
+                if ((err < 0) && (err != -FDT_ERR_NOTFOUND))
+                        return err;
+                else if (err == 0)
+                        return offset;
+        }
 
-        return -FDT_ERR_NOTFOUND;
+        return offset; /* error from fdt_next_node() */
 }
diff --git a/arch/powerpc/boot/libfdt/fdt_rw.c b/arch/powerpc/boot/libfdt/fdt_rw.c
index 6673f8ec962a..8e7ec4cb7bcd 100644
--- a/arch/powerpc/boot/libfdt/fdt_rw.c
+++ b/arch/powerpc/boot/libfdt/fdt_rw.c
@@ -55,10 +55,10 @@
 
 #include "libfdt_internal.h"
 
-static int _blocks_misordered(const void *fdt,
+static int _fdt_blocks_misordered(const void *fdt,
                               int mem_rsv_size, int struct_size)
 {
-        return (fdt_off_mem_rsvmap(fdt) < ALIGN(sizeof(struct fdt_header), 8))
+        return (fdt_off_mem_rsvmap(fdt) < 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) <
@@ -67,16 +67,14 @@ static int _blocks_misordered(const void *fdt,
                     (fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt)));
 }
 
-static int rw_check_header(void *fdt)
+static int _fdt_rw_check_header(void *fdt)
 {
-        int err;
+        FDT_CHECK_HEADER(fdt);
 
-        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)))
+        if (_fdt_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);
@@ -84,36 +82,37 @@ static int rw_check_header(void *fdt)
         return 0;
 }
 
-#define RW_CHECK_HEADER(fdt) \
+#define FDT_RW_CHECK_HEADER(fdt) \
         { \
                 int err; \
-                if ((err = rw_check_header(fdt)) != 0) \
+                if ((err = _fdt_rw_check_header(fdt)) != 0) \
                         return err; \
         }
 
-static inline int _blob_data_size(void *fdt)
+static inline int _fdt_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)
+static int _fdt_splice(void *fdt, void *splicepoint, int oldlen, int newlen)
 {
-        void *end = fdt + _blob_data_size(fdt);
+        char *p = splicepoint;
+        char *end = (char *)fdt + _fdt_data_size(fdt);
 
         if (((p + oldlen) < p) || ((p + oldlen) > end))
                 return -FDT_ERR_BADOFFSET;
-        if ((end - oldlen + newlen) > (fdt + fdt_totalsize(fdt)))
+        if ((end - oldlen + newlen) > ((char *)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)
+static int _fdt_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));
+        err = _fdt_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);
@@ -121,13 +120,13 @@ static int _blob_splice_mem_rsv(void *fdt, struct fdt_reserve_entry *p,
         return 0;
 }
 
-static int _blob_splice_struct(void *fdt, void *p,
-                               int oldlen, int newlen)
+static int _fdt_splice_struct(void *fdt, void *p,
+                              int oldlen, int newlen)
 {
         int delta = newlen - oldlen;
         int err;
 
-        if ((err = _blob_splice(fdt, p, oldlen, newlen)))
+        if ((err = _fdt_splice(fdt, p, oldlen, newlen)))
                 return err;
 
         fdt_set_size_dt_struct(fdt, fdt_size_dt_struct(fdt) + delta);
@@ -135,19 +134,20 @@ static int _blob_splice_struct(void *fdt, void *p,
         return 0;
 }
 
-static int _blob_splice_string(void *fdt, int newlen)
+static int _fdt_splice_string(void *fdt, int newlen)
 {
-        void *p = fdt + fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);
+        void *p = (char *)fdt
+                + fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt);
         int err;
 
-        if ((err = _blob_splice(fdt, p, 0, newlen)))
+        if ((err = _fdt_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)
+static int _fdt_find_add_string(void *fdt, const char *s)
 {
         char *strtab = (char *)fdt + fdt_off_dt_strings(fdt);
         const char *p;
@@ -161,7 +161,7 @@ static int _find_add_string(void *fdt, const char *s)
                 return (p - strtab);
 
         new = strtab + fdt_size_dt_strings(fdt);
-        err = _blob_splice_string(fdt, len);
+        err = _fdt_splice_string(fdt, len);
         if (err)
                 return err;
 
@@ -174,11 +174,10 @@ 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;
+        FDT_RW_CHECK_HEADER(fdt);
 
         re = _fdt_mem_rsv_w(fdt, fdt_num_mem_rsv(fdt));
-        err = _blob_splice_mem_rsv(fdt, re, 0, 1);
+        err = _fdt_splice_mem_rsv(fdt, re, 0, 1);
         if (err)
                 return err;
 
@@ -192,19 +191,19 @@ 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;
+        FDT_RW_CHECK_HEADER(fdt);
+
         if (n >= fdt_num_mem_rsv(fdt))
                 return -FDT_ERR_NOTFOUND;
 
-        err = _blob_splice_mem_rsv(fdt, re, 1, 0);
+        err = _fdt_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)
+static int _fdt_resize_property(void *fdt, int nodeoffset, const char *name,
+                                int len, struct fdt_property **prop)
 {
         int oldlen;
         int err;
@@ -213,36 +212,33 @@ static int _resize_property(void *fdt, int nodeoffset, const char *name, int len
         if (! (*prop))
                 return oldlen;
 
-        if ((err = _blob_splice_struct(fdt, (*prop)->data,
-                                       ALIGN(oldlen, FDT_TAGSIZE),
-                                       ALIGN(len, FDT_TAGSIZE))))
+        if ((err = _fdt_splice_struct(fdt, (*prop)->data, FDT_TAGALIGN(oldlen),
+                                      FDT_TAGALIGN(len))))
                 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)
+static int _fdt_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;
+        if ((nextoffset = _fdt_check_node_offset(fdt, nodeoffset)) < 0)
+                return nextoffset;
 
-        namestroff = _find_add_string(fdt, name);
+        namestroff = _fdt_find_add_string(fdt, name);
         if (namestroff < 0)
                 return namestroff;
 
         *prop = _fdt_offset_ptr_w(fdt, nextoffset);
-        proplen = sizeof(**prop) + ALIGN(len, FDT_TAGSIZE);
+        proplen = sizeof(**prop) + FDT_TAGALIGN(len);
 
-        err = _blob_splice_struct(fdt, *prop, 0, proplen);
+        err = _fdt_splice_struct(fdt, *prop, 0, proplen);
         if (err)
                 return err;
 
@@ -252,18 +248,40 @@ static int _add_property(void *fdt, int nodeoffset, const char *name, int len,
         return 0;
 }
 
+int fdt_set_name(void *fdt, int nodeoffset, const char *name)
+{
+        char *namep;
+        int oldlen, newlen;
+        int err;
+
+        FDT_RW_CHECK_HEADER(fdt);
+
+        namep = (char *)(uintptr_t)fdt_get_name(fdt, nodeoffset, &oldlen);
+        if (!namep)
+                return oldlen;
+
+        newlen = strlen(name);
+
+        err = _fdt_splice_struct(fdt, namep, FDT_TAGALIGN(oldlen+1),
+                                 FDT_TAGALIGN(newlen+1));
+        if (err)
+                return err;
+
+        memcpy(namep, name, newlen+1);
+        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;
+        FDT_RW_CHECK_HEADER(fdt);
 
-        err = _resize_property(fdt, nodeoffset, name, len, &prop);
+        err = _fdt_resize_property(fdt, nodeoffset, name, len, &prop);
         if (err == -FDT_ERR_NOTFOUND)
-                err = _add_property(fdt, nodeoffset, name, len, &prop);
+                err = _fdt_add_property(fdt, nodeoffset, name, len, &prop);
         if (err)
                 return err;
 
@@ -276,14 +294,14 @@ int fdt_delprop(void *fdt, int nodeoffset, const char *name)
         struct fdt_property *prop;
         int len, proplen;
 
-        RW_CHECK_HEADER(fdt);
+        FDT_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);
+        proplen = sizeof(*prop) + FDT_TAGALIGN(len);
+        return _fdt_splice_struct(fdt, prop, proplen, 0);
 }
 
 int fdt_add_subnode_namelen(void *fdt, int parentoffset,
@@ -296,7 +314,7 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,
         uint32_t tag;
         uint32_t *endtag;
 
-        RW_CHECK_HEADER(fdt);
+        FDT_RW_CHECK_HEADER(fdt);
 
         offset = fdt_subnode_offset_namelen(fdt, parentoffset, name, namelen);
         if (offset >= 0)
@@ -309,19 +327,19 @@ int fdt_add_subnode_namelen(void *fdt, int parentoffset,
         do {
                 offset = nextoffset;
                 tag = fdt_next_tag(fdt, offset, &nextoffset);
-        } while (tag == FDT_PROP);
+        } while ((tag == FDT_PROP) || (tag == FDT_NOP));
 
         nh = _fdt_offset_ptr_w(fdt, offset);
-        nodelen = sizeof(*nh) + ALIGN(namelen+1, FDT_TAGSIZE) + FDT_TAGSIZE;
+        nodelen = sizeof(*nh) + FDT_TAGALIGN(namelen+1) + FDT_TAGSIZE;
 
-        err = _blob_splice_struct(fdt, nh, 0, nodelen);
+        err = _fdt_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));
+        memset(nh->name, 0, FDT_TAGALIGN(namelen+1));
         memcpy(nh->name, name, namelen);
-        endtag = (uint32_t *)((void *)nh + nodelen - FDT_TAGSIZE);
+        endtag = (uint32_t *)((char *)nh + nodelen - FDT_TAGSIZE);
         *endtag = cpu_to_fdt32(FDT_END_NODE);
 
         return offset;
@@ -336,36 +354,36 @@ int fdt_del_node(void *fdt, int nodeoffset)
 {
         int endoffset;
 
-        RW_CHECK_HEADER(fdt);
+        FDT_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);
+        return _fdt_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)
+static void _fdt_packblocks(const char *old, char *new,
+                            int mem_rsv_size, int struct_size)
 {
         int mem_rsv_off, struct_off, strings_off;
 
-        mem_rsv_off = ALIGN(sizeof(struct fdt_header), 8);
+        mem_rsv_off = FDT_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(new + mem_rsv_off, old + fdt_off_mem_rsvmap(old), mem_rsv_size);
+        fdt_set_off_mem_rsvmap(new, 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(new + struct_off, old + fdt_off_dt_struct(old), struct_size);
+        fdt_set_off_dt_struct(new, struct_off);
+        fdt_set_size_dt_struct(new, 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));
+        memmove(new + strings_off, old + fdt_off_dt_strings(old),
+                fdt_size_dt_strings(old));
+        fdt_set_off_dt_strings(new, strings_off);
+        fdt_set_size_dt_strings(new, fdt_size_dt_strings(old));
 }
 
 int fdt_open_into(const void *fdt, void *buf, int bufsize)
@@ -373,11 +391,11 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
         int err;
         int mem_rsv_size, struct_size;
         int newsize;
-        void *tmp;
+        const char *fdtstart = fdt;
+        const char *fdtend = fdtstart + fdt_totalsize(fdt);
+        char *tmp;
 
-        err = fdt_check_header(fdt);
-        if (err)
-                return err;
+        FDT_CHECK_HEADER(fdt);
 
         mem_rsv_size = (fdt_num_mem_rsv(fdt)+1)
                 * sizeof(struct fdt_reserve_entry);
@@ -390,7 +408,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
                         ;
         }
 
-        if (!_blocks_misordered(fdt, mem_rsv_size, struct_size)) {
+        if (!_fdt_blocks_misordered(fdt, mem_rsv_size, struct_size)) {
                 /* no further work necessary */
                 err = fdt_move(fdt, buf, bufsize);
                 if (err)
@@ -402,22 +420,23 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
         }
 
         /* Need to reorder */
-        newsize = ALIGN(sizeof(struct fdt_header), 8) + mem_rsv_size
+        newsize = FDT_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))
+        /* First attempt to build converted tree at beginning of buffer */
+        tmp = buf;
+        /* But if that overlaps with the old tree... */
+        if (((tmp + newsize) > fdtstart) && (tmp < fdtend)) {
+                /* Try right after the old tree instead */
+                tmp = (char *)(uintptr_t)fdtend;
+                if ((tmp + newsize) > ((char *)buf + bufsize))
                         return -FDT_ERR_NOSPACE;
         }
 
-        _packblocks(fdt, tmp, mem_rsv_size, struct_size);
+        _fdt_packblocks(fdt, tmp, mem_rsv_size, struct_size);
         memmove(buf, tmp, newsize);
 
         fdt_set_magic(buf, FDT_MAGIC);
@@ -432,16 +451,13 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
 int fdt_pack(void *fdt)
 {
         int mem_rsv_size;
-        int err;
 
-        err = rw_check_header(fdt);
-        if (err)
-                return err;
+        FDT_RW_CHECK_HEADER(fdt);
 
         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));
+        _fdt_packblocks(fdt, fdt, mem_rsv_size, fdt_size_dt_struct(fdt));
+        fdt_set_totalsize(fdt, _fdt_data_size(fdt));
 
         return 0;
 }
diff --git a/arch/powerpc/boot/libfdt/fdt_strerror.c b/arch/powerpc/boot/libfdt/fdt_strerror.c
index f9d32ef5360a..e6c3ceee8c58 100644
--- a/arch/powerpc/boot/libfdt/fdt_strerror.c
+++ b/arch/powerpc/boot/libfdt/fdt_strerror.c
@@ -55,29 +55,29 @@
 
 #include "libfdt_internal.h"
 
-struct errtabent {
+struct fdt_errtabent {
         const char *str;
 };
 
-#define ERRTABENT(val) \
+#define FDT_ERRTABENT(val) \
         [(val)] = { .str = #val, }
 
-static struct errtabent errtable[] = {
-        ERRTABENT(FDT_ERR_NOTFOUND),
-        ERRTABENT(FDT_ERR_EXISTS),
-        ERRTABENT(FDT_ERR_NOSPACE),
+static struct fdt_errtabent fdt_errtable[] = {
+        FDT_ERRTABENT(FDT_ERR_NOTFOUND),
+        FDT_ERRTABENT(FDT_ERR_EXISTS),
+        FDT_ERRTABENT(FDT_ERR_NOSPACE),
 
-        ERRTABENT(FDT_ERR_BADOFFSET),
-        ERRTABENT(FDT_ERR_BADPATH),
-        ERRTABENT(FDT_ERR_BADSTATE),
+        FDT_ERRTABENT(FDT_ERR_BADOFFSET),
+        FDT_ERRTABENT(FDT_ERR_BADPATH),
+        FDT_ERRTABENT(FDT_ERR_BADSTATE),
 
-        ERRTABENT(FDT_ERR_TRUNCATED),
-        ERRTABENT(FDT_ERR_BADMAGIC),
-        ERRTABENT(FDT_ERR_BADVERSION),
-        ERRTABENT(FDT_ERR_BADSTRUCTURE),
-        ERRTABENT(FDT_ERR_BADLAYOUT),
+        FDT_ERRTABENT(FDT_ERR_TRUNCATED),
+        FDT_ERRTABENT(FDT_ERR_BADMAGIC),
+        FDT_ERRTABENT(FDT_ERR_BADVERSION),
+        FDT_ERRTABENT(FDT_ERR_BADSTRUCTURE),
+        FDT_ERRTABENT(FDT_ERR_BADLAYOUT),
 };
-#define ERRTABSIZE      (sizeof(errtable) / sizeof(errtable[0]))
+#define FDT_ERRTABSIZE  (sizeof(fdt_errtable) / sizeof(fdt_errtable[0]))
 
 const char *fdt_strerror(int errval)
 {
@@ -85,8 +85,8 @@ const char *fdt_strerror(int errval)
                 return "<valid offset/length>";
         else if (errval == 0)
                 return "<no error>";
-        else if (errval > -ERRTABSIZE) {
-                const char *s = errtable[-errval].str;
+        else if (errval > -FDT_ERRTABSIZE) {
+                const char *s = fdt_errtable[-errval].str;
 
                 if (s)
                         return s;
diff --git a/arch/powerpc/boot/libfdt/fdt_sw.c b/arch/powerpc/boot/libfdt/fdt_sw.c
index dda2de34b2e0..698329e0ccaf 100644
--- a/arch/powerpc/boot/libfdt/fdt_sw.c
+++ b/arch/powerpc/boot/libfdt/fdt_sw.c
@@ -55,14 +55,22 @@
 
 #include "libfdt_internal.h"
 
-static int check_header_sw(void *fdt)
+static int _fdt_sw_check_header(void *fdt)
 {
-        if (fdt_magic(fdt) != SW_MAGIC)
+        if (fdt_magic(fdt) != FDT_SW_MAGIC)
                 return -FDT_ERR_BADMAGIC;
+        /* FIXME: should check more details about the header state */
         return 0;
 }
 
-static void *grab_space(void *fdt, int len)
+#define FDT_SW_CHECK_HEADER(fdt) \
+        { \
+                int err; \
+                if ((err = _fdt_sw_check_header(fdt)) != 0) \
+                        return err; \
+        }
+
+static void *_fdt_grab_space(void *fdt, int len)
 {
         int offset = fdt_size_dt_struct(fdt);
         int spaceleft;
@@ -86,13 +94,13 @@ int fdt_create(void *buf, int bufsize)
 
         memset(buf, 0, bufsize);
 
-        fdt_set_magic(fdt, SW_MAGIC);
+        fdt_set_magic(fdt, 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_mem_rsvmap(fdt, 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);
 
@@ -102,11 +110,10 @@ int fdt_create(void *buf, int bufsize)
 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;
+        FDT_SW_CHECK_HEADER(fdt);
+
         if (fdt_size_dt_struct(fdt))
                 return -FDT_ERR_BADSTATE;
 
@@ -114,7 +121,7 @@ int fdt_add_reservemap_entry(void *fdt, uint64_t addr, uint64_t size)
         if ((offset + sizeof(*re)) > fdt_totalsize(fdt))
                 return -FDT_ERR_NOSPACE;
 
-        re = (struct fdt_reserve_entry *)(fdt + offset);
+        re = (struct fdt_reserve_entry *)((char *)fdt + offset);
         re->address = cpu_to_fdt64(addr);
         re->size = cpu_to_fdt64(size);
 
@@ -131,13 +138,11 @@ int fdt_finish_reservemap(void *fdt)
 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;
+        FDT_SW_CHECK_HEADER(fdt);
 
-        nh = grab_space(fdt, sizeof(*nh) + ALIGN(namelen, FDT_TAGSIZE));
+        nh = _fdt_grab_space(fdt, sizeof(*nh) + FDT_TAGALIGN(namelen));
         if (! nh)
                 return -FDT_ERR_NOSPACE;
 
@@ -149,12 +154,10 @@ int fdt_begin_node(void *fdt, const char *name)
 int fdt_end_node(void *fdt)
 {
         uint32_t *en;
-        int err = check_header_sw(fdt);
 
-        if (err)
-                return err;
+        FDT_SW_CHECK_HEADER(fdt);
 
-        en = grab_space(fdt, FDT_TAGSIZE);
+        en = _fdt_grab_space(fdt, FDT_TAGSIZE);
         if (! en)
                 return -FDT_ERR_NOSPACE;
 
@@ -162,7 +165,7 @@ int fdt_end_node(void *fdt)
         return 0;
 }
 
-static int find_add_string(void *fdt, const char *s)
+static int _fdt_find_add_string(void *fdt, const char *s)
 {
         char *strtab = (char *)fdt + fdt_totalsize(fdt);
         const char *p;
@@ -188,17 +191,15 @@ static int find_add_string(void *fdt, const char *s)
 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;
+        FDT_SW_CHECK_HEADER(fdt);
 
-        nameoff = find_add_string(fdt, name);
+        nameoff = _fdt_find_add_string(fdt, name);
         if (nameoff == 0)
                 return -FDT_ERR_NOSPACE;
 
-        prop = grab_space(fdt, sizeof(*prop) + ALIGN(len, FDT_TAGSIZE));
+        prop = _fdt_grab_space(fdt, sizeof(*prop) + FDT_TAGALIGN(len));
         if (! prop)
                 return -FDT_ERR_NOSPACE;
 
@@ -211,18 +212,16 @@ int fdt_property(void *fdt, const char *name, const void *val, int len)
 
 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;
+        FDT_SW_CHECK_HEADER(fdt);
 
         /* Add terminator */
-        end = grab_space(fdt, sizeof(*end));
+        end = _fdt_grab_space(fdt, sizeof(*end));
         if (! end)
                 return -FDT_ERR_NOSPACE;
         *end = cpu_to_fdt32(FDT_END);
diff --git a/arch/powerpc/boot/libfdt/fdt_wip.c b/arch/powerpc/boot/libfdt/fdt_wip.c
index 88e24b8318f4..a4652c6e787e 100644
--- a/arch/powerpc/boot/libfdt/fdt_wip.c
+++ b/arch/powerpc/boot/libfdt/fdt_wip.c
@@ -72,11 +72,11 @@ int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
         return 0;
 }
 
-static void nop_region(void *start, int len)
+static void _fdt_nop_region(void *start, int len)
 {
         uint32_t *p;
 
-        for (p = start; (void *)p < (start + len); p++)
+        for (p = start; (char *)p < ((char *)start + len); p++)
                 *p = cpu_to_fdt32(FDT_NOP);
 }
 
@@ -89,7 +89,7 @@ int fdt_nop_property(void *fdt, int nodeoffset, const char *name)
         if (! prop)
                 return len;
 
-        nop_region(prop, len + sizeof(*prop));
+        _fdt_nop_region(prop, len + sizeof(*prop));
 
         return 0;
 }
@@ -139,6 +139,7 @@ int fdt_nop_node(void *fdt, int nodeoffset)
         if (endoffset < 0)
                 return endoffset;
 
-        nop_region(fdt_offset_ptr_w(fdt, nodeoffset, 0), endoffset - nodeoffset);
+        _fdt_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
index 6b2fb92ea357..ce80e4fb41b2 100644
--- a/arch/powerpc/boot/libfdt/libfdt.h
+++ b/arch/powerpc/boot/libfdt/libfdt.h
@@ -125,12 +125,18 @@
 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);
+        return (void *)(uintptr_t)fdt_offset_ptr(fdt, offset, checklen);
 }
 
 uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset);
 
 /**********************************************************************/
+/* Traversal functions                                                */
+/**********************************************************************/
+
+int fdt_next_node(const void *fdt, int offset, int *depth);
+
+/**********************************************************************/
 /* General functions                                                  */
 /**********************************************************************/
 
@@ -207,7 +213,7 @@ int fdt_move(const void *fdt, void *buf, int bufsize);
 /**********************************************************************/
 
 /**
- * fdt_string - retreive a string from the strings block of a device tree
+ * fdt_string - retrieve 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)
  *
@@ -221,7 +227,7 @@ int fdt_move(const void *fdt, void *buf, int bufsize);
 const char *fdt_string(const void *fdt, int stroffset);
 
 /**
- * fdt_num_mem_rsv - retreive the number of memory reserve map entries
+ * fdt_num_mem_rsv - retrieve 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
@@ -234,7 +240,7 @@ const char *fdt_string(const void *fdt, int stroffset);
 int fdt_num_mem_rsv(const void *fdt);
 
 /**
- * fdt_get_mem_rsv - retreive one memory reserve map entry
+ * fdt_get_mem_rsv - retrieve one memory reserve map entry
  * @fdt: pointer to the device tree blob
  * @address, @size: pointers to 64-bit variables
  *
@@ -314,7 +320,7 @@ int fdt_subnode_offset(const void *fdt, int parentoffset, const char *name);
 int fdt_path_offset(const void *fdt, const char *path);
 
 /**
- * fdt_get_name - retreive the name of a given node
+ * fdt_get_name - retrieve 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
@@ -346,7 +352,7 @@ const char *fdt_get_name(const void *fdt, int nodeoffset, int *lenp);
  * 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
+ * non-NULL, the length of the property value is also returned, in the
  * integer pointed to by lenp.
  *
  * returns:
@@ -369,8 +375,8 @@ 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);
+        return (struct fdt_property *)(uintptr_t)
+                fdt_get_property(fdt, nodeoffset, name, lenp);
 }
 
 /**
@@ -383,7 +389,7 @@ static inline struct fdt_property *fdt_get_property_w(void *fdt, int nodeoffset,
  * 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
+ * If lenp is non-NULL, the length of the property value is also
  * returned, in the integer pointed to by lenp.
  *
  * returns:
@@ -405,11 +411,11 @@ const void *fdt_getprop(const void *fdt, int nodeoffset,
 static inline void *fdt_getprop_w(void *fdt, int nodeoffset,
                                   const char *name, int *lenp)
 {
-        return (void *)fdt_getprop(fdt, nodeoffset, name, lenp);
+        return (void *)(uintptr_t)fdt_getprop(fdt, nodeoffset, name, lenp);
 }
 
 /**
- * fdt_get_phandle - retreive the phandle of a given node
+ * fdt_get_phandle - retrieve the phandle of a given node
  * @fdt: pointer to the device tree blob
  * @nodeoffset: structure block offset of the node
  *
@@ -417,7 +423,7 @@ static inline void *fdt_getprop_w(void *fdt, int nodeoffset,
  * structure block offset nodeoffset.
  *
  * returns:
- *      the phandle of the node at nodeoffset, on succes (!= 0, != -1)
+ *      the phandle of the node at nodeoffset, on success (!= 0, != -1)
  *      0, if the node has no phandle, or another error occurs
  */
 uint32_t fdt_get_phandle(const void *fdt, int nodeoffset);
@@ -516,7 +522,7 @@ int fdt_node_depth(const void *fdt, int nodeoffset);
  * structure from the start to nodeoffset, *twice*.
  *
  * returns:
- *      stucture block offset of the parent of the node at nodeoffset
+ *      structure 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,
@@ -573,7 +579,7 @@ int fdt_node_offset_by_prop_value(const void *fdt, int startoffset,
  * @fdt: pointer to the device tree blob
  * @phandle: phandle value
  *
- * fdt_node_offset_by_prop_value() returns the offset of the node
+ * fdt_node_offset_by_phandle() 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.
@@ -655,8 +661,65 @@ int fdt_node_offset_by_compatible(const void *fdt, int startoffset,
 /* Write-in-place functions                                           */
 /**********************************************************************/
 
+/**
+ * fdt_setprop_inplace - change a property's value, but not its size
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose property to change
+ * @name: name of the property to change
+ * @val: pointer to data to replace the property value with
+ * @len: length of the property value
+ *
+ * fdt_setprop_inplace() replaces the value of a given property with
+ * the data in val, of length len.  This function cannot change the
+ * size of a property, and so will only work if len is equal to the
+ * current length of the property.
+ *
+ * This function will alter only the bytes in the blob which contain
+ * the given property value, and will not alter or move any other part
+ * of the tree.
+ *
+ * returns:
+ *      0, on success
+ *      -FDT_ERR_NOSPACE, if len is not equal to the property's current length
+ *      -FDT_ERR_NOTFOUND, node does not have the 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
+ */
 int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
                         const void *val, int len);
+
+/**
+ * fdt_setprop_inplace_cell - change the value of a single-cell property
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose property to change
+ * @name: name of the property to change
+ * @val: cell (32-bit integer) value to replace the property with
+ *
+ * fdt_setprop_inplace_cell() replaces the value of a given property
+ * with the 32-bit integer cell value in val, converting val to
+ * big-endian if necessary.  This function cannot change the size of a
+ * property, and so will only work if the property already exists and
+ * has length 4.
+ *
+ * This function will alter only the bytes in the blob which contain
+ * the given property value, and will not alter or move any other part
+ * of the tree.
+ *
+ * returns:
+ *      0, on success
+ *      -FDT_ERR_NOSPACE, if the property's length is not equal to 4
+  *     -FDT_ERR_NOTFOUND, node does not have the 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
+ */
 static inline int fdt_setprop_inplace_cell(void *fdt, int nodeoffset,
                                            const char *name, uint32_t val)
 {
@@ -664,7 +727,54 @@ static inline int fdt_setprop_inplace_cell(void *fdt, int nodeoffset,
         return fdt_setprop_inplace(fdt, nodeoffset, name, &val, sizeof(val));
 }
 
+/**
+ * fdt_nop_property - replace a property with nop tags
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose property to nop
+ * @name: name of the property to nop
+ *
+ * fdt_nop_property() will replace a given property's representation
+ * in the blob with FDT_NOP tags, effectively removing it from the
+ * tree.
+ *
+ * This function will alter only the bytes in the blob which contain
+ * the property, and will not alter or move any other part of the
+ * tree.
+ *
+ * returns:
+ *      0, on success
+ *      -FDT_ERR_NOTFOUND, node does not have the 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
+ */
 int fdt_nop_property(void *fdt, int nodeoffset, const char *name);
+
+/**
+ * fdt_nop_node - replace a node (subtree) with nop tags
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node to nop
+ *
+ * fdt_nop_node() will replace a given node's representation in the
+ * blob, including all its subnodes, if any, with FDT_NOP tags,
+ * effectively removing it from the tree.
+ *
+ * This function will alter only the bytes in the blob which contain
+ * the node and its properties and subnodes, and will not alter or
+ * move any other part of the tree.
+ *
+ * returns:
+ *      0, on success
+ *      -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
+ */
 int fdt_nop_node(void *fdt, int nodeoffset);
 
 /**********************************************************************/
@@ -693,23 +803,268 @@ int fdt_finish(void *fdt);
 int fdt_open_into(const void *fdt, void *buf, int bufsize);
 int fdt_pack(void *fdt);
 
+/**
+ * fdt_add_mem_rsv - add one memory reserve map entry
+ * @fdt: pointer to the device tree blob
+ * @address, @size: 64-bit values (native endian)
+ *
+ * Adds a reserve map entry to the given blob reserving a region at
+ * address address of length size.
+ *
+ * This function will insert data into the reserve map and will
+ * therefore change the indexes of some entries in the table.
+ *
+ * returns:
+ *      0, on success
+ *      -FDT_ERR_NOSPACE, there is insufficient free space in the blob to
+ *              contain the new reservation entry
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE,
+ *      -FDT_ERR_BADLAYOUT,
+ *      -FDT_ERR_TRUNCATED, standard meanings
+ */
 int fdt_add_mem_rsv(void *fdt, uint64_t address, uint64_t size);
+
+/**
+ * fdt_del_mem_rsv - remove a memory reserve map entry
+ * @fdt: pointer to the device tree blob
+ * @n: entry to remove
+ *
+ * fdt_del_mem_rsv() removes the n-th memory reserve map entry from
+ * the blob.
+ *
+ * This function will delete data from the reservation table and will
+ * therefore change the indexes of some entries in the table.
+ *
+ * returns:
+ *      0, on success
+ *      -FDT_ERR_NOTFOUND, there is no entry of the given index (i.e. there
+ *              are less than n+1 reserve map entries)
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE,
+ *      -FDT_ERR_BADLAYOUT,
+ *      -FDT_ERR_TRUNCATED, standard meanings
+ */
 int fdt_del_mem_rsv(void *fdt, int n);
 
+/**
+ * fdt_set_name - change the name of a given node
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: structure block offset of a node
+ * @name: name to give the node
+ *
+ * fdt_set_name() replaces the name (including unit address, if any)
+ * of the given node with the given string.  NOTE: this function can't
+ * efficiently check if the new name is unique amongst the given
+ * node's siblings; results are undefined if this function is invoked
+ * with a name equal to one of the given node's siblings.
+ *
+ * This function may insert or delete data from the blob, and will
+ * therefore change the offsets of some existing nodes.
+ *
+ * returns:
+ *      0, on success
+ *      -FDT_ERR_NOSPACE, there is insufficient free space in the blob
+ *              to contain the new name
+ *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE, standard meanings
+ */
+int fdt_set_name(void *fdt, int nodeoffset, const char *name);
+
+/**
+ * fdt_setprop - create or change a property
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose property to change
+ * @name: name of the property to change
+ * @val: pointer to data to set the property value to
+ * @len: length of the property value
+ *
+ * fdt_setprop() sets the value of the named property in the given
+ * node to the given value and length, creating the property if it
+ * does not already exist.
+ *
+ * This function may insert or delete data from the blob, and will
+ * therefore change the offsets of some existing nodes.
+ *
+ * returns:
+ *      0, on success
+ *      -FDT_ERR_NOSPACE, there is insufficient free space in the blob to
+ *              contain the new property value
+ *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
+ *      -FDT_ERR_BADLAYOUT,
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE,
+ *      -FDT_ERR_BADLAYOUT,
+ *      -FDT_ERR_TRUNCATED, standard meanings
+ */
 int fdt_setprop(void *fdt, int nodeoffset, const char *name,
                 const void *val, int len);
+
+/**
+ * fdt_setprop_cell - set a property to a single cell value
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose property to change
+ * @name: name of the property to change
+ * @val: 32-bit integer value for the property (native endian)
+ *
+ * fdt_setprop_cell() sets the value of the named property in the
+ * given node to the given cell value (converting to big-endian if
+ * necessary), or creates a new property with that value if it does
+ * not already exist.
+ *
+ * This function may insert or delete data from the blob, and will
+ * therefore change the offsets of some existing nodes.
+ *
+ * returns:
+ *      0, on success
+ *      -FDT_ERR_NOSPACE, there is insufficient free space in the blob to
+ *              contain the new property value
+ *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
+ *      -FDT_ERR_BADLAYOUT,
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE,
+ *      -FDT_ERR_BADLAYOUT,
+ *      -FDT_ERR_TRUNCATED, standard meanings
+ */
 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));
 }
+
+/**
+ * fdt_setprop_string - set a property to a string value
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose property to change
+ * @name: name of the property to change
+ * @str: string value for the property
+ *
+ * fdt_setprop_string() sets the value of the named property in the
+ * given node to the given string value (using the length of the
+ * string to determine the new length of the property), or creates a
+ * new property with that value if it does not already exist.
+ *
+ * This function may insert or delete data from the blob, and will
+ * therefore change the offsets of some existing nodes.
+ *
+ * returns:
+ *      0, on success
+ *      -FDT_ERR_NOSPACE, there is insufficient free space in the blob to
+ *              contain the new property value
+ *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
+ *      -FDT_ERR_BADLAYOUT,
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE,
+ *      -FDT_ERR_BADLAYOUT,
+ *      -FDT_ERR_TRUNCATED, standard meanings
+ */
 #define fdt_setprop_string(fdt, nodeoffset, name, str) \
         fdt_setprop((fdt), (nodeoffset), (name), (str), strlen(str)+1)
+
+/**
+ * fdt_delprop - delete a property
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node whose property to nop
+ * @name: name of the property to nop
+ *
+ * fdt_del_property() will delete the given property.
+ *
+ * This function will delete data from the blob, and will therefore
+ * change the offsets of some existing nodes.
+ *
+ * returns:
+ *      0, on success
+ *      -FDT_ERR_NOTFOUND, node does not have the named property
+ *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
+ *      -FDT_ERR_BADLAYOUT,
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE,
+ *      -FDT_ERR_TRUNCATED, standard meanings
+ */
 int fdt_delprop(void *fdt, int nodeoffset, const char *name);
+
+/**
+ * fdt_add_subnode_namelen - creates a new node 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_add_subnode(), but use only the first namelen
+ * characters of name as the name of the new node.  This is useful for
+ * creating subnodes based on a portion of a larger string, such as a
+ * full path.
+ */
 int fdt_add_subnode_namelen(void *fdt, int parentoffset,
                             const char *name, int namelen);
+
+/**
+ * fdt_add_subnode - creates a new node
+ * @fdt: pointer to the device tree blob
+ * @parentoffset: structure block offset of a node
+ * @name: name of the subnode to locate
+ *
+ * fdt_add_subnode() creates a new node as a subnode of the node at
+ * structure block offset parentoffset, with the given name (which
+ * should include the unit address, if any).
+ *
+ * This function will insert data into the blob, and will therefore
+ * change the offsets of some existing nodes.
+
+ * returns:
+ *      structure block offset of the created nodeequested 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_EXISTS, if the node at parentoffset already has a subnode of
+ *              the given name
+ *      -FDT_ERR_NOSPACE, if there is insufficient free space in the
+ *              blob to contain the new node
+ *      -FDT_ERR_NOSPACE
+ *      -FDT_ERR_BADLAYOUT
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE,
+ *      -FDT_ERR_TRUNCATED, standard meanings.
+ */
 int fdt_add_subnode(void *fdt, int parentoffset, const char *name);
+
+/**
+ * fdt_del_node - delete a node (subtree)
+ * @fdt: pointer to the device tree blob
+ * @nodeoffset: offset of the node to nop
+ *
+ * fdt_del_node() will remove the given node, including all its
+ * subnodes if any, from the blob.
+ *
+ * This function will delete data from the blob, and will therefore
+ * change the offsets of some existing nodes.
+ *
+ * returns:
+ *      0, on success
+ *      -FDT_ERR_BADOFFSET, nodeoffset did not point to FDT_BEGIN_NODE tag
+ *      -FDT_ERR_BADLAYOUT,
+ *      -FDT_ERR_BADMAGIC,
+ *      -FDT_ERR_BADVERSION,
+ *      -FDT_ERR_BADSTATE,
+ *      -FDT_ERR_BADSTRUCTURE,
+ *      -FDT_ERR_TRUNCATED, standard meanings
+ */
 int fdt_del_node(void *fdt, int nodeoffset);
 
 /**********************************************************************/
diff --git a/arch/powerpc/boot/libfdt/libfdt_internal.h b/arch/powerpc/boot/libfdt/libfdt_internal.h
index 1e60936beb5b..46eb93e4af5c 100644
--- a/arch/powerpc/boot/libfdt/libfdt_internal.h
+++ b/arch/powerpc/boot/libfdt/libfdt_internal.h
@@ -52,38 +52,44 @@
  */
 #include <fdt.h>
 
-#define ALIGN(x, a)     (((x) + (a) - 1) & ~((a) - 1))
-#define PALIGN(p, a)    ((void *)ALIGN((unsigned long)(p), (a)))
+#define FDT_ALIGN(x, a)         (((x) + (a) - 1) & ~((a) - 1))
+#define FDT_TAGALIGN(x)         (FDT_ALIGN((x), FDT_TAGSIZE))
 
-#define memeq(p, q, n)  (memcmp((p), (q), (n)) == 0)
-#define streq(p, q)     (strcmp((p), (q)) == 0)
+#define FDT_CHECK_HEADER(fdt) \
+        { \
+                int err; \
+                if ((err = fdt_check_header(fdt)) != 0) \
+                        return err; \
+        }
 
 uint32_t _fdt_next_tag(const void *fdt, int startoffset, int *nextoffset);
+int _fdt_check_node_offset(const void *fdt, int offset);
 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;
+        return (const char *)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);
+        return (void *)(uintptr_t)_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);
+                (const struct fdt_reserve_entry *)
+                ((const char *)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);
+        return (void *)(uintptr_t)_fdt_mem_rsv(fdt, n);
 }
 
-#define SW_MAGIC                (~FDT_MAGIC)
+#define FDT_SW_MAGIC            (~FDT_MAGIC)
 
 #endif /* _LIBFDT_INTERNAL_H */
diff --git a/arch/powerpc/boot/libfdt_env.h b/arch/powerpc/boot/libfdt_env.h
index a4b0fc959ece..c89fdb1b80e1 100644
--- a/arch/powerpc/boot/libfdt_env.h
+++ b/arch/powerpc/boot/libfdt_env.h
@@ -6,6 +6,7 @@
 
 typedef u32 uint32_t;
 typedef u64 uint64_t;
+typedef unsigned long uintptr_t;
 
 #define fdt16_to_cpu(x)         (x)
 #define cpu_to_fdt16(x)         (x)
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 965c237c122d..ee0dc41d7c56 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -307,7 +307,9 @@ fi
 # post-processing needed for some platforms
 case "$platform" in
 pseries|chrp)
-    $objbin/addnote "$ofile"
+    ${CROSS}objcopy -O binary -j .fakeelf "$kernel" "$ofile".rpanote
+    $objbin/addnote "$ofile" "$ofile".rpanote
+    rm -r "$ofile".rpanote
     ;;
 coff)
     ${CROSS}objcopy -O aixcoff-rs6000 --set-start "$entry" "$ofile"
diff --git a/arch/powerpc/configs/44x/arches_defconfig b/arch/powerpc/configs/44x/arches_defconfig
new file mode 100644
index 000000000000..70f46078eb6a
--- /dev/null
+++ b/arch/powerpc/configs/44x/arches_defconfig
@@ -0,0 +1,767 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.27-rc5
+# Wed Oct  1 15:54:57 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+CONFIG_44x=y
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_4xx=y
+CONFIG_BOOKE=y
+CONFIG_PTE_64BIT=y
+CONFIG_PHYS_64BIT=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_NOT_COHERENT_CACHE=y
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_DEFAULT_UIMAGE is not set
+CONFIG_PPC_DCR_NATIVE=y
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_PPC_DCR=y
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+# CONFIG_GROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+# CONFIG_USE_GENERIC_SMP_HELPERS is not set
+# CONFIG_HAVE_CLK is not set
+CONFIG_PROC_PAGE_MONITOR=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+CONFIG_LBD=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
+CONFIG_PPC4xx_PCI_EXPRESS=y
+
+#
+# Platform support
+#
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_BAMBOO is not set
+# CONFIG_EBONY is not set
+# CONFIG_SAM440EP is not set
+# CONFIG_SEQUOIA is not set
+# CONFIG_TAISHAN is not set
+# CONFIG_KATMAI is not set
+# CONFIG_RAINIER is not set
+# CONFIG_WARP is not set
+CONFIG_ARCHES=y
+# CONFIG_CANYONLANDS is not set
+# CONFIG_GLACIER is not set
+# CONFIG_YOSEMITE is not set
+# CONFIG_XILINX_VIRTEX440_GENERIC_BOARD is not set
+CONFIG_PPC44x_SIMPLE=y
+CONFIG_460EX=y
+# CONFIG_IPIC is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MIGRATION=y
+CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_PROC_DEVICETREE=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE=""
+CONFIG_EXTRA_TARGETS=""
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_4xx_SOC=y
+CONFIG_PPC_PCI_CHOICE=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+# CONFIG_HAS_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_TASK_SIZE=0xc0000000
+CONFIG_CONSISTENT_START=0xff100000
+CONFIG_CONSISTENT_SIZE=0x00200000
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+# CONFIG_MTD is not set
+CONFIG_OF_DEVICE=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+# CONFIG_BLK_DEV_LOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=35000
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_XILINX_SYSACE is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# Enable only one of the two stacks, unless you know what you are doing
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_IBM_NEW_EMAC=y
+CONFIG_IBM_NEW_EMAC_RXB=256
+CONFIG_IBM_NEW_EMAC_TXB=256
+CONFIG_IBM_NEW_EMAC_POLL_WEIGHT=32
+CONFIG_IBM_NEW_EMAC_RX_COPY_THRESHOLD=256
+CONFIG_IBM_NEW_EMAC_RX_SKB_HEADROOM=0
+# CONFIG_IBM_NEW_EMAC_DEBUG is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+CONFIG_IBM_NEW_EMAC_TAH=y
+CONFIG_IBM_NEW_EMAC_EMAC4=y
+# CONFIG_NET_PCI is not set
+# CONFIG_B44 is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+# CONFIG_INPUT is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_PCI is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+# CONFIG_SERIAL_8250_MANY_PORTS is not set
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+# CONFIG_SERIAL_8250_RSA is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_GPIOLIB is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+CONFIG_DAB=y
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+# CONFIG_SOUND is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_EXT4DEV_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_CRAMFS=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+CONFIG_ROOT_NFS=y
+# CONFIG_NFSD is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_NLS is not set
+# CONFIG_DLM is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_T10DIF is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_HAVE_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+# CONFIG_FTRACE is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_MSI_BITMAP_SELFTEST is not set
+# CONFIG_XMON is not set
+# CONFIG_IRQSTACKS is not set
+# CONFIG_VIRQ_DEBUG is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_CRYPTO is not set
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/83xx/asp8347_defconfig b/arch/powerpc/configs/83xx/asp8347_defconfig
index 5e6780a088ce..0b1fa20f745c 100644
--- a/arch/powerpc/configs/83xx/asp8347_defconfig
+++ b/arch/powerpc/configs/83xx/asp8347_defconfig
@@ -164,11 +164,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
index 2028337868b4..b7eae2bdf19c 100644
--- a/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8313_rdb_defconfig
@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
index dd80eb0a87a1..b0a27a67d8c7 100644
--- a/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc8315_rdb_defconfig
@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
index bdf50c8a17e6..ad825bcddd1f 100644
--- a/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_mds_defconfig
@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
index 4eef8c95480e..38267501f44d 100644
--- a/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc832x_rdb_defconfig
@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
index 8d6513931850..90aab340e7ff 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itx_defconfig
@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
index a8afa39d6f76..7458a242d251 100644
--- a/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_itxgp_defconfig
@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
index 24c320a36670..1a92798938cf 100644
--- a/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc834x_mds_defconfig
@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
index e029e9e14622..03d8cede0272 100644
--- a/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_mds_defconfig
@@ -163,11 +163,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
@@ -383,7 +383,84 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 # CONFIG_FW_LOADER is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_CONNECTOR is not set
-# CONFIG_MTD is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+# CONFIG_MTD_OF_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_CFI_INTELEXT is not set
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
 CONFIG_OF_DEVICE=y
 CONFIG_OF_I2C=y
 # CONFIG_PARPORT is not set
diff --git a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
index 7d674be702fe..cdf84177370a 100644
--- a/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
+++ b/arch/powerpc/configs/83xx/mpc836x_rdk_defconfig
@@ -164,11 +164,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
index de472022aa81..97e02d7a5b09 100644
--- a/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_mds_defconfig
@@ -164,11 +164,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
index e8d2d691d26c..5ac33054ce2c 100644
--- a/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
+++ b/arch/powerpc/configs/83xx/mpc837x_rdb_defconfig
@@ -164,11 +164,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/83xx/sbc834x_defconfig b/arch/powerpc/configs/83xx/sbc834x_defconfig
index 9245a67da200..c359cc2a380e 100644
--- a/arch/powerpc/configs/83xx/sbc834x_defconfig
+++ b/arch/powerpc/configs/83xx/sbc834x_defconfig
@@ -162,11 +162,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/86xx/gef_sbc610_defconfig b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
new file mode 100644
index 000000000000..312d7afbbe44
--- /dev/null
+++ b/arch/powerpc/configs/86xx/gef_sbc610_defconfig
@@ -0,0 +1,1657 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26-rc5
+# Wed Jun 11 12:06:53 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_SMP=y
+CONFIG_NR_CPUS=2
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_GENERIC_LOCKBREAK=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+CONFIG_GENERIC_TBSYNC=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFAULT_UIMAGE=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+CONFIG_RELAY=y
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_CLASSIC_RCU=y
+
+#
+# Platform support
+#
+CONFIG_PPC_MULTIPLATFORM=y
+CONFIG_CLASSIC32=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PPC_83xx is not set
+CONFIG_PPC_86xx=y
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_MPC8641_HPCN is not set
+# CONFIG_SBC8641D is not set
+# CONFIG_MPC8610_HPCD is not set
+CONFIG_GEF_SBC610=y
+CONFIG_MPC8641=y
+# CONFIG_IPIC is not set
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_FSL_ULI1575 is not set
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+CONFIG_TICK_ONESHOT=y
+# CONFIG_NO_HZ is not set
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+# CONFIG_SCHED_HRTICK is not set
+# CONFIG_PREEMPT_NONE is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
+CONFIG_PREEMPT=y
+# CONFIG_PREEMPT_RCU is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_IRQ_ALL_CPUS=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_PROC_DEVICETREE is not set
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_FSL_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIEASPM is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+CONFIG_PCI_DEBUG=y
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+CONFIG_HAS_RAPIDIO=y
+# CONFIG_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_TASK_SIZE=0xc0000000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_MMAP=y
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+# CONFIG_IPV6_MIP6 is not set
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETLABEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NF_CONNTRACK is not set
+CONFIG_NETFILTER_XTABLES=m
+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set
+# CONFIG_NETFILTER_XT_TARGET_DSCP is not set
+# CONFIG_NETFILTER_XT_TARGET_MARK is not set
+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set
+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
+# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
+# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
+# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set
+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set
+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
+# CONFIG_NETFILTER_XT_MATCH_ESP is not set
+# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set
+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set
+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set
+# CONFIG_NETFILTER_XT_MATCH_MAC is not set
+# CONFIG_NETFILTER_XT_MATCH_MARK is not set
+# CONFIG_NETFILTER_XT_MATCH_OWNER is not set
+# CONFIG_NETFILTER_XT_MATCH_POLICY is not set
+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set
+# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set
+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set
+# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set
+# CONFIG_NETFILTER_XT_MATCH_REALM is not set
+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set
+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
+# CONFIG_NETFILTER_XT_MATCH_STRING is not set
+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
+# CONFIG_NETFILTER_XT_MATCH_TIME is not set
+# CONFIG_NETFILTER_XT_MATCH_U32 is not set
+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+# CONFIG_IP_NF_MATCH_AH is not set
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_ECN=m
+# CONFIG_IP_NF_TARGET_TTL is not set
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+# CONFIG_IP6_NF_MATCH_AH is not set
+# CONFIG_IP6_NF_MATCH_MH is not set
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+# CONFIG_IP6_NF_TARGET_REJECT is not set
+CONFIG_IP6_NF_MANGLE=m
+# CONFIG_IP6_NF_TARGET_HL is not set
+CONFIG_IP6_NF_RAW=m
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+# CONFIG_IP_DCCP is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+CONFIG_TIPC=m
+# CONFIG_TIPC_ADVANCED is not set
+# CONFIG_TIPC_DEBUG is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+CONFIG_WAN_ROUTER=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+# CONFIG_NET_SCH_RR is not set
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+# CONFIG_NET_CLS_BASIC is not set
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_CLS_U32_MARK is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+# CONFIG_NET_CLS_FLOW is not set
+# CONFIG_NET_EMATCH is not set
+# CONFIG_NET_CLS_ACT is not set
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_SCH_FIFO=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_OF_PARTS is not set
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+# CONFIG_MTD_CFI_NOSWAP is not set
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_LE_BYTE_SWAP=y
+# CONFIG_MTD_CFI_GEOMETRY is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_OF_DEVICE=y
+CONFIG_OF_I2C=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=131072
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_SATA_PMP=y
+# CONFIG_SATA_AHCI is not set
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_FSL is not set
+CONFIG_ATA_SFF=y
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+CONFIG_SATA_SIL=y
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+# CONFIG_PATA_ALI is not set
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+CONFIG_MARVELL_PHY=y
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_E1000E_ENABLED is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+CONFIG_GIANFAR=y
+# CONFIG_GFAR_NAPI is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_NETDEV_10000 is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+CONFIG_ATM_DRIVERS=y
+# CONFIG_ATM_DUMMY is not set
+# CONFIG_ATM_TCP is not set
+# CONFIG_ATM_LANAI is not set
+# CONFIG_ATM_ENI is not set
+# CONFIG_ATM_FIRESTREAM is not set
+# CONFIG_ATM_ZATM is not set
+# CONFIG_ATM_NICSTAR is not set
+# CONFIG_ATM_IDT77252 is not set
+# CONFIG_ATM_AMBASSADOR is not set
+# CONFIG_ATM_HORIZON is not set
+# CONFIG_ATM_IA is not set
+# CONFIG_ATM_FORE200E_MAYBE is not set
+# CONFIG_ATM_HE is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+# CONFIG_PPP_MPPE is not set
+CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
+# CONFIG_PPPOL2TP is not set
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLHC=m
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+# CONFIG_NET_FC is not set
+CONFIG_NETCONSOLE=y
+# CONFIG_NETCONSOLE_DYNAMIC is not set
+CONFIG_NETPOLL=y
+CONFIG_NETPOLL_TRAP=y
+CONFIG_NET_POLL_CONTROLLER=y
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+# CONFIG_SERIAL_8250_PCI is not set
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_PIIX4 is not set
+CONFIG_I2C_MPC=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIMTEC is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_STUB is not set
+# CONFIG_I2C_TINY_USB is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+# CONFIG_I2C_PCA_PLATFORM is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+CONFIG_DS1682=y
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_AD7418 is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1029 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7470 is not set
+# CONFIG_SENSORS_ADT7473 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_I5K_AMB is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_F75375S is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+CONFIG_SENSORS_LM90=y
+CONFIG_SENSORS_LM92=y
+# CONFIG_SENSORS_LM93 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_MAX6650 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SIS5595 is not set
+# CONFIG_SENSORS_DME1737 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_ADS7828 is not set
+# CONFIG_SENSORS_THMC50 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_VT8231 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83793 is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83L786NG is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
+# CONFIG_THERMAL is not set
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+
+#
+# USB-based Watchdog Cards
+#
+# CONFIG_USBPCWATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=m
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+# CONFIG_USB_DEVICE_CLASS is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_EHCI_FSL is not set
+# CONFIG_USB_EHCI_HCD_PPC_OF is not set
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_OHCI_HCD_PPC_OF is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_MON is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_ATM is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=m
+CONFIG_RTC_CLASS=m
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+# CONFIG_RTC_INTF_PROC is not set
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+# CONFIG_RTC_DRV_CMOS is not set
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_PPC is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+CONFIG_EXT2_FS_POSIX_ACL=y
+# CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+CONFIG_EXT3_FS_POSIX_ACL=y
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_FS_POSIX_ACL=y
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+# CONFIG_SUNRPC_BIND34 is not set
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_WEAK_PW_HASH is not set
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+CONFIG_CRC_CCITT=m
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_DEBUGGER=y
+# CONFIG_XMON is not set
+# CONFIG_IRQSTACKS is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITY_NETWORK=y
+# CONFIG_SECURITY_NETWORK_XFRM is not set
+CONFIG_SECURITY_CAPABILITIES=y
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+# CONFIG_SECURITY_ROOTPLUG is not set
+CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_NULL=m
+# CONFIG_CRYPTO_CRYPTD is not set
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=m
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+# CONFIG_CRYPTO_TGR192 is not set
+CONFIG_CRYPTO_WP512=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+# CONFIG_CRYPTO_CAMELLIA is not set
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+CONFIG_CRYPTO_KHAZAD=m
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/mpc8610_hpcd_defconfig b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
index 1a9990731eb0..c98c6ee44492 100644
--- a/arch/powerpc/configs/mpc8610_hpcd_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8610_hpcd_defconfig
@@ -165,11 +165,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/mpc8641_hpcn_defconfig b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
index ea09be31b6ea..444ddf98436d 100644
--- a/arch/powerpc/configs/mpc8641_hpcn_defconfig
+++ b/arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig
@@ -167,11 +167,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/sbc8641d_defconfig b/arch/powerpc/configs/86xx/sbc8641d_defconfig
index f545421f9857..d900f8f376cf 100644
--- a/arch/powerpc/configs/sbc8641d_defconfig
+++ b/arch/powerpc/configs/86xx/sbc8641d_defconfig
@@ -166,11 +166,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/ep8248e_defconfig b/arch/powerpc/configs/ep8248e_defconfig
index ef0c6e800508..cd691f770810 100644
--- a/arch/powerpc/configs/ep8248e_defconfig
+++ b/arch/powerpc/configs/ep8248e_defconfig
@@ -150,11 +150,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 CONFIG_PPC_82xx=y
diff --git a/arch/powerpc/configs/mgcoge_defconfig b/arch/powerpc/configs/mgcoge_defconfig
new file mode 100644
index 000000000000..cc9eaba8c9c9
--- /dev/null
+++ b/arch/powerpc/configs/mgcoge_defconfig
@@ -0,0 +1,900 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26-rc2
+# Thu May 22 08:18:47 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+# CONFIG_SMP is not set
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+# CONFIG_PPC_UDBG_16550 is not set
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+# CONFIG_DEFAULT_UIMAGE is not set
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+# CONFIG_EXPERIMENTAL is not set
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_MODULES is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+# CONFIG_IOSCHED_AS is not set
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_DEFAULT_AS is not set
+CONFIG_DEFAULT_DEADLINE=y
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="deadline"
+CONFIG_CLASSIC_RCU=y
+
+#
+# Platform support
+#
+# CONFIG_PPC_MULTIPLATFORM is not set
+CONFIG_PPC_82xx=y
+# CONFIG_PPC_83xx is not set
+# CONFIG_PPC_86xx is not set
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_MPC8272_ADS is not set
+# CONFIG_PQ2FADS is not set
+# CONFIG_EP8248E is not set
+CONFIG_MGCOGE=y
+# CONFIG_PQ2ADS is not set
+CONFIG_8260=y
+CONFIG_8272=y
+# CONFIG_IPIC is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_CPM2=y
+CONFIG_PPC_CPM_NEW_BINDING=y
+# CONFIG_FSL_ULI1575 is not set
+CONFIG_CPM=y
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=y
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+# CONFIG_SECCOMP is not set
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_FSL_SOC=y
+# CONFIG_PCI is not set
+# CONFIG_PCI_DOMAINS is not set
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_PCCARD is not set
+# CONFIG_HAS_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_TASK_SIZE=0xc0000000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_NETFILTER_ADVANCED=y
+
+#
+# Core Netfilter Configuration
+#
+# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+# CONFIG_NETFILTER_NETLINK_LOG is not set
+# CONFIG_NF_CONNTRACK is not set
+# CONFIG_NETFILTER_XTABLES is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_CONCAT=y
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+# CONFIG_MTD_BLOCK is not set
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+# CONFIG_MTD_CFI_STAA is not set
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_OF_DEVICE=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+CONFIG_FIXED_PHY=y
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
+CONFIG_FS_ENET=y
+CONFIG_FS_ENET_HAS_SCC=y
+# CONFIG_FS_ENET_HAS_FCC is not set
+# CONFIG_FS_ENET_MDIO_FCC is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+# CONFIG_INPUT is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_CPM=y
+CONFIG_SERIAL_CPM_CONSOLE=y
+# CONFIG_SERIAL_CPM_SCC1 is not set
+# CONFIG_SERIAL_CPM_SCC2 is not set
+# CONFIG_SERIAL_CPM_SCC3 is not set
+# CONFIG_SERIAL_CPM_SCC4 is not set
+CONFIG_SERIAL_CPM_SMC1=y
+CONFIG_SERIAL_CPM_SMC2=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_HFSPLUS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_CRAMFS=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+# CONFIG_DETECT_SOFTLOCKUP is not set
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUGGER is not set
+# CONFIG_KGDB_CONSOLE is not set
+# CONFIG_IRQSTACKS is not set
+# CONFIG_VIRQ_DEBUG is not set
+CONFIG_BDI_SWITCH=y
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_PCBC=y
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+# CONFIG_CRYPTO_HW is not set
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/mgsuvd_defconfig b/arch/powerpc/configs/mgsuvd_defconfig
new file mode 100644
index 000000000000..3cd6ce4be827
--- /dev/null
+++ b/arch/powerpc/configs/mgsuvd_defconfig
@@ -0,0 +1,872 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.26-rc2
+# Wed May 21 13:30:33 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+# CONFIG_PPC_85xx is not set
+CONFIG_PPC_8xx=y
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_8xx=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_NOT_COHERENT_CACHE=y
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+# CONFIG_PPC_UDBG_16550 is not set
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+# CONFIG_DEFAULT_UIMAGE is not set
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+# CONFIG_SWAP is not set
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=17
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+# CONFIG_HOTPLUG is not set
+CONFIG_PRINTK=y
+# CONFIG_BUG is not set
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+# CONFIG_BASE_FULL is not set
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+# CONFIG_EPOLL is not set
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+CONFIG_SLAB=y
+# CONFIG_SLUB is not set
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=1
+# CONFIG_MODULES is not set
+CONFIG_BLOCK=y
+# CONFIG_LBD is not set
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=y
+# CONFIG_DEFAULT_DEADLINE is not set
+# CONFIG_DEFAULT_CFQ is not set
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="anticipatory"
+CONFIG_CLASSIC_RCU=y
+
+#
+# Platform support
+#
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+CONFIG_CPM1=y
+# CONFIG_MPC8XXFADS is not set
+# CONFIG_MPC86XADS is not set
+# CONFIG_MPC885ADS is not set
+# CONFIG_PPC_EP88XC is not set
+# CONFIG_PPC_ADDER875 is not set
+CONFIG_PPC_MGSUVD=y
+
+#
+# MPC8xx CPM Options
+#
+
+#
+# Generic MPC8xx Options
+#
+CONFIG_8xx_COPYBACK=y
+CONFIG_8xx_CPU6=y
+CONFIG_8xx_CPU15=y
+# CONFIG_NO_UCODE_PATCH is not set
+# CONFIG_USB_SOF_UCODE_PATCH is not set
+# CONFIG_I2C_SPI_UCODE_PATCH is not set
+CONFIG_I2C_SPI_SMC1_UCODE_PATCH=y
+CONFIG_UCODE_PATCH=y
+# CONFIG_PQ2ADS is not set
+# CONFIG_IPIC is not set
+# CONFIG_MPIC is not set
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_PPC_CPM_NEW_BINDING=y
+# CONFIG_FSL_ULI1575 is not set
+CONFIG_CPM=y
+
+#
+# Kernel options
+#
+# CONFIG_HIGHMEM is not set
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_MATH_EMULATION=y
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_PROC_DEVICETREE is not set
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+# CONFIG_SECCOMP is not set
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_FSL_SOC=y
+# CONFIG_PCI is not set
+# CONFIG_PCI_DOMAINS is not set
+# CONFIG_PCI_SYSCALL is not set
+# CONFIG_PCI_QSPAN is not set
+# CONFIG_ARCH_SUPPORTS_MSI is not set
+# CONFIG_HAS_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_TASK_SIZE=0x80000000
+CONFIG_CONSISTENT_START=0xfd000000
+CONFIG_CONSISTENT_SIZE=0x00200000
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+CONFIG_MTD=y
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_CONCAT is not set
+CONFIG_MTD_PARTITIONS=y
+# CONFIG_MTD_REDBOOT_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_OF_PARTS=y
+# CONFIG_MTD_AR7_PARTS is not set
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLKDEVS=y
+CONFIG_MTD_BLOCK=y
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_MTD_OOPS is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=y
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_GEN_PROBE=y
+CONFIG_MTD_CFI_ADV_OPTIONS=y
+CONFIG_MTD_CFI_NOSWAP=y
+# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
+# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
+CONFIG_MTD_CFI_GEOMETRY=y
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
+# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_CFI_I4 is not set
+# CONFIG_MTD_CFI_I8 is not set
+# CONFIG_MTD_OTP is not set
+CONFIG_MTD_CFI_INTELEXT=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_CFI_UTIL=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_PHYSMAP is not set
+CONFIG_MTD_PHYSMAP_OF=y
+# CONFIG_MTD_CFI_FLAGADM is not set
+# CONFIG_MTD_PLATRAM is not set
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
+# CONFIG_MTD_NAND is not set
+# CONFIG_MTD_ONENAND is not set
+
+#
+# UBI - Unsorted block images
+#
+# CONFIG_MTD_UBI is not set
+CONFIG_OF_DEVICE=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_MISC_DEVICES is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+# CONFIG_VITESSE_PHY is not set
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+CONFIG_FIXED_PHY=y
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_B44 is not set
+CONFIG_FS_ENET=y
+CONFIG_FS_ENET_HAS_SCC=y
+# CONFIG_FS_ENET_HAS_FEC is not set
+# CONFIG_FS_ENET_MDIO_FEC is not set
+# CONFIG_NETDEV_1000 is not set
+# CONFIG_NETDEV_10000 is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+# CONFIG_WAN is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+# CONFIG_INPUT is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_CPM=y
+CONFIG_SERIAL_CPM_CONSOLE=y
+# CONFIG_SERIAL_CPM_SCC1 is not set
+# CONFIG_SERIAL_CPM_SCC2 is not set
+# CONFIG_SERIAL_CPM_SCC3 is not set
+# CONFIG_SERIAL_CPM_SCC4 is not set
+CONFIG_SERIAL_CPM_SMC1=y
+# CONFIG_SERIAL_CPM_SMC2 is not set
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_IPMI_HANDLER is not set
+CONFIG_HW_RANDOM=y
+# CONFIG_NVRAM is not set
+CONFIG_GEN_RTC=y
+# CONFIG_GEN_RTC_X is not set
+# CONFIG_R3964 is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+# CONFIG_VIDEO_MEDIA is not set
+
+#
+# Multimedia drivers
+#
+# CONFIG_DAB is not set
+
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+# CONFIG_VIDEO_OUTPUT_CONTROL is not set
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+# CONFIG_USB_SUPPORT is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_EDAC is not set
+# CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+# CONFIG_PROC_KCORE is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+# CONFIG_JFFS2_FS_XATTR is not set
+# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
+CONFIG_JFFS2_ZLIB=y
+# CONFIG_JFFS2_LZO is not set
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+CONFIG_CRAMFS=y
+# CONFIG_VXFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_NLS is not set
+# CONFIG_DLM is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+CONFIG_CRC_CCITT=y
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_SAMPLES is not set
+# CONFIG_IRQSTACKS is not set
+# CONFIG_VIRQ_DEBUG is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/mpc8272_ads_defconfig b/arch/powerpc/configs/mpc8272_ads_defconfig
index 7c435c84c875..ff6f7c475f47 100644
--- a/arch/powerpc/configs/mpc8272_ads_defconfig
+++ b/arch/powerpc/configs/mpc8272_ads_defconfig
@@ -151,11 +151,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 CONFIG_PPC_82xx=y
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 916e3df7cc45..991c9bda12a9 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -166,11 +166,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 # CONFIG_PPC_82xx is not set
diff --git a/arch/powerpc/configs/mpc86xx_defconfig b/arch/powerpc/configs/mpc86xx_defconfig
new file mode 100644
index 000000000000..9d4be820cf1f
--- /dev/null
+++ b/arch/powerpc/configs/mpc86xx_defconfig
@@ -0,0 +1,1646 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.27-rc5
+# Tue Sep 23 23:28:38 2008
+#
+# CONFIG_PPC64 is not set
+
+#
+# Processor support
+#
+CONFIG_6xx=y
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_PPC_FPU=y
+CONFIG_ALTIVEC=y
+CONFIG_PPC_STD_MMU=y
+CONFIG_PPC_STD_MMU_32=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_SMP=y
+CONFIG_NR_CPUS=2
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_HAVE_LATENCYTOP_SUPPORT=y
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+CONFIG_GENERIC_TBSYNC=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFAULT_UIMAGE=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_LOCK_KERNEL=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+# CONFIG_TASKSTATS is not set
+CONFIG_AUDIT=y
+# CONFIG_AUDITSYSCALL is not set
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_GROUP_SCHED=y
+# CONFIG_FAIR_GROUP_SCHED is not set
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_USER_SCHED=y
+# CONFIG_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_RELAY is not set
+# CONFIG_NAMESPACES is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_EMBEDDED=y
+CONFIG_SYSCTL_SYSCALL=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_EXTRA_PASS=y
+CONFIG_HOTPLUG=y
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+# CONFIG_HAVE_DMA_ATTRS is not set
+CONFIG_USE_GENERIC_SMP_HELPERS=y
+# CONFIG_HAVE_CLK is not set
+CONFIG_PROC_PAGE_MONITOR=y
+# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_MODVERSIONS=y
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_STOP_MACHINE=y
+CONFIG_BLOCK=y
+CONFIG_LBD=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+# CONFIG_BLK_DEV_INTEGRITY is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_DEFAULT_AS is not set
+# CONFIG_DEFAULT_DEADLINE is not set
+CONFIG_DEFAULT_CFQ=y
+# CONFIG_DEFAULT_NOOP is not set
+CONFIG_DEFAULT_IOSCHED="cfq"
+CONFIG_CLASSIC_RCU=y
+# CONFIG_MPC8xxx_GPIO is not set
+
+#
+# Platform support
+#
+CONFIG_PPC_MULTIPLATFORM=y
+CONFIG_CLASSIC32=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_MPC5121_ADS is not set
+# CONFIG_MPC5121_GENERIC is not set
+# CONFIG_PPC_MPC52xx is not set
+# CONFIG_PPC_PMAC is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PPC_82xx is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_PPC_83xx is not set
+CONFIG_PPC_86xx=y
+CONFIG_MPC8641_HPCN=y
+CONFIG_SBC8641D=y
+CONFIG_MPC8610_HPCD=y
+CONFIG_GEF_SBC610=y
+CONFIG_MPC8641=y
+CONFIG_MPC8610=y
+# CONFIG_IPIC is not set
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+CONFIG_PPC_I8259=y
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_TAU is not set
+CONFIG_FSL_ULI1575=y
+
+#
+# Kernel options
+#
+CONFIG_HIGHMEM=y
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_HAS_WALK_MEMORY=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+# CONFIG_KEXEC is not set
+# CONFIG_IRQ_ALL_CPUS is not set
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_PAGEFLAGS_EXTENDED=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MIGRATION=y
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_EXTRA_TARGETS=""
+# CONFIG_PM is not set
+CONFIG_SECCOMP=y
+CONFIG_ISA_DMA_API=y
+
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_FSL_SOC=y
+CONFIG_FSL_PCI=y
+CONFIG_PPC_PCI_CHOICE=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+CONFIG_HAS_RAPIDIO=y
+# CONFIG_RAPIDIO is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_PAGE_OFFSET=0xc0000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_TASK_SIZE=0xc0000000
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+CONFIG_NET_IPIP=y
+CONFIG_NET_IPGRE=y
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_ARPD=y
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_TUNNEL=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_IPV6_ROUTER_PREF is not set
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_MIP6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=y
+CONFIG_INET6_XFRM_MODE_TUNNEL=y
+CONFIG_INET6_XFRM_MODE_BEET=y
+# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
+CONFIG_IPV6_SIT=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_IPV6_MULTIPLE_TABLES is not set
+# CONFIG_IPV6_MROUTE is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+CONFIG_FIB_RULES=y
+
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+CONFIG_FIRMWARE_IN_KERNEL=y
+CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_SYS_HYPERVISOR is not set
+# CONFIG_CONNECTOR is not set
+# CONFIG_MTD is not set
+CONFIG_OF_DEVICE=y
+CONFIG_OF_I2C=y
+# CONFIG_PARPORT is not set
+CONFIG_BLK_DEV=y
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_NBD=y
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=131072
+# CONFIG_BLK_DEV_XIP is not set
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_PHANTOM is not set
+# CONFIG_EEPROM_93CX6 is not set
+# CONFIG_SGI_IOC4 is not set
+# CONFIG_TIFM_CORE is not set
+# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_HP_ILO is not set
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
+# CONFIG_SCSI_NETLINK is not set
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=y
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_ISCSI_TCP is not set
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_AIC94XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_MEGARAID_SAS is not set
+# CONFIG_SCSI_HPTIOP is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_QLA_FC is not set
+# CONFIG_SCSI_QLA_ISCSI is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+# CONFIG_SCSI_DH is not set
+CONFIG_ATA=y
+# CONFIG_ATA_NONSTANDARD is not set
+CONFIG_SATA_PMP=y
+CONFIG_SATA_AHCI=y
+# CONFIG_SATA_SIL24 is not set
+# CONFIG_SATA_FSL is not set
+CONFIG_ATA_SFF=y
+# CONFIG_SATA_SVW is not set
+# CONFIG_ATA_PIIX is not set
+# CONFIG_SATA_MV is not set
+# CONFIG_SATA_NV is not set
+# CONFIG_PDC_ADMA is not set
+# CONFIG_SATA_QSTOR is not set
+# CONFIG_SATA_PROMISE is not set
+# CONFIG_SATA_SX4 is not set
+# CONFIG_SATA_SIL is not set
+# CONFIG_SATA_SIS is not set
+# CONFIG_SATA_ULI is not set
+# CONFIG_SATA_VIA is not set
+# CONFIG_SATA_VITESSE is not set
+# CONFIG_SATA_INIC162X is not set
+CONFIG_PATA_ALI=y
+# CONFIG_PATA_AMD is not set
+# CONFIG_PATA_ARTOP is not set
+# CONFIG_PATA_ATIIXP is not set
+# CONFIG_PATA_CMD640_PCI is not set
+# CONFIG_PATA_CMD64X is not set
+# CONFIG_PATA_CS5520 is not set
+# CONFIG_PATA_CS5530 is not set
+# CONFIG_PATA_CYPRESS is not set
+# CONFIG_PATA_EFAR is not set
+# CONFIG_ATA_GENERIC is not set
+# CONFIG_PATA_HPT366 is not set
+# CONFIG_PATA_HPT37X is not set
+# CONFIG_PATA_HPT3X2N is not set
+# CONFIG_PATA_HPT3X3 is not set
+# CONFIG_PATA_IT821X is not set
+# CONFIG_PATA_IT8213 is not set
+# CONFIG_PATA_JMICRON is not set
+# CONFIG_PATA_TRIFLEX is not set
+# CONFIG_PATA_MARVELL is not set
+# CONFIG_PATA_MPIIX is not set
+# CONFIG_PATA_OLDPIIX is not set
+# CONFIG_PATA_NETCELL is not set
+# CONFIG_PATA_NINJA32 is not set
+# CONFIG_PATA_NS87410 is not set
+# CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OPTI is not set
+# CONFIG_PATA_OPTIDMA is not set
+# CONFIG_PATA_PDC_OLD is not set
+# CONFIG_PATA_RADISYS is not set
+# CONFIG_PATA_RZ1000 is not set
+# CONFIG_PATA_SC1200 is not set
+# CONFIG_PATA_SERVERWORKS is not set
+# CONFIG_PATA_PDC2027X is not set
+# CONFIG_PATA_SIL680 is not set
+# CONFIG_PATA_SIS is not set
+# CONFIG_PATA_VIA is not set
+# CONFIG_PATA_WINBOND is not set
+# CONFIG_PATA_PLATFORM is not set
+# CONFIG_PATA_SCH is not set
+# CONFIG_MD is not set
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+
+#
+# Enable only one of the two stacks, unless you know what you are doing
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=y
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+CONFIG_PHYLIB=y
+
+#
+# MII PHY device drivers
+#
+# CONFIG_MARVELL_PHY is not set
+# CONFIG_DAVICOM_PHY is not set
+# CONFIG_QSEMI_PHY is not set
+# CONFIG_LXT_PHY is not set
+# CONFIG_CICADA_PHY is not set
+CONFIG_VITESSE_PHY=y
+# CONFIG_SMSC_PHY is not set
+# CONFIG_BROADCOM_PHY is not set
+# CONFIG_ICPLUS_PHY is not set
+# CONFIG_REALTEK_PHY is not set
+# CONFIG_FIXED_PHY is not set
+# CONFIG_MDIO_BITBANG is not set
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_NET_PCI is not set
+# CONFIG_B44 is not set
+CONFIG_NETDEV_1000=y
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_E1000E is not set
+# CONFIG_IP1000 is not set
+# CONFIG_IGB is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+CONFIG_GIANFAR=y
+# CONFIG_MV643XX_ETH is not set
+# CONFIG_QLA3XXX is not set
+# CONFIG_ATL1 is not set
+# CONFIG_ATL1E is not set
+CONFIG_NETDEV_10000=y
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_CHELSIO_T3 is not set
+# CONFIG_IXGBE is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+# CONFIG_MYRI10GE is not set
+# CONFIG_NETXEN_NIC is not set
+# CONFIG_NIU is not set
+# CONFIG_MLX4_CORE is not set
+# CONFIG_TEHUTI is not set
+# CONFIG_BNX2X is not set
+# CONFIG_SFC is not set
+# CONFIG_TR is not set
+
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 is not set
+# CONFIG_IWLWIFI_LEDS is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_ISDN is not set
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+# CONFIG_SERIO_XILINX_XPS_PS2 is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_DEVKMEM=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+# CONFIG_NOZOMI is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_NR_UARTS=2
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+CONFIG_SERIAL_8250_DETECT_IRQ=y
+CONFIG_SERIAL_8250_RSA=y
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_UARTLITE is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+# CONFIG_SERIAL_OF_PLATFORM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_HW_RANDOM is not set
+CONFIG_NVRAM=y
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_TCG_TPM is not set
+CONFIG_DEVPORT=y
+CONFIG_I2C=y
+CONFIG_I2C_BOARDINFO=y
+# CONFIG_I2C_CHARDEV is not set
+CONFIG_I2C_HELPER_AUTO=y
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_ISCH is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_MPC=y
+# CONFIG_I2C_OCORES is not set
+# CONFIG_I2C_SIMTEC is not set
+
+#
+# External I2C/SMBus adapter drivers
+#
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_TAOS_EVM is not set
+# CONFIG_I2C_TINY_USB is not set
+
+#
+# Graphics adapter I2C/DDC channel drivers
+#
+# CONFIG_I2C_VOODOO3 is not set
+
+#
+# Other I2C/SMBus bus drivers
+#
+# CONFIG_I2C_PCA_PLATFORM is not set
+# CONFIG_I2C_STUB is not set
+
+#
+# Miscellaneous I2C Chip support
+#
+# CONFIG_DS1682 is not set
+# CONFIG_AT24 is not set
+CONFIG_SENSORS_EEPROM=y
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_PCF8575 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_SENSORS_TSL2550 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+# CONFIG_SPI is not set
+CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
+# CONFIG_GPIOLIB is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_THERMAL_HWMON is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_POSSIBLE=y
+# CONFIG_SSB is not set
+
+#
+# Multifunction device drivers
+#
+# CONFIG_MFD_CORE is not set
+# CONFIG_MFD_SM501 is not set
+# CONFIG_HTC_PASIC3 is not set
+# CONFIG_MFD_TMIO is not set
+
+#
+# Multimedia devices
+#
+
+#
+# Multimedia core support
+#
+# CONFIG_VIDEO_DEV is not set
+CONFIG_DVB_CORE=m
+CONFIG_VIDEO_MEDIA=m
+
+#
+# Multimedia drivers
+#
+# CONFIG_MEDIA_ATTACH is not set
+CONFIG_MEDIA_TUNER=m
+# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_DVB_CAPTURE_DRIVERS=y
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+# CONFIG_TTPCI_EEPROM is not set
+# CONFIG_DVB_BUDGET_CORE is not set
+
+#
+# Supported USB Adapters
+#
+# CONFIG_DVB_USB is not set
+# CONFIG_DVB_TTUSB_BUDGET is not set
+# CONFIG_DVB_TTUSB_DEC is not set
+# CONFIG_DVB_CINERGYT2 is not set
+# CONFIG_DVB_SIANO_SMS1XXX is not set
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+# CONFIG_DVB_B2C2_FLEXCOP is not set
+
+#
+# Supported BT878 Adapters
+#
+
+#
+# Supported Pluto2 Adapters
+#
+# CONFIG_DVB_PLUTO2 is not set
+
+#
+# Supported DVB Frontends
+#
+
+#
+# Customise DVB Frontends
+#
+# CONFIG_DVB_FE_CUSTOMISE is not set
+
+#
+# DVB-S (satellite) frontends
+#
+# CONFIG_DVB_CX24110 is not set
+# CONFIG_DVB_CX24123 is not set
+# CONFIG_DVB_MT312 is not set
+# CONFIG_DVB_S5H1420 is not set
+# CONFIG_DVB_STV0299 is not set
+# CONFIG_DVB_TDA8083 is not set
+# CONFIG_DVB_TDA10086 is not set
+# CONFIG_DVB_VES1X93 is not set
+# CONFIG_DVB_TUNER_ITD1000 is not set
+# CONFIG_DVB_TDA826X is not set
+# CONFIG_DVB_TUA6100 is not set
+
+#
+# DVB-T (terrestrial) frontends
+#
+# CONFIG_DVB_SP8870 is not set
+# CONFIG_DVB_SP887X is not set
+# CONFIG_DVB_CX22700 is not set
+# CONFIG_DVB_CX22702 is not set
+# CONFIG_DVB_DRX397XD is not set
+# CONFIG_DVB_L64781 is not set
+# CONFIG_DVB_TDA1004X is not set
+# CONFIG_DVB_NXT6000 is not set
+# CONFIG_DVB_MT352 is not set
+# CONFIG_DVB_ZL10353 is not set
+# CONFIG_DVB_DIB3000MB is not set
+# CONFIG_DVB_DIB3000MC is not set
+# CONFIG_DVB_DIB7000M is not set
+# CONFIG_DVB_DIB7000P is not set
+# CONFIG_DVB_TDA10048 is not set
+
+#
+# DVB-C (cable) frontends
+#
+# CONFIG_DVB_VES1820 is not set
+# CONFIG_DVB_TDA10021 is not set
+# CONFIG_DVB_TDA10023 is not set
+# CONFIG_DVB_STV0297 is not set
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+# CONFIG_DVB_NXT200X is not set
+# CONFIG_DVB_OR51211 is not set
+# CONFIG_DVB_OR51132 is not set
+# CONFIG_DVB_BCM3510 is not set
+# CONFIG_DVB_LGDT330X is not set
+# CONFIG_DVB_S5H1409 is not set
+# CONFIG_DVB_AU8522 is not set
+# CONFIG_DVB_S5H1411 is not set
+
+#
+# Digital terrestrial only tuners/PLL
+#
+# CONFIG_DVB_PLL is not set
+# CONFIG_DVB_TUNER_DIB0070 is not set
+
+#
+# SEC control devices for DVB-S
+#
+# CONFIG_DVB_LNBP21 is not set
+# CONFIG_DVB_ISL6405 is not set
+# CONFIG_DVB_ISL6421 is not set
+CONFIG_DAB=y
+# CONFIG_USB_DABUSB is not set
+
+#
+# Graphics support
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_TIMER=y
+CONFIG_SND_PCM=y
+# CONFIG_SND_SEQUENCER is not set
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=y
+CONFIG_SND_PCM_OSS=y
+CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_DYNAMIC_MINORS is not set
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_AC97_CODEC=y
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_MTPAV is not set
+# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_MPU401 is not set
+# CONFIG_SND_AC97_POWER_SAVE is not set
+CONFIG_SND_PCI=y
+# CONFIG_SND_AD1889 is not set
+# CONFIG_SND_ALS300 is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AW2 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS5530 is not set
+# CONFIG_SND_DARLA20 is not set
+# CONFIG_SND_GINA20 is not set
+# CONFIG_SND_LAYLA20 is not set
+# CONFIG_SND_DARLA24 is not set
+# CONFIG_SND_GINA24 is not set
+# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_MONA is not set
+# CONFIG_SND_MIA is not set
+# CONFIG_SND_ECHO3G is not set
+# CONFIG_SND_INDIGO is not set
+# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_HDA_INTEL is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_HDSPM is not set
+# CONFIG_SND_HIFIER is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+CONFIG_SND_INTEL8X0=y
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_PCXHR is not set
+# CONFIG_SND_RIPTIDE is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VIRTUOSO is not set
+# CONFIG_SND_VX222 is not set
+# CONFIG_SND_YMFPCI is not set
+CONFIG_SND_PPC=y
+CONFIG_SND_USB=y
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_USX2Y is not set
+# CONFIG_SND_USB_CAIAQ is not set
+# CONFIG_SND_SOC is not set
+# CONFIG_SOUND_PRIME is not set
+CONFIG_AC97_BUS=y
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+# CONFIG_USB_HIDINPUT_POWERBOOK is not set
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB_ARCH_HAS_EHCI=y
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_DEVICE_CLASS=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_MON=y
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_C67X00_HCD is not set
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_EHCI_TT_NEWSCHED is not set
+# CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD_PPC_OF=y
+# CONFIG_USB_ISP116X_HCD is not set
+# CONFIG_USB_ISP1760_HCD is not set
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PPC_OF=y
+CONFIG_USB_OHCI_HCD_PPC_OF_BE=y
+CONFIG_USB_OHCI_HCD_PPC_OF_LE=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_BIG_ENDIAN_DESC=y
+CONFIG_USB_OHCI_BIG_ENDIAN_MMIO=y
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+# CONFIG_USB_R8A66597_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+# CONFIG_USB_WDM is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+
+#
+# may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
+# CONFIG_USB_STORAGE_KARMA is not set
+# CONFIG_USB_STORAGE_SIERRA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_LIBUSUAL is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_ADUTUX is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_BERRY_CHARGE is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYPRESS_CY7C63 is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGET is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_FTDI_ELAN is not set
+# CONFIG_USB_APPLEDISPLAY is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+# CONFIG_USB_TRANCEVIBRATOR is not set
+# CONFIG_USB_IOWARRIOR is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_ISIGHTFW is not set
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_MEMSTICK is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_ACCESSIBILITY is not set
+# CONFIG_INFINIBAND is not set
+# CONFIG_EDAC is not set
+CONFIG_RTC_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+# CONFIG_RTC_DRV_DS1307 is not set
+# CONFIG_RTC_DRV_DS1374 is not set
+# CONFIG_RTC_DRV_DS1672 is not set
+# CONFIG_RTC_DRV_MAX6900 is not set
+# CONFIG_RTC_DRV_RS5C372 is not set
+# CONFIG_RTC_DRV_ISL1208 is not set
+# CONFIG_RTC_DRV_X1205 is not set
+# CONFIG_RTC_DRV_PCF8563 is not set
+# CONFIG_RTC_DRV_PCF8583 is not set
+# CONFIG_RTC_DRV_M41T80 is not set
+# CONFIG_RTC_DRV_S35390A is not set
+# CONFIG_RTC_DRV_FM3130 is not set
+
+#
+# SPI RTC drivers
+#
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+# CONFIG_RTC_DRV_DS1511 is not set
+# CONFIG_RTC_DRV_DS1553 is not set
+# CONFIG_RTC_DRV_DS1742 is not set
+# CONFIG_RTC_DRV_STK17TA8 is not set
+# CONFIG_RTC_DRV_M48T86 is not set
+# CONFIG_RTC_DRV_M48T59 is not set
+# CONFIG_RTC_DRV_V3020 is not set
+
+#
+# on-CPU RTC drivers
+#
+# CONFIG_RTC_DRV_PPC is not set
+# CONFIG_DMADEVICES is not set
+# CONFIG_UIO is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_CRAMFS=y
+CONFIG_VXFS_FS=m
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+# CONFIG_ROMFS_FS is not set
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+CONFIG_NFS_V4=y
+CONFIG_ROOT_NFS=y
+CONFIG_NFSD=y
+# CONFIG_NFSD_V3 is not set
+# CONFIG_NFSD_V4 is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+# CONFIG_NLS_CODEPAGE_437 is not set
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+# CONFIG_NLS_ISO8859_1 is not set
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+# CONFIG_DLM is not set
+
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_GENERIC_FIND_FIRST_BIT is not set
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=1024
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_WRITECOUNT is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_BOOT_PRINTK_DELAY is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_SYSCTL_SYSCALL_CHECK=y
+CONFIG_HAVE_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+# CONFIG_FTRACE is not set
+# CONFIG_SCHED_TRACER is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+# CONFIG_KGDB is not set
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_CODE_PATCHING_SELFTEST is not set
+# CONFIG_FTR_FIXUP_SELFTEST is not set
+# CONFIG_MSI_BITMAP_SELFTEST is not set
+# CONFIG_XMON is not set
+# CONFIG_IRQSTACKS is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_BOOTX_TEXT is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_MANAGER=y
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Authenticated Encryption with Associated Data
+#
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_SEQIV is not set
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_CTS is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_LRW is not set
+CONFIG_CRYPTO_PCBC=m
+# CONFIG_CRYPTO_XTS is not set
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_HMAC=y
+# CONFIG_CRYPTO_XCBC is not set
+
+#
+# Digest
+#
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_RMD128 is not set
+# CONFIG_CRYPTO_RMD160 is not set
+# CONFIG_CRYPTO_RMD256 is not set
+# CONFIG_CRYPTO_RMD320 is not set
+CONFIG_CRYPTO_SHA1=m
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_WP512 is not set
+
+#
+# Ciphers
+#
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+
+#
+# Compression
+#
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_CRYPTO_DEV_HIFN_795X is not set
+# CONFIG_CRYPTO_DEV_TALITOS is not set
+# CONFIG_PPC_CLOCK is not set
+# CONFIG_VIRTUALIZATION is not set
diff --git a/arch/powerpc/configs/pq2fads_defconfig b/arch/powerpc/configs/pq2fads_defconfig
index b390b7476649..7e17862c38b8 100644
--- a/arch/powerpc/configs/pq2fads_defconfig
+++ b/arch/powerpc/configs/pq2fads_defconfig
@@ -152,11 +152,11 @@ CONFIG_CLASSIC_RCU=y
 #
 CONFIG_PPC_MULTIPLATFORM=y
 CONFIG_CLASSIC32=y
-CONFIG_PPC_CHRP=y
+# CONFIG_PPC_CHRP is not set
+# CONFIG_PPC_PMAC is not set
 # CONFIG_MPC5121_ADS is not set
 # CONFIG_MPC5121_GENERIC is not set
 # CONFIG_PPC_MPC52xx is not set
-CONFIG_PPC_PMAC=y
 # CONFIG_PPC_CELL is not set
 # CONFIG_PPC_CELL_NATIVE is not set
 CONFIG_PPC_82xx=y
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index ef8a248dfd55..1e94b07a020e 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -62,6 +62,7 @@ enum powerpc_pmc_type {
         PPC_PMC_DEFAULT = 0,
         PPC_PMC_IBM = 1,
         PPC_PMC_PA6T = 2,
+        PPC_PMC_G4 = 3,
 };
 
 struct pt_regs;
@@ -192,6 +193,7 @@ extern const char *powerpc_base_platform;
 #define CPU_FTR_NO_SLBIE_B              LONG_ASM_CONST(0x0008000000000000)
 #define CPU_FTR_VSX                     LONG_ASM_CONST(0x0010000000000000)
 #define CPU_FTR_SAO                     LONG_ASM_CONST(0x0020000000000000)
+#define CPU_FTR_CP_USE_DCBTZ            LONG_ASM_CONST(0x0040000000000000)
 
 #ifndef __ASSEMBLY__
 
@@ -387,10 +389,11 @@ extern const char *powerpc_base_platform;
             CPU_FTR_MMCRA | CPU_FTR_CTRL)
 #define CPU_FTRS_POWER4 (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
             CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
-            CPU_FTR_MMCRA)
+            CPU_FTR_MMCRA | CPU_FTR_CP_USE_DCBTZ)
 #define CPU_FTRS_PPC970 (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
             CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
-            CPU_FTR_ALTIVEC_COMP | CPU_FTR_CAN_NAP | CPU_FTR_MMCRA)
+            CPU_FTR_ALTIVEC_COMP | CPU_FTR_CAN_NAP | CPU_FTR_MMCRA | \
+            CPU_FTR_CP_USE_DCBTZ)
 #define CPU_FTRS_POWER5 (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
             CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
             CPU_FTR_MMCRA | CPU_FTR_SMT | \
@@ -411,7 +414,8 @@ extern const char *powerpc_base_platform;
 #define CPU_FTRS_CELL   (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
             CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \
             CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \
-            CPU_FTR_PAUSE_ZERO | CPU_FTR_CI_LARGE_PAGE | CPU_FTR_CELL_TB_BUG)
+            CPU_FTR_PAUSE_ZERO | CPU_FTR_CI_LARGE_PAGE | \
+            CPU_FTR_CELL_TB_BUG | CPU_FTR_CP_USE_DCBTZ)
 #define CPU_FTRS_PA6T (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \
             CPU_FTR_HPTE_TABLE | CPU_FTR_PPCAS_ARCH_V2 | \
             CPU_FTR_ALTIVEC_COMP | CPU_FTR_CI_LARGE_PAGE | \
diff --git a/arch/powerpc/include/asm/dcr-regs.h b/arch/powerpc/include/asm/dcr-regs.h
index f15296cf3598..828e3aa1f2fc 100644
--- a/arch/powerpc/include/asm/dcr-regs.h
+++ b/arch/powerpc/include/asm/dcr-regs.h
@@ -68,6 +68,13 @@
 #define SDR0_UART3              0x0123
 #define SDR0_CUST0              0x4000
 
+/* SDR for 405EZ */
+#define DCRN_SDR_ICINTSTAT      0x4510
+#define ICINTSTAT_ICRX  0x80000000
+#define ICINTSTAT_ICTX0 0x40000000
+#define ICINTSTAT_ICTX1 0x20000000
+#define ICINTSTAT_ICTX  0x60000000
+
 /* SDRs (460EX/460GT) */
 #define SDR0_ETH_CFG            0x4103
 #define SDR0_ETH_CFG_ECS        0x00000100      /* EMAC int clk source */
diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h
index 228ab2a315b9..dfd504caccc1 100644
--- a/arch/powerpc/include/asm/device.h
+++ b/arch/powerpc/include/asm/device.h
@@ -16,9 +16,6 @@ struct dev_archdata {
         /* DMA operations on that device */
         struct dma_mapping_ops  *dma_ops;
         void                    *dma_data;
-
-        /* NUMA node if applicable */
-        int                     numa_node;
 };
 
 #endif /* _ASM_POWERPC_DEVICE_H */
diff --git a/arch/powerpc/include/asm/dma-mapping.h b/arch/powerpc/include/asm/dma-mapping.h
index c7ca45f97dd2..fddb229bd74f 100644
--- a/arch/powerpc/include/asm/dma-mapping.h
+++ b/arch/powerpc/include/asm/dma-mapping.h
@@ -44,8 +44,6 @@ extern void __dma_sync_page(struct page *page, unsigned long offset,
 
 #endif /* ! CONFIG_NOT_COHERENT_CACHE */
 
-#ifdef CONFIG_PPC64
-
 static inline unsigned long device_to_mask(struct device *dev)
 {
         if (dev->dma_mask && *dev->dma_mask)
@@ -76,8 +74,24 @@ struct dma_mapping_ops {
                                 struct dma_attrs *attrs);
         int             (*dma_supported)(struct device *dev, u64 mask);
         int             (*set_dma_mask)(struct device *dev, u64 dma_mask);
+        dma_addr_t      (*map_page)(struct device *dev, struct page *page,
+                                unsigned long offset, size_t size,
+                                enum dma_data_direction direction,
+                                struct dma_attrs *attrs);
+        void            (*unmap_page)(struct device *dev,
+                                dma_addr_t dma_address, size_t size,
+                                enum dma_data_direction direction,
+                                struct dma_attrs *attrs);
 };
 
+/*
+ * Available generic sets of operations
+ */
+#ifdef CONFIG_PPC64
+extern struct dma_mapping_ops dma_iommu_ops;
+#endif
+extern struct dma_mapping_ops dma_direct_ops;
+
 static inline struct dma_mapping_ops *get_dma_ops(struct device *dev)
 {
         /* We don't handle the NULL dev case for ISA for now. We could
@@ -85,8 +99,19 @@ static inline struct dma_mapping_ops *get_dma_ops(struct device *dev)
          * only ISA DMA device we support is the floppy and we have a hack
          * in the floppy driver directly to get a device for us.
          */
-        if (unlikely(dev == NULL || dev->archdata.dma_ops == NULL))
+
+        if (unlikely(dev == NULL) || dev->archdata.dma_ops == NULL) {
+#ifdef CONFIG_PPC64
                 return NULL;
+#else
+                /* Use default on 32-bit if dma_ops is not set up */
+                /* TODO: Long term, we should fix drivers so that dev and
+                 * archdata dma_ops are set up for all buses.
+                 */
+                return &dma_direct_ops;
+#endif
+        }
+
         return dev->archdata.dma_ops;
 }
 
@@ -123,6 +148,12 @@ static inline int dma_set_mask(struct device *dev, u64 dma_mask)
         return 0;
 }
 
+/*
+ * TODO: map_/unmap_single will ideally go away, to be completely
+ * replaced by map/unmap_page.   Until then, we allow dma_ops to have
+ * one or the other, or both by checking to see if the specific
+ * function requested exists; and if not, falling back on the other set.
+ */
 static inline dma_addr_t dma_map_single_attrs(struct device *dev,
                                               void *cpu_addr,
                                               size_t size,
@@ -132,7 +163,14 @@ static inline dma_addr_t dma_map_single_attrs(struct device *dev,
         struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
 
         BUG_ON(!dma_ops);
-        return dma_ops->map_single(dev, cpu_addr, size, direction, attrs);
+
+        if (dma_ops->map_single)
+                return dma_ops->map_single(dev, cpu_addr, size, direction,
+                                           attrs);
+
+        return dma_ops->map_page(dev, virt_to_page(cpu_addr),
+                                 (unsigned long)cpu_addr % PAGE_SIZE, size,
+                                 direction, attrs);
 }
 
 static inline void dma_unmap_single_attrs(struct device *dev,
@@ -144,7 +182,13 @@ static inline void dma_unmap_single_attrs(struct device *dev,
         struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
 
         BUG_ON(!dma_ops);
-        dma_ops->unmap_single(dev, dma_addr, size, direction, attrs);
+
+        if (dma_ops->unmap_single) {
+                dma_ops->unmap_single(dev, dma_addr, size, direction, attrs);
+                return;
+        }
+
+        dma_ops->unmap_page(dev, dma_addr, size, direction, attrs);
 }
 
 static inline dma_addr_t dma_map_page_attrs(struct device *dev,
@@ -156,8 +200,13 @@ static inline dma_addr_t dma_map_page_attrs(struct device *dev,
         struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
 
         BUG_ON(!dma_ops);
+
+        if (dma_ops->map_page)
+                return dma_ops->map_page(dev, page, offset, size, direction,
+                                         attrs);
+
         return dma_ops->map_single(dev, page_address(page) + offset, size,
-                        direction, attrs);
+                                   direction, attrs);
 }
 
 static inline void dma_unmap_page_attrs(struct device *dev,
@@ -169,6 +218,12 @@ static inline void dma_unmap_page_attrs(struct device *dev,
         struct dma_mapping_ops *dma_ops = get_dma_ops(dev);
 
         BUG_ON(!dma_ops);
+
+        if (dma_ops->unmap_page) {
+                dma_ops->unmap_page(dev, dma_address, size, direction, attrs);
+                return;
+        }
+
         dma_ops->unmap_single(dev, dma_address, size, direction, attrs);
 }
 
@@ -253,126 +308,6 @@ static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
         dma_unmap_sg_attrs(dev, sg, nhwentries, direction, NULL);
 }
 
-/*
- * Available generic sets of operations
- */
-extern struct dma_mapping_ops dma_iommu_ops;
-extern struct dma_mapping_ops dma_direct_ops;
-
-#else /* CONFIG_PPC64 */
-
-#define dma_supported(dev, mask)        (1)
-
-static inline int dma_set_mask(struct device *dev, u64 dma_mask)
-{
-        if (!dev->dma_mask || !dma_supported(dev, mask))
-                return -EIO;
-
-        *dev->dma_mask = dma_mask;
-
-        return 0;
-}
-
-static inline void *dma_alloc_coherent(struct device *dev, size_t size,
-                                       dma_addr_t * dma_handle,
-                                       gfp_t gfp)
-{
-#ifdef CONFIG_NOT_COHERENT_CACHE
-        return __dma_alloc_coherent(size, dma_handle, gfp);
-#else
-        void *ret;
-        /* ignore region specifiers */
-        gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
-
-        if (dev == NULL || dev->coherent_dma_mask < 0xffffffff)
-                gfp |= GFP_DMA;
-
-        ret = (void *)__get_free_pages(gfp, get_order(size));
-
-        if (ret != NULL) {
-                memset(ret, 0, size);
-                *dma_handle = virt_to_bus(ret);
-        }
-
-        return ret;
-#endif
-}
-
-static inline void
-dma_free_coherent(struct device *dev, size_t size, void *vaddr,
-                  dma_addr_t dma_handle)
-{
-#ifdef CONFIG_NOT_COHERENT_CACHE
-        __dma_free_coherent(size, vaddr);
-#else
-        free_pages((unsigned long)vaddr, get_order(size));
-#endif
-}
-
-static inline dma_addr_t
-dma_map_single(struct device *dev, void *ptr, size_t size,
-               enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-
-        __dma_sync(ptr, size, direction);
-
-        return virt_to_bus(ptr);
-}
-
-static inline void dma_unmap_single(struct device *dev, dma_addr_t dma_addr,
-                                    size_t size,
-                                    enum dma_data_direction direction)
-{
-        /* We do nothing. */
-}
-
-static inline dma_addr_t
-dma_map_page(struct device *dev, struct page *page,
-             unsigned long offset, size_t size,
-             enum dma_data_direction direction)
-{
-        BUG_ON(direction == DMA_NONE);
-
-        __dma_sync_page(page, offset, size, direction);
-
-        return page_to_bus(page) + offset;
-}
-
-static inline void dma_unmap_page(struct device *dev, dma_addr_t dma_address,
-                                  size_t size,
-                                  enum dma_data_direction direction)
-{
-        /* We do nothing. */
-}
-
-static inline int
-dma_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
-           enum dma_data_direction direction)
-{
-        struct scatterlist *sg;
-        int i;
-
-        BUG_ON(direction == DMA_NONE);
-
-        for_each_sg(sgl, sg, nents, i) {
-                BUG_ON(!sg_page(sg));
-                __dma_sync_page(sg_page(sg), sg->offset, sg->length, direction);
-                sg->dma_address = page_to_bus(sg_page(sg)) + sg->offset;
-        }
-
-        return nents;
-}
-
-static inline void dma_unmap_sg(struct device *dev, struct scatterlist *sg,
-                                int nhwentries,
-                                enum dma_data_direction direction)
-{
-        /* We don't do anything here. */
-}
-
-#endif /* CONFIG_PPC64 */
-
 static inline void dma_sync_single_for_cpu(struct device *dev,
                 dma_addr_t dma_handle, size_t size,
                 enum dma_data_direction direction)
diff --git a/arch/powerpc/include/asm/exception.h b/arch/powerpc/include/asm/exception.h
index 329148b5acc6..d3d4534e3c74 100644
--- a/arch/powerpc/include/asm/exception.h
+++ b/arch/powerpc/include/asm/exception.h
@@ -53,14 +53,8 @@
  * low halfword of the address, but for Kdump we need the whole low
  * word.
  */
-#ifdef CONFIG_CRASH_DUMP
 #define LOAD_HANDLER(reg, label)                                        \
-        oris    reg,reg,(label)@h;      /* virt addr of handler ... */  \
-        ori     reg,reg,(label)@l;      /* .. and the rest */
-#else
-#define LOAD_HANDLER(reg, label)                                        \
-        ori     reg,reg,(label)@l;      /* virt addr of handler ... */
-#endif
+        addi    reg,reg,(label)-_stext; /* virt addr of handler ... */
 
 #define EXCEPTION_PROLOG_1(area)                                \
         mfspr   r13,SPRN_SPRG3;         /* get paca address into r13 */ \
@@ -72,37 +66,12 @@
         std     r9,area+EX_R13(r13);                                    \
         mfcr    r9
 
-/*
- * Equal to EXCEPTION_PROLOG_PSERIES, except that it forces 64bit mode.
- * The firmware calls the registered system_reset_fwnmi and
- * machine_check_fwnmi handlers in 32bit mode if the cpu happens to run
- * a 32bit application at the time of the event.
- * This firmware bug is present on POWER4 and JS20.
- */
-#define EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(area, label)               \
-        EXCEPTION_PROLOG_1(area);                                       \
-        clrrdi  r12,r13,32;             /* get high part of &label */   \
-        mfmsr   r10;                                                    \
-        /* force 64bit mode */                                          \
-        li      r11,5;                  /* MSR_SF_LG|MSR_ISF_LG */      \
-        rldimi  r10,r11,61,0;           /* insert into top 3 bits */    \
-        /* done 64bit mode */                                           \
-        mfspr   r11,SPRN_SRR0;          /* save SRR0 */                 \
-        LOAD_HANDLER(r12,label)                                         \
-        ori     r10,r10,MSR_IR|MSR_DR|MSR_RI;                           \
-        mtspr   SPRN_SRR0,r12;                                          \
-        mfspr   r12,SPRN_SRR1;          /* and SRR1 */                  \
-        mtspr   SPRN_SRR1,r10;                                          \
-        rfid;                                                           \
-        b       .       /* prevent speculative execution */
-
 #define EXCEPTION_PROLOG_PSERIES(area, label)                           \
         EXCEPTION_PROLOG_1(area);                                       \
-        clrrdi  r12,r13,32;             /* get high part of &label */   \
-        mfmsr   r10;                                                    \
+        ld      r12,PACAKBASE(r13);     /* get high part of &label */   \
+        ld      r10,PACAKMSR(r13);      /* get MSR value for kernel */  \
         mfspr   r11,SPRN_SRR0;          /* save SRR0 */                 \
         LOAD_HANDLER(r12,label)                                         \
-        ori     r10,r10,MSR_IR|MSR_DR|MSR_RI;                           \
         mtspr   SPRN_SRR0,r12;                                          \
         mfspr   r12,SPRN_SRR1;          /* and SRR1 */                  \
         mtspr   SPRN_SRR1,r10;                                          \
@@ -210,11 +179,10 @@ label##_pSeries:							\
         std     r10,PACA_EXGEN+EX_R13(r13);                             \
         std     r11,PACA_EXGEN+EX_R11(r13);                             \
         std     r12,PACA_EXGEN+EX_R12(r13);                             \
-        clrrdi  r12,r13,32;             /* get high part of &label */   \
-        mfmsr   r10;                                                    \
+        ld      r12,PACAKBASE(r13);     /* get high part of &label */   \
+        ld      r10,PACAKMSR(r13);      /* get MSR value for kernel */  \
         mfspr   r11,SPRN_SRR0;          /* save SRR0 */                 \
         LOAD_HANDLER(r12,label##_common)                                \
-        ori     r10,r10,MSR_IR|MSR_DR|MSR_RI;                           \
         mtspr   SPRN_SRR0,r12;                                          \
         mfspr   r12,SPRN_SRR1;          /* and SRR1 */                  \
         mtspr   SPRN_SRR1,r10;                                          \
diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
index 303f5484c050..63a4f779f531 100644
--- a/arch/powerpc/include/asm/fsl_lbc.h
+++ b/arch/powerpc/include/asm/fsl_lbc.h
@@ -23,9 +23,9 @@
 #ifndef __ASM_FSL_LBC_H
 #define __ASM_FSL_LBC_H
 
+#include <linux/compiler.h>
 #include <linux/types.h>
-#include <linux/spinlock.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 struct fsl_lbc_bank {
         __be32 br;             /**< Base Register  */
@@ -227,9 +227,6 @@ struct fsl_lbc_regs {
         u8 res8[0xF00];
 };
 
-extern struct fsl_lbc_regs __iomem *fsl_lbc_regs;
-extern spinlock_t fsl_lbc_lock;
-
 /*
  * FSL UPM routines
  */
@@ -268,44 +265,7 @@ static inline void fsl_upm_end_pattern(struct fsl_upm *upm)
                 cpu_relax();
 }
 
-/**
- * fsl_upm_run_pattern - actually run an UPM pattern
- * @upm:        pointer to the fsl_upm structure obtained via fsl_upm_find
- * @io_base:    remapped pointer to where memory access should happen
- * @mar:        MAR register content during pattern execution
- *
- * This function triggers dummy write to the memory specified by the io_base,
- * thus UPM pattern actually executed. Note that mar usage depends on the
- * pre-programmed AMX bits in the UPM RAM.
- */
-static inline int fsl_upm_run_pattern(struct fsl_upm *upm,
-                                      void __iomem *io_base, u32 mar)
-{
-        int ret = 0;
-        unsigned long flags;
-
-        spin_lock_irqsave(&fsl_lbc_lock, flags);
-
-        out_be32(&fsl_lbc_regs->mar, mar << (32 - upm->width));
-
-        switch (upm->width) {
-        case 8:
-                out_8(io_base, 0x0);
-                break;
-        case 16:
-                out_be16(io_base, 0x0);
-                break;
-        case 32:
-                out_be32(io_base, 0x0);
-                break;
-        default:
-                ret = -EINVAL;
-                break;
-        }
-
-        spin_unlock_irqrestore(&fsl_lbc_lock, flags);
-
-        return ret;
-}
+extern int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base,
+                               u32 mar);
 
 #endif /* __ASM_FSL_LBC_H */
diff --git a/arch/powerpc/include/asm/highmem.h b/arch/powerpc/include/asm/highmem.h
index 5d99b6489d56..91c589520c0a 100644
--- a/arch/powerpc/include/asm/highmem.h
+++ b/arch/powerpc/include/asm/highmem.h
@@ -84,7 +84,7 @@ static inline void *kmap_atomic_prot(struct page *page, enum km_type type, pgpro
 #ifdef CONFIG_DEBUG_HIGHMEM
         BUG_ON(!pte_none(*(kmap_pte-idx)));
 #endif
-        set_pte_at(&init_mm, vaddr, kmap_pte-idx, mk_pte(page, prot));
+        __set_pte_at(&init_mm, vaddr, kmap_pte-idx, mk_pte(page, prot));
         flush_tlb_page(NULL, vaddr);
 
         return (void*) vaddr;
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index 77c7fa025e65..08266d2728b3 100644
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
@@ -711,7 +711,7 @@ static inline void * phys_to_virt(unsigned long address)
 /*
  * Change "struct page" to physical address.
  */
-#define page_to_phys(page)      (page_to_pfn(page) << PAGE_SHIFT)
+#define page_to_phys(page)      ((phys_addr_t)page_to_pfn(page) << PAGE_SHIFT)
 
 /* We do NOT want virtual merging, it would put too much pressure on
  * our iommu allocator. Instead, we want drivers to be smart enough
diff --git a/arch/powerpc/include/asm/irq.h b/arch/powerpc/include/asm/irq.h
index a372f76836c2..0a5137676e1b 100644
--- a/arch/powerpc/include/asm/irq.h
+++ b/arch/powerpc/include/asm/irq.h
@@ -236,15 +236,27 @@ extern unsigned int irq_find_mapping(struct irq_host *host,
 extern unsigned int irq_create_direct_mapping(struct irq_host *host);
 
 /**
- * irq_radix_revmap - Find a linux virq from a hw irq number.
+ * irq_radix_revmap_insert - Insert a hw irq to linux virq number mapping.
+ * @host: host owning this hardware interrupt
+ * @virq: linux irq number
+ * @hwirq: hardware irq number in that host space
+ *
+ * This is for use by irq controllers that use a radix tree reverse
+ * mapping for fast lookup.
+ */
+extern void irq_radix_revmap_insert(struct irq_host *host, unsigned int virq,
+                                    irq_hw_number_t hwirq);
+
+/**
+ * irq_radix_revmap_lookup - Find a linux virq from a hw irq number.
  * @host: host owning this hardware interrupt
  * @hwirq: hardware irq number in that host space
  *
  * This is a fast path, for use by irq controller code that uses radix tree
  * revmaps
  */
-extern unsigned int irq_radix_revmap(struct irq_host *host,
-                                     irq_hw_number_t hwirq);
+extern unsigned int irq_radix_revmap_lookup(struct irq_host *host,
+                                            irq_hw_number_t hwirq);
 
 /**
  * irq_linear_revmap - Find a linux virq from a hw irq number.
diff --git a/arch/powerpc/include/asm/machdep.h b/arch/powerpc/include/asm/machdep.h
index 893aafd87fde..2740c44ff717 100644
--- a/arch/powerpc/include/asm/machdep.h
+++ b/arch/powerpc/include/asm/machdep.h
@@ -88,8 +88,6 @@ struct machdep_calls {
         unsigned long   (*tce_get)(struct iommu_table *tbl,
                                     long index);
         void            (*tce_flush)(struct iommu_table *tbl);
-        void            (*pci_dma_dev_setup)(struct pci_dev *dev);
-        void            (*pci_dma_bus_setup)(struct pci_bus *bus);
 
         void __iomem *  (*ioremap)(phys_addr_t addr, unsigned long size,
                                    unsigned long flags);
@@ -101,6 +99,9 @@ struct machdep_calls {
 #endif
 #endif /* CONFIG_PPC64 */
 
+        void            (*pci_dma_dev_setup)(struct pci_dev *dev);
+        void            (*pci_dma_bus_setup)(struct pci_bus *bus);
+
         int             (*probe)(void);
         void            (*setup_arch)(void); /* Optional, may be NULL */
         void            (*init_early)(void);
diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
index 9209f755763e..e7b99bac9f48 100644
--- a/arch/powerpc/include/asm/mman.h
+++ b/arch/powerpc/include/asm/mman.h
@@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot)
 
 static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
 {
-        return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : 0;
+        return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
 }
 #define arch_vm_get_page_prot(vm_flags) arch_vm_get_page_prot(vm_flags)
 
diff --git a/arch/powerpc/include/asm/mmu-hash64.h b/arch/powerpc/include/asm/mmu-hash64.h
index c2df53c5ceb9..5a441742ffba 100644
--- a/arch/powerpc/include/asm/mmu-hash64.h
+++ b/arch/powerpc/include/asm/mmu-hash64.h
@@ -437,7 +437,7 @@ typedef struct {
         })
 #endif /* 1 */
 
-/* This is only valid for addresses >= KERNELBASE */
+/* This is only valid for addresses >= PAGE_OFFSET */
 static inline unsigned long get_kernel_vsid(unsigned long ea, int ssize)
 {
         if (ssize == MMU_SEGSIZE_256M)
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h
index fe566a348a86..34d9ac433ace 100644
--- a/arch/powerpc/include/asm/mpic.h
+++ b/arch/powerpc/include/asm/mpic.h
@@ -5,6 +5,7 @@
 #include <linux/irq.h>
 #include <linux/sysdev.h>
 #include <asm/dcr.h>
+#include <asm/msi_bitmap.h>
 
 /*
  * Global registers
@@ -301,8 +302,7 @@ struct mpic
 #endif
 
 #ifdef CONFIG_PCI_MSI
-        spinlock_t              bitmap_lock;
-        unsigned long           *hwirq_bitmap;
+        struct msi_bitmap       msi_bitmap;
 #endif
 
 #ifdef CONFIG_MPIC_BROKEN_REGREAD
diff --git a/arch/powerpc/include/asm/msi_bitmap.h b/arch/powerpc/include/asm/msi_bitmap.h
new file mode 100644
index 000000000000..97ac3f46ae0d
--- /dev/null
+++ b/arch/powerpc/include/asm/msi_bitmap.h
@@ -0,0 +1,35 @@
+#ifndef _POWERPC_SYSDEV_MSI_BITMAP_H
+#define _POWERPC_SYSDEV_MSI_BITMAP_H
+
+/*
+ * Copyright 2008, Michael Ellerman, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2 of the
+ * License.
+ *
+ */
+
+#include <linux/of.h>
+#include <asm/irq.h>
+
+struct msi_bitmap {
+        struct device_node      *of_node;
+        unsigned long           *bitmap;
+        spinlock_t              lock;
+        unsigned int            irq_count;
+};
+
+int msi_bitmap_alloc_hwirqs(struct msi_bitmap *bmp, int num);
+void msi_bitmap_free_hwirqs(struct msi_bitmap *bmp, unsigned int offset,
+                            unsigned int num);
+void msi_bitmap_reserve_hwirq(struct msi_bitmap *bmp, unsigned int hwirq);
+
+int msi_bitmap_reserve_dt_hwirqs(struct msi_bitmap *bmp);
+
+int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count,
+                     struct device_node *of_node);
+void msi_bitmap_free(struct msi_bitmap *bmp);
+
+#endif /* _POWERPC_SYSDEV_MSI_BITMAP_H */
diff --git a/arch/powerpc/include/asm/of_device.h b/arch/powerpc/include/asm/of_device.h
index 3c123990ca2e..a64debf177dc 100644
--- a/arch/powerpc/include/asm/of_device.h
+++ b/arch/powerpc/include/asm/of_device.h
@@ -24,8 +24,5 @@ extern struct of_device *of_device_alloc(struct device_node *np,
 extern int of_device_uevent(struct device *dev,
                             struct kobj_uevent_env *env);
 
-/* This is just here during the transition */
-#include <linux/of_device.h>
-
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_OF_DEVICE_H */
diff --git a/arch/powerpc/include/asm/of_platform.h b/arch/powerpc/include/asm/of_platform.h
index 18659ef72139..53b46507ffde 100644
--- a/arch/powerpc/include/asm/of_platform.h
+++ b/arch/powerpc/include/asm/of_platform.h
@@ -11,9 +11,6 @@
  *
  */
 
-/* This is just here during the transition */
-#include <linux/of_platform.h>
-
 /* Platform drivers register/unregister */
 static inline int of_register_platform_driver(struct of_platform_driver *drv)
 {
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index 6493a395508b..082b3aedf145 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -62,6 +62,8 @@ struct paca_struct {
         u16 paca_index;                 /* Logical processor number */
 
         u64 kernel_toc;                 /* Kernel TOC address */
+        u64 kernelbase;                 /* Base address of kernel */
+        u64 kernel_msr;                 /* MSR while running in kernel */
         u64 stab_real;                  /* Absolute address of segment table */
         u64 stab_addr;                  /* Virtual address of segment table */
         void *emergency_sp;             /* pointer to emergency stack */
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
index e088545cb3f5..64e144505f65 100644
--- a/arch/powerpc/include/asm/page.h
+++ b/arch/powerpc/include/asm/page.h
@@ -71,15 +71,21 @@
 #define PAGE_OFFSET     ASM_CONST(CONFIG_PAGE_OFFSET)
 #define LOAD_OFFSET     ASM_CONST((CONFIG_KERNEL_START-CONFIG_PHYSICAL_START))
 
-#if defined(CONFIG_RELOCATABLE) && defined(CONFIG_FLATMEM)
+#if defined(CONFIG_RELOCATABLE)
 #ifndef __ASSEMBLY__
 extern phys_addr_t memstart_addr;
 extern phys_addr_t kernstart_addr;
 #endif
 #define PHYSICAL_START  kernstart_addr
-#define MEMORY_START    memstart_addr
 #else
 #define PHYSICAL_START  ASM_CONST(CONFIG_PHYSICAL_START)
+#endif
+
+#ifdef CONFIG_PPC64
+#define MEMORY_START    0UL
+#elif defined(CONFIG_RELOCATABLE)
+#define MEMORY_START    memstart_addr
+#else
 #define MEMORY_START    (PHYSICAL_START + PAGE_OFFSET - KERNELBASE)
 #endif
 
@@ -92,8 +98,8 @@ extern phys_addr_t kernstart_addr;
 #define pfn_to_kaddr(pfn)       __va((pfn) << PAGE_SHIFT)
 #define virt_addr_valid(kaddr)  pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
 
-#define __va(x) ((void *)((unsigned long)(x) - PHYSICAL_START + KERNELBASE))
-#define __pa(x) ((unsigned long)(x) + PHYSICAL_START - KERNELBASE)
+#define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET - MEMORY_START))
+#define __pa(x) ((unsigned long)(x) - PAGE_OFFSET + MEMORY_START)
 
 /*
  * Unfortunately the PLT is in the BSS in the PPC32 ELF ABI,
diff --git a/arch/powerpc/include/asm/page_32.h b/arch/powerpc/include/asm/page_32.h
index ebfae530a379..d77072a32cc6 100644
--- a/arch/powerpc/include/asm/page_32.h
+++ b/arch/powerpc/include/asm/page_32.h
@@ -13,10 +13,16 @@
 #define ARCH_KMALLOC_MINALIGN   L1_CACHE_BYTES
 #endif
 
+#ifdef CONFIG_PTE_64BIT
+#define PTE_FLAGS_OFFSET        4       /* offset of PTE flags, in bytes */
+#else
+#define PTE_FLAGS_OFFSET        0
+#endif
+
 #ifndef __ASSEMBLY__
 /*
  * The basic type of a PTE - 64 bits for those CPUs with > 32 bit
- * physical addressing.  For now this just the IBM PPC440.
+ * physical addressing.
  */
 #ifdef CONFIG_PTE_64BIT
 typedef unsigned long long pte_basic_t;
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index a05a942b1c25..0e52c7828ea4 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -60,6 +60,14 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
         return channel ? 15 : 14;
 }
 
+#ifdef CONFIG_PCI
+extern void set_pci_dma_ops(struct dma_mapping_ops *dma_ops);
+extern struct dma_mapping_ops *get_pci_dma_ops(void);
+#else   /* CONFIG_PCI */
+#define set_pci_dma_ops(d)
+#define get_pci_dma_ops()       NULL
+#endif
+
 #ifdef CONFIG_PPC64
 
 /*
@@ -70,9 +78,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 #define PCI_DISABLE_MWI
 
 #ifdef CONFIG_PCI
-extern void set_pci_dma_ops(struct dma_mapping_ops *dma_ops);
-extern struct dma_mapping_ops *get_pci_dma_ops(void);
-
 static inline void pci_dma_burst_advice(struct pci_dev *pdev,
                                         enum pci_dma_burst_strategy *strat,
                                         unsigned long *strategy_parameter)
@@ -89,9 +94,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
         *strat = PCI_DMA_BURST_MULTIPLE;
         *strategy_parameter = cacheline_size;
 }
-#else   /* CONFIG_PCI */
-#define set_pci_dma_ops(d)
-#define get_pci_dma_ops()       NULL
 #endif
 
 #else /* 32-bit */
diff --git a/arch/powerpc/include/asm/pgtable-ppc32.h b/arch/powerpc/include/asm/pgtable-ppc32.h
index 6fe39e327047..6ab7c67cb5ab 100644
--- a/arch/powerpc/include/asm/pgtable-ppc32.h
+++ b/arch/powerpc/include/asm/pgtable-ppc32.h
@@ -261,6 +261,7 @@ extern int icache_44x_need_flush;
 #define _PAGE_HWEXEC    0x00000004              /* H: Execute permission */
 #define _PAGE_ACCESSED  0x00000008              /* S: Page referenced */
 #define _PAGE_DIRTY     0x00000010              /* S: Page dirty */
+#define _PAGE_SPECIAL   0x00000020              /* S: Special page */
 #define _PAGE_USER      0x00000040              /* S: User page */
 #define _PAGE_ENDIAN    0x00000080              /* H: E bit */
 #define _PAGE_GUARDED   0x00000100              /* H: G bit */
@@ -276,6 +277,7 @@ extern int icache_44x_need_flush;
 /* ERPN in a PTE never gets cleared, ignore it */
 #define _PTE_NONE_MASK  0xffffffff00000000ULL
 
+#define __HAVE_ARCH_PTE_SPECIAL
 
 #elif defined(CONFIG_FSL_BOOKE)
 /*
@@ -305,6 +307,7 @@ extern int icache_44x_need_flush;
 #define _PAGE_COHERENT  0x00100 /* H: M bit */
 #define _PAGE_NO_CACHE  0x00200 /* H: I bit */
 #define _PAGE_WRITETHRU 0x00400 /* H: W bit */
+#define _PAGE_SPECIAL   0x00800 /* S: Special page */
 
 #ifdef CONFIG_PTE_64BIT
 /* ERPN in a PTE never gets cleared, ignore it */
@@ -315,6 +318,8 @@ extern int icache_44x_need_flush;
 #define _PMD_PRESENT_MASK (PAGE_MASK)
 #define _PMD_BAD        (~PAGE_MASK)
 
+#define __HAVE_ARCH_PTE_SPECIAL
+
 #elif defined(CONFIG_8xx)
 /* Definitions for 8xx embedded chips. */
 #define _PAGE_PRESENT   0x0001  /* Page is valid */
@@ -362,8 +367,14 @@ extern int icache_44x_need_flush;
 #define _PAGE_ACCESSED  0x100   /* R: page referenced */
 #define _PAGE_EXEC      0x200   /* software: i-cache coherency required */
 #define _PAGE_RW        0x400   /* software: user write access allowed */
+#define _PAGE_SPECIAL   0x800   /* software: Special page */
 
+#ifdef CONFIG_PTE_64BIT
+/* We never clear the high word of the pte */
+#define _PTE_NONE_MASK  (0xffffffff00000000ULL | _PAGE_HASHPTE)
+#else
 #define _PTE_NONE_MASK  _PAGE_HASHPTE
+#endif
 
 #define _PMD_PRESENT    0
 #define _PMD_PRESENT_MASK (PAGE_MASK)
@@ -372,6 +383,8 @@ extern int icache_44x_need_flush;
 /* Hash table based platforms need atomic updates of the linux PTE */
 #define PTE_ATOMIC_UPDATES      1
 
+#define __HAVE_ARCH_PTE_SPECIAL
+
 #endif
 
 /*
@@ -404,6 +417,9 @@ extern int icache_44x_need_flush;
 #ifndef _PAGE_WRITETHRU
 #define _PAGE_WRITETHRU 0
 #endif
+#ifndef _PAGE_SPECIAL
+#define _PAGE_SPECIAL   0
+#endif
 #ifndef _PMD_PRESENT_MASK
 #define _PMD_PRESENT_MASK       _PMD_PRESENT
 #endif
@@ -415,11 +431,11 @@ extern int icache_44x_need_flush;
 #define _PAGE_CHG_MASK  (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
 
 
-#define PAGE_PROT_BITS  __pgprot(_PAGE_GUARDED | _PAGE_COHERENT | _PAGE_NO_CACHE | \
-                                 _PAGE_WRITETHRU | _PAGE_ENDIAN | \
-                                 _PAGE_USER | _PAGE_ACCESSED | \
-                                 _PAGE_RW | _PAGE_HWWRITE | _PAGE_DIRTY | \
-                                 _PAGE_EXEC | _PAGE_HWEXEC)
+#define PAGE_PROT_BITS  (_PAGE_GUARDED | _PAGE_COHERENT | _PAGE_NO_CACHE | \
+                         _PAGE_WRITETHRU | _PAGE_ENDIAN | \
+                         _PAGE_USER | _PAGE_ACCESSED | \
+                         _PAGE_RW | _PAGE_HWWRITE | _PAGE_DIRTY | \
+                         _PAGE_EXEC | _PAGE_HWEXEC)
 /*
  * Note: the _PAGE_COHERENT bit automatically gets set in the hardware
  * PTE if CONFIG_SMP is defined (hash_page does this); there is no need
@@ -517,7 +533,8 @@ extern unsigned long bad_call_to_PMD_PAGE_SIZE(void);
 
 #define pte_none(pte)           ((pte_val(pte) & ~_PTE_NONE_MASK) == 0)
 #define pte_present(pte)        (pte_val(pte) & _PAGE_PRESENT)
-#define pte_clear(mm,addr,ptep) do { set_pte_at((mm), (addr), (ptep), __pte(0)); } while (0)
+#define pte_clear(mm, addr, ptep) \
+        do { pte_update(ptep, ~_PAGE_HASHPTE, 0); } while (0)
 
 #define pmd_none(pmd)           (!pmd_val(pmd))
 #define pmd_bad(pmd)            (pmd_val(pmd) & _PMD_BAD)
@@ -533,7 +550,7 @@ static inline int pte_write(pte_t pte)		{ return pte_val(pte) & _PAGE_RW; }
 static inline int pte_dirty(pte_t pte)          { return pte_val(pte) & _PAGE_DIRTY; }
 static inline int pte_young(pte_t pte)          { return pte_val(pte) & _PAGE_ACCESSED; }
 static inline int pte_file(pte_t pte)           { return pte_val(pte) & _PAGE_FILE; }
-static inline int pte_special(pte_t pte)        { return 0; }
+static inline int pte_special(pte_t pte)        { return pte_val(pte) & _PAGE_SPECIAL; }
 
 static inline void pte_uncache(pte_t pte)       { pte_val(pte) |= _PAGE_NO_CACHE; }
 static inline void pte_cache(pte_t pte)         { pte_val(pte) &= ~_PAGE_NO_CACHE; }
@@ -552,10 +569,10 @@ static inline pte_t pte_mkdirty(pte_t pte) {
 static inline pte_t pte_mkyoung(pte_t pte) {
         pte_val(pte) |= _PAGE_ACCESSED; return pte; }
 static inline pte_t pte_mkspecial(pte_t pte) {
-        return pte; }
-static inline unsigned long pte_pgprot(pte_t pte)
+        pte_val(pte) |= _PAGE_SPECIAL; return pte; }
+static inline pgprot_t pte_pgprot(pte_t pte)
 {
-        return __pgprot(pte_val(pte)) & PAGE_PROT_BITS;
+        return __pgprot(pte_val(pte) & PAGE_PROT_BITS);
 }
 
 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
@@ -575,6 +592,10 @@ extern int flush_hash_pages(unsigned context, unsigned long va,
 extern void add_hash_page(unsigned context, unsigned long va,
                           unsigned long pmdval);
 
+/* Flush an entry from the TLB/hash table */
+extern void flush_hash_entry(struct mm_struct *mm, pte_t *ptep,
+                             unsigned long address);
+
 /*
  * Atomic PTE updates.
  *
@@ -612,9 +633,6 @@ static inline unsigned long pte_update(pte_t *p,
         return old;
 }
 #else /* CONFIG_PTE_64BIT */
-/* TODO: Change that to only modify the low word and move set_pte_at()
- * out of line
- */
 static inline unsigned long long pte_update(pte_t *p,
                                             unsigned long clr,
                                             unsigned long set)
@@ -652,14 +670,36 @@ static inline unsigned long long pte_update(pte_t *p,
  * On machines which use an MMU hash table we avoid changing the
  * _PAGE_HASHPTE bit.
  */
-static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
+
+static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr,
                               pte_t *ptep, pte_t pte)
 {
-#if _PAGE_HASHPTE != 0
+#if (_PAGE_HASHPTE != 0) && defined(CONFIG_SMP) && !defined(CONFIG_PTE_64BIT)
         pte_update(ptep, ~_PAGE_HASHPTE, pte_val(pte) & ~_PAGE_HASHPTE);
+#elif defined(CONFIG_PTE_64BIT) && defined(CONFIG_SMP)
+#if _PAGE_HASHPTE != 0
+        if (pte_val(*ptep) & _PAGE_HASHPTE)
+                flush_hash_entry(mm, ptep, addr);
+#endif
+        __asm__ __volatile__("\
+                stw%U0%X0 %2,%0\n\
+                eieio\n\
+                stw%U0%X0 %L2,%1"
+        : "=m" (*ptep), "=m" (*((unsigned char *)ptep+4))
+        : "r" (pte) : "memory");
 #else
-        *ptep = pte;
+        *ptep = __pte((pte_val(*ptep) & _PAGE_HASHPTE)
+                      | (pte_val(pte) & ~_PAGE_HASHPTE));
+#endif
+}
+
+static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
+                              pte_t *ptep, pte_t pte)
+{
+#if defined(CONFIG_PTE_64BIT) && defined(CONFIG_SMP)
+        WARN_ON(pte_present(*ptep));
 #endif
+        __set_pte_at(mm, addr, ptep, pte);
 }
 
 /*
diff --git a/arch/powerpc/include/asm/pgtable-ppc64.h b/arch/powerpc/include/asm/pgtable-ppc64.h
index 4597c491e9b5..4c0a8c62859d 100644
--- a/arch/powerpc/include/asm/pgtable-ppc64.h
+++ b/arch/powerpc/include/asm/pgtable-ppc64.h
@@ -117,10 +117,10 @@
 #define PAGE_AGP        __pgprot(_PAGE_BASE | _PAGE_WRENABLE | _PAGE_NO_CACHE)
 #define HAVE_PAGE_AGP
 
-#define PAGE_PROT_BITS  __pgprot(_PAGE_GUARDED | _PAGE_COHERENT | \
-                                 _PAGE_NO_CACHE | _PAGE_WRITETHRU | \
-                                 _PAGE_4K_PFN | _PAGE_RW | _PAGE_USER | \
-                                 _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_EXEC)
+#define PAGE_PROT_BITS  (_PAGE_GUARDED | _PAGE_COHERENT | \
+                         _PAGE_NO_CACHE | _PAGE_WRITETHRU |             \
+                         _PAGE_4K_PFN | _PAGE_RW | _PAGE_USER |         \
+                         _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_EXEC)
 /* PTEIDX nibble */
 #define _PTEIDX_SECONDARY       0x8
 #define _PTEIDX_GROUP_IX        0x7
@@ -264,9 +264,9 @@ static inline pte_t pte_mkhuge(pte_t pte) {
         return pte; }
 static inline pte_t pte_mkspecial(pte_t pte) {
         pte_val(pte) |= _PAGE_SPECIAL; return pte; }
-static inline unsigned long pte_pgprot(pte_t pte)
+static inline pgprot_t pte_pgprot(pte_t pte)
 {
-        return __pgprot(pte_val(pte)) & PAGE_PROT_BITS;
+        return __pgprot(pte_val(pte) & PAGE_PROT_BITS);
 }
 
 /* Atomic PTE updates */
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index 0966899d974b..c4a029ccb4d3 100644
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -268,7 +268,7 @@ n:
  *   Loads the value of the constant expression 'expr' into register 'rn'
  *   using immediate instructions only.  Use this when it's important not
  *   to reference other data (i.e. on ppc64 when the TOC pointer is not
- *   valid).
+ *   valid) and when 'expr' is a constant or absolute address.
  *
  * LOAD_REG_ADDR(rn, name)
  *   Loads the address of label 'name' into register 'rn'.  Use this when
diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h
index be980f4ee495..67453766bff1 100644
--- a/arch/powerpc/include/asm/reg_booke.h
+++ b/arch/powerpc/include/asm/reg_booke.h
@@ -109,6 +109,7 @@
 #define SPRN_EVPR       0x3D6   /* Exception Vector Prefix Register */
 #define SPRN_L1CSR0     0x3F2   /* L1 Cache Control and Status Register 0 */
 #define SPRN_L1CSR1     0x3F3   /* L1 Cache Control and Status Register 1 */
+#define SPRN_MMUCSR0    0x3F4   /* MMU Control and Status Register 0 */
 #define SPRN_PIT        0x3DB   /* Programmable Interval Timer */
 #define SPRN_BUCSR      0x3F5   /* Branch Unit Control and Status */
 #define SPRN_L2CSR0     0x3F9   /* L2 Data Cache Control and Status Register 0 */
@@ -410,6 +411,12 @@
 #define L2CSR0_L2LOA    0x00000080      /* L2 Cache Lock Overflow Allocate */
 #define L2CSR0_L2LO     0x00000020      /* L2 Cache Lock Overflow */
 
+/* Bit definitions for MMUCSR0 */
+#define MMUCSR0_TLB1FI  0x00000002      /* TLB1 Flash invalidate */
+#define MMUCSR0_TLB0FI  0x00000004      /* TLB0 Flash invalidate */
+#define MMUCSR0_TLB2FI  0x00000040      /* TLB2 Flash invalidate */
+#define MMUCSR0_TLB3FI  0x00000020      /* TLB3 Flash invalidate */
+
 /* Bit definitions for SGR. */
 #define SGR_NORMAL      0               /* Speculative fetching allowed. */
 #define SGR_GUARDED     1               /* Speculative fetching disallowed. */
diff --git a/arch/powerpc/include/asm/sections.h b/arch/powerpc/include/asm/sections.h
index 07956f3e7844..6fbce725c710 100644
--- a/arch/powerpc/include/asm/sections.h
+++ b/arch/powerpc/include/asm/sections.h
@@ -18,6 +18,12 @@ static inline int in_kernel_text(unsigned long addr)
         return 0;
 }
 
+static inline int overlaps_kernel_text(unsigned long start, unsigned long end)
+{
+        return start < (unsigned long)__init_end &&
+                (unsigned long)_stext < end;
+}
+
 #undef dereference_function_descriptor
 static inline void *dereference_function_descriptor(void *ptr)
 {
diff --git a/arch/powerpc/math-emu/sfp-machine.h b/arch/powerpc/include/asm/sfp-machine.h
index 4b17d83cfcdd..ced34f1dc8f8 100644
--- a/arch/powerpc/math-emu/sfp-machine.h
+++ b/arch/powerpc/include/asm/sfp-machine.h
@@ -79,27 +79,44 @@
  * #define _FP_DIV_MEAT_D(R,X,Y)   _FP_DIV_MEAT_2_udiv_64(D,R,X,Y)
  */
 
-#define _FP_MUL_MEAT_S(R,X,Y)   _FP_MUL_MEAT_1_wide(S,R,X,Y,umul_ppmm)
-#define _FP_MUL_MEAT_D(R,X,Y)   _FP_MUL_MEAT_2_wide(D,R,X,Y,umul_ppmm)
+#define _FP_MUL_MEAT_S(R,X,Y)   _FP_MUL_MEAT_1_wide(_FP_WFRACBITS_S,R,X,Y,umul_ppmm)
+#define _FP_MUL_MEAT_D(R,X,Y)   _FP_MUL_MEAT_2_wide(_FP_WFRACBITS_D,R,X,Y,umul_ppmm)
 
-#define _FP_DIV_MEAT_S(R,X,Y)   _FP_DIV_MEAT_1_udiv(S,R,X,Y)
-#define _FP_DIV_MEAT_D(R,X,Y)   _FP_DIV_MEAT_2_udiv_64(D,R,X,Y)
+#define _FP_DIV_MEAT_S(R,X,Y)   _FP_DIV_MEAT_1_udiv(S,R,X,Y)
+#define _FP_DIV_MEAT_D(R,X,Y)   _FP_DIV_MEAT_2_udiv(D,R,X,Y)
 
 /* These macros define what NaN looks like. They're supposed to expand to
  * a comma-separated set of 32bit unsigned ints that encode NaN.
  */
-#define _FP_NANFRAC_S           _FP_QNANBIT_S
-#define _FP_NANFRAC_D           _FP_QNANBIT_D, 0
-#define _FP_NANFRAC_Q           _FP_QNANBIT_Q, 0, 0, 0
+#define _FP_NANFRAC_S           ((_FP_QNANBIT_S << 1) - 1)
+#define _FP_NANFRAC_D           ((_FP_QNANBIT_D << 1) - 1), -1
+#define _FP_NANFRAC_Q           ((_FP_QNANBIT_Q << 1) - 1), -1, -1, -1
+#define _FP_NANSIGN_S           0
+#define _FP_NANSIGN_D           0
+#define _FP_NANSIGN_Q           0
 
 #define _FP_KEEPNANFRACP 1
 
+/* Exception flags.  We use the bit positions of the appropriate bits
+   in the FPSCR, which also correspond to the FE_* bits.  This makes
+   everything easier ;-).  */
+#define FP_EX_INVALID         (1 << (31 - 2))
+#define FP_EX_INVALID_SNAN      EFLAG_VXSNAN
+#define FP_EX_INVALID_ISI       EFLAG_VXISI
+#define FP_EX_INVALID_IDI       EFLAG_VXIDI
+#define FP_EX_INVALID_ZDZ       EFLAG_VXZDZ
+#define FP_EX_INVALID_IMZ       EFLAG_VXIMZ
+#define FP_EX_OVERFLOW        (1 << (31 - 3))
+#define FP_EX_UNDERFLOW       (1 << (31 - 4))
+#define FP_EX_DIVZERO         (1 << (31 - 5))
+#define FP_EX_INEXACT         (1 << (31 - 6))
+
 /* This macro appears to be called when both X and Y are NaNs, and
  * has to choose one and copy it to R. i386 goes for the larger of the
  * two, sparc64 just picks Y. I don't understand this at all so I'll
  * go with sparc64 because it's shorter :->   -- PMM
  */
-#define _FP_CHOOSENAN(fs, wc, R, X, Y)                  \
+#define _FP_CHOOSENAN(fs, wc, R, X, Y, OP)              \
   do {                                                  \
     R##_s = Y##_s;                                      \
     _FP_FRAC_COPY_##wc(R,Y);                            \
@@ -107,62 +124,6 @@
   } while (0)
 
 
-extern void fp_unpack_d(long *, unsigned long *, unsigned long *,
-                        long *, long *, void *);
-extern int  fp_pack_d(void *, long, unsigned long, unsigned long, long, long);
-extern int  fp_pack_ds(void *, long, unsigned long, unsigned long, long, long);
-
-#define __FP_UNPACK_RAW_1(fs, X, val)                   \
-  do {                                                  \
-    union _FP_UNION_##fs *_flo =                        \
-        (union _FP_UNION_##fs *)val;                    \
-                                                        \
-    X##_f = _flo->bits.frac;                            \
-    X##_e = _flo->bits.exp;                             \
-    X##_s = _flo->bits.sign;                            \
-  } while (0)
-
-#define __FP_UNPACK_RAW_2(fs, X, val)                   \
-  do {                                                  \
-    union _FP_UNION_##fs *_flo =                        \
-        (union _FP_UNION_##fs *)val;                    \
-                                                        \
-    X##_f0 = _flo->bits.frac0;                          \
-    X##_f1 = _flo->bits.frac1;                          \
-    X##_e  = _flo->bits.exp;                            \
-    X##_s  = _flo->bits.sign;                           \
-  } while (0)
-
-#define __FP_UNPACK_S(X,val)            \
-  do {                                  \
-    __FP_UNPACK_RAW_1(S,X,val);         \
-    _FP_UNPACK_CANONICAL(S,1,X);        \
-  } while (0)
-
-#define __FP_UNPACK_D(X,val)            \
-        fp_unpack_d(&X##_s, &X##_f1, &X##_f0, &X##_e, &X##_c, val)
-
-#define __FP_PACK_RAW_1(fs, val, X)                     \
-  do {                                                  \
-    union _FP_UNION_##fs *_flo =                        \
-        (union _FP_UNION_##fs *)val;                    \
-                                                        \
-    _flo->bits.frac = X##_f;                            \
-    _flo->bits.exp  = X##_e;                            \
-    _flo->bits.sign = X##_s;                            \
-  } while (0)
-
-#define __FP_PACK_RAW_2(fs, val, X)                     \
-  do {                                                  \
-    union _FP_UNION_##fs *_flo =                        \
-        (union _FP_UNION_##fs *)val;                    \
-                                                        \
-    _flo->bits.frac0 = X##_f0;                          \
-    _flo->bits.frac1 = X##_f1;                          \
-    _flo->bits.exp   = X##_e;                           \
-    _flo->bits.sign  = X##_s;                           \
-  } while (0)
-
 #include <linux/kernel.h>
 #include <linux/sched.h>
 
@@ -182,15 +143,30 @@ extern int  fp_pack_ds(void *, long, unsigned long, unsigned long, long, long);
 #define __FP_PACK_S(val,X)                      \
 ({  int __exc = _FP_PACK_CANONICAL(S,1,X);      \
     if(!__exc || !__FPU_TRAP_P(__exc))          \
-        __FP_PACK_RAW_1(S,val,X);               \
+        _FP_PACK_RAW_1_P(S,val,X);              \
     __exc;                                      \
 })
 
 #define __FP_PACK_D(val,X)                      \
-        fp_pack_d(val, X##_s, X##_f1, X##_f0, X##_e, X##_c)
-
-#define __FP_PACK_DS(val,X)                     \
-        fp_pack_ds(val, X##_s, X##_f1, X##_f0, X##_e, X##_c)
+   do {                                                                 \
+        _FP_PACK_CANONICAL(D, 2, X);                                    \
+        if (!FP_CUR_EXCEPTIONS || !__FPU_TRAP_P(FP_CUR_EXCEPTIONS))     \
+                _FP_PACK_RAW_2_P(D, val, X);                            \
+   } while (0)
+
+#define __FP_PACK_DS(val,X)                                                     \
+   do {                                                                         \
+           FP_DECL_S(__X);                                                      \
+           FP_CONV(S, D, 1, 2, __X, X);                                         \
+           _FP_PACK_CANONICAL(S, 1, __X);                                       \
+           if (!FP_CUR_EXCEPTIONS || !__FPU_TRAP_P(FP_CUR_EXCEPTIONS)) {        \
+                   _FP_UNPACK_CANONICAL(S, 1, __X);                             \
+                   FP_CONV(D, S, 2, 1, X, __X);                                 \
+                   _FP_PACK_CANONICAL(D, 2, X);                                 \
+                   if (!FP_CUR_EXCEPTIONS || !__FPU_TRAP_P(FP_CUR_EXCEPTIONS))  \
+                   _FP_PACK_RAW_2_P(D, val, X);                                 \
+           }                                                                    \
+   } while (0)
 
 /* Obtain the current rounding mode. */
 #define FP_ROUNDMODE                    \
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
index 4d28e1e4521b..1866cec4f967 100644
--- a/arch/powerpc/include/asm/smp.h
+++ b/arch/powerpc/include/asm/smp.h
@@ -56,9 +56,16 @@ extern int smp_hw_index[];
 
 #define raw_smp_processor_id()  (current_thread_info()->cpu)
 #define hard_smp_processor_id()         (smp_hw_index[smp_processor_id()])
-#define get_hard_smp_processor_id(cpu)  (smp_hw_index[(cpu)])
-#define set_hard_smp_processor_id(cpu, phys)\
-                                        (smp_hw_index[(cpu)] = (phys))
+
+static inline int get_hard_smp_processor_id(int cpu)
+{
+        return smp_hw_index[cpu];
+}
+
+static inline void set_hard_smp_processor_id(int cpu, int phys)
+{
+        smp_hw_index[cpu] = phys;
+}
 #endif
 
 DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
@@ -86,15 +93,21 @@ extern void __cpu_die(unsigned int cpu);
 
 #else
 /* for UP */
-#define hard_smp_processor_id()         0
+#define hard_smp_processor_id()         get_hard_smp_processor_id(0)
 #define smp_setup_cpu_maps()
 
 #endif /* CONFIG_SMP */
 
 #ifdef CONFIG_PPC64
-#define get_hard_smp_processor_id(CPU) (paca[(CPU)].hw_cpu_id)
-#define set_hard_smp_processor_id(CPU, VAL) \
-        do { (paca[(CPU)].hw_cpu_id = (VAL)); } while (0)
+static inline int get_hard_smp_processor_id(int cpu)
+{
+        return paca[cpu].hw_cpu_id;
+}
+
+static inline void set_hard_smp_processor_id(int cpu, int phys)
+{
+        paca[cpu].hw_cpu_id = phys;
+}
 
 extern void smp_release_cpus(void);
 
@@ -102,10 +115,17 @@ extern void smp_release_cpus(void);
 /* 32-bit */
 #ifndef CONFIG_SMP
 extern int boot_cpuid_phys;
-#define get_hard_smp_processor_id(cpu)  boot_cpuid_phys
-#define set_hard_smp_processor_id(cpu, phys)
-#endif
-#endif
+static inline int get_hard_smp_processor_id(int cpu)
+{
+        return boot_cpuid_phys;
+}
+
+static inline void set_hard_smp_processor_id(int cpu, int phys)
+{
+        boot_cpuid_phys = phys;
+}
+#endif /* !CONFIG_SMP */
+#endif /* !CONFIG_PPC64 */
 
 extern int smt_enabled_at_boot;
 
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h
index f6cc7a43b4fa..803def236654 100644
--- a/arch/powerpc/include/asm/systbl.h
+++ b/arch/powerpc/include/asm/systbl.h
@@ -32,7 +32,7 @@ COMPAT_SYS_SPU(stime)
 COMPAT_SYS(ptrace)
 SYSCALL_SPU(alarm)
 OLDSYS(fstat)
-COMPAT_SYS(pause)
+SYSCALL(pause)
 COMPAT_SYS(utime)
 SYSCALL(ni_syscall)
 SYSCALL(ni_syscall)
diff --git a/arch/powerpc/include/asm/tlbflush.h b/arch/powerpc/include/asm/tlbflush.h
index 361cd5c7a32b..a2c6bfd85fb7 100644
--- a/arch/powerpc/include/asm/tlbflush.h
+++ b/arch/powerpc/include/asm/tlbflush.h
@@ -29,6 +29,9 @@
 #include <linux/mm.h>
 
 extern void _tlbie(unsigned long address, unsigned int pid);
+extern void _tlbil_all(void);
+extern void _tlbil_pid(unsigned int pid);
+extern void _tlbil_va(unsigned long address, unsigned int pid);
 
 #if defined(CONFIG_40x) || defined(CONFIG_8xx)
 #define _tlbia()        asm volatile ("tlbia; sync" : : : "memory")
@@ -38,31 +41,31 @@ extern void _tlbia(void);
 
 static inline void flush_tlb_mm(struct mm_struct *mm)
 {
-        _tlbia();
+        _tlbil_pid(mm->context.id);
 }
 
 static inline void flush_tlb_page(struct vm_area_struct *vma,
                                   unsigned long vmaddr)
 {
-        _tlbie(vmaddr, vma ? vma->vm_mm->context.id : 0);
+        _tlbil_va(vmaddr, vma ? vma->vm_mm->context.id : 0);
 }
 
 static inline void flush_tlb_page_nohash(struct vm_area_struct *vma,
                                          unsigned long vmaddr)
 {
-        _tlbie(vmaddr, vma ? vma->vm_mm->context.id : 0);
+        flush_tlb_page(vma, vmaddr);
 }
 
 static inline void flush_tlb_range(struct vm_area_struct *vma,
                                    unsigned long start, unsigned long end)
 {
-        _tlbia();
+        _tlbil_pid(vma->vm_mm->context.id);
 }
 
 static inline void flush_tlb_kernel_range(unsigned long start,
                                           unsigned long end)
 {
-        _tlbia();
+        _tlbil_pid(0);
 }
 
 #elif defined(CONFIG_PPC32)
diff --git a/arch/powerpc/include/asm/types.h b/arch/powerpc/include/asm/types.h
index d3374bc865ba..a9a9262e84a3 100644
--- a/arch/powerpc/include/asm/types.h
+++ b/arch/powerpc/include/asm/types.h
@@ -55,7 +55,7 @@ typedef u64 phys_addr_t;
 typedef u32 phys_addr_t;
 #endif
 
-#ifdef __powerpc64__
+#if defined(__powerpc64__) || defined(CONFIG_PHYS_64BIT)
 typedef u64 dma_addr_t;
 #else
 typedef u32 dma_addr_t;
diff --git a/arch/powerpc/kernel/.gitignore b/arch/powerpc/kernel/.gitignore
new file mode 100644
index 000000000000..c5f676c3c224
--- /dev/null
+++ b/arch/powerpc/kernel/.gitignore
@@ -0,0 +1 @@
+vmlinux.lds
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index 946daea780f1..fdb58253fa5b 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -28,13 +28,14 @@ endif
 obj-y                           := cputable.o ptrace.o syscalls.o \
                                    irq.o align.o signal_32.o pmc.o vdso.o \
                                    init_task.o process.o systbl.o idle.o \
-                                   signal.o
+                                   signal.o sysfs.o
 obj-y                           += vdso32/
 obj-$(CONFIG_PPC64)             += setup_64.o sys_ppc32.o \
                                    signal_64.o ptrace32.o \
                                    paca.o cpu_setup_ppc970.o \
                                    cpu_setup_pa6t.o \
-                                   firmware.o sysfs.o nvram_64.o
+                                   firmware.o nvram_64.o
+obj64-$(CONFIG_RELOCATABLE)     += reloc_64.o
 obj-$(CONFIG_PPC64)             += vdso64/
 obj-$(CONFIG_ALTIVEC)           += vecemu.o vector.o
 obj-$(CONFIG_PPC_970_NAP)       += idle_power4.o
@@ -69,10 +70,10 @@ extra-$(CONFIG_8xx)		:= head_8xx.o
 extra-y                         += vmlinux.lds
 
 obj-y                           += time.o prom.o traps.o setup-common.o \
-                                   udbg.o misc.o io.o \
+                                   udbg.o misc.o io.o dma.o \
                                    misc_$(CONFIG_WORD_SIZE).o
 obj-$(CONFIG_PPC32)             += entry_32.o setup_32.o
-obj-$(CONFIG_PPC64)             += dma_64.o iommu.o
+obj-$(CONFIG_PPC64)             += dma-iommu.o iommu.o
 obj-$(CONFIG_KGDB)              += kgdb.o
 obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o
 obj-$(CONFIG_MODULES)           += ppc_ksyms.o
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 92768d3006f7..09febc582584 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -122,6 +122,8 @@ int main(void)
         DEFINE(PACASTABRR, offsetof(struct paca_struct, stab_rr));
         DEFINE(PACAR1, offsetof(struct paca_struct, saved_r1));
         DEFINE(PACATOC, offsetof(struct paca_struct, kernel_toc));
+        DEFINE(PACAKBASE, offsetof(struct paca_struct, kernelbase));
+        DEFINE(PACAKMSR, offsetof(struct paca_struct, kernel_msr));
         DEFINE(PACASOFTIRQEN, offsetof(struct paca_struct, soft_enabled));
         DEFINE(PACAHARDIRQEN, offsetof(struct paca_struct, hard_enabled));
         DEFINE(PACASLBCACHE, offsetof(struct paca_struct, slb_cache));
@@ -350,6 +352,7 @@ int main(void)
 #endif
 
         DEFINE(PGD_TABLE_SIZE, PGD_TABLE_SIZE);
+        DEFINE(PTE_SIZE, sizeof(pte_t));
 
 #ifdef CONFIG_KVM
         DEFINE(TLBE_BYTES, sizeof(struct tlbe));
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
index d8f0329b1344..26e58630ed7b 100644
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
@@ -442,28 +442,26 @@ void btext_drawtext(const char *c, unsigned int len)
 
 void btext_drawhex(unsigned long v)
 {
-        char *hex_table = "0123456789abcdef";
-
         if (!boot_text_mapped)
                 return;
 #ifdef CONFIG_PPC64
-        btext_drawchar(hex_table[(v >> 60) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 56) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 52) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 48) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 44) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 40) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 36) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 32) & 0x0000000FUL]);
+        btext_drawchar(hex_asc_hi(v >> 56));
+        btext_drawchar(hex_asc_lo(v >> 56));
+        btext_drawchar(hex_asc_hi(v >> 48));
+        btext_drawchar(hex_asc_lo(v >> 48));
+        btext_drawchar(hex_asc_hi(v >> 40));
+        btext_drawchar(hex_asc_lo(v >> 40));
+        btext_drawchar(hex_asc_hi(v >> 32));
+        btext_drawchar(hex_asc_lo(v >> 32));
 #endif
-        btext_drawchar(hex_table[(v >> 28) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 24) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 20) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 16) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >> 12) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >>  8) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >>  4) & 0x0000000FUL]);
-        btext_drawchar(hex_table[(v >>  0) & 0x0000000FUL]);
+        btext_drawchar(hex_asc_hi(v >> 24));
+        btext_drawchar(hex_asc_lo(v >> 24));
+        btext_drawchar(hex_asc_hi(v >> 16));
+        btext_drawchar(hex_asc_lo(v >> 16));
+        btext_drawchar(hex_asc_hi(v >> 8));
+        btext_drawchar(hex_asc_lo(v >> 8));
+        btext_drawchar(hex_asc_hi(v));
+        btext_drawchar(hex_asc_lo(v));
         btext_drawchar(' ');
 }
 
diff --git a/arch/powerpc/kernel/cpu_setup_ppc970.S b/arch/powerpc/kernel/cpu_setup_ppc970.S
index bf118c385752..27f2507279d8 100644
--- a/arch/powerpc/kernel/cpu_setup_ppc970.S
+++ b/arch/powerpc/kernel/cpu_setup_ppc970.S
@@ -110,7 +110,7 @@ load_hids:
         isync
 
         /* Save away cpu state */
-        LOAD_REG_IMMEDIATE(r5,cpu_state_storage)
+        LOAD_REG_ADDR(r5,cpu_state_storage)
 
         /* Save HID0,1,4 and 5 */
         mfspr   r3,SPRN_HID0
@@ -134,7 +134,7 @@ _GLOBAL(__restore_cpu_ppc970)
         rldicl. r0,r0,4,63
         beqlr
 
-        LOAD_REG_IMMEDIATE(r5,cpu_state_storage)
+        LOAD_REG_ADDR(r5,cpu_state_storage)
         /* Before accessing memory, we make sure rm_ci is clear */
         li      r0,0
         mfspr   r3,SPRN_HID4
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 25c273c761d1..e70d0483fb4e 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -610,6 +610,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_750cx,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc750",
@@ -623,6 +624,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_750cx,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc750",
@@ -636,6 +638,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_750cx,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc750",
@@ -649,6 +652,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_750,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc750",
@@ -662,6 +666,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_750,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc750",
@@ -675,6 +680,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_750,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc750",
@@ -688,6 +694,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_750,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc750",
@@ -701,6 +708,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_750fx,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc750",
@@ -714,6 +722,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_750fx,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc750",
@@ -727,6 +736,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_IBM,
                 .cpu_setup              = __setup_cpu_750,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc750",
@@ -741,6 +751,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_7400,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc7400",
@@ -755,6 +766,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_7400,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc7400",
@@ -769,6 +781,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_7410,
                 .machine_check          = machine_check_generic,
                 .platform               = "ppc7400",
@@ -783,6 +796,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_745x,
                 .oprofile_cpu_type      = "ppc/7450",
                 .oprofile_type          = PPC_OPROFILE_G4,
@@ -799,6 +813,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_745x,
                 .oprofile_cpu_type      = "ppc/7450",
                 .oprofile_type          = PPC_OPROFILE_G4,
@@ -815,6 +830,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_745x,
                 .oprofile_cpu_type      = "ppc/7450",
                 .oprofile_type          = PPC_OPROFILE_G4,
@@ -831,6 +847,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_745x,
                 .oprofile_cpu_type      = "ppc/7450",
                 .oprofile_type          = PPC_OPROFILE_G4,
@@ -847,6 +864,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_745x,
                 .oprofile_cpu_type      = "ppc/7450",
                 .oprofile_type          = PPC_OPROFILE_G4,
@@ -863,6 +881,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_745x,
                 .oprofile_cpu_type      = "ppc/7450",
                 .oprofile_type          = PPC_OPROFILE_G4,
@@ -879,6 +898,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_745x,
                 .oprofile_cpu_type      = "ppc/7450",
                 .oprofile_type          = PPC_OPROFILE_G4,
@@ -895,6 +915,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_745x,
                 .oprofile_cpu_type      = "ppc/7450",
                 .oprofile_type          = PPC_OPROFILE_G4,
@@ -910,6 +931,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_745x,
                 .oprofile_cpu_type      = "ppc/7450",
                 .oprofile_type          = PPC_OPROFILE_G4,
@@ -926,6 +948,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_745x,
                 .oprofile_cpu_type      = "ppc/7450",
                 .oprofile_type          = PPC_OPROFILE_G4,
@@ -942,6 +965,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 6,
+                .pmc_type               = PPC_PMC_G4,
                 .cpu_setup              = __setup_cpu_745x,
                 .oprofile_cpu_type      = "ppc/7450",
                 .oprofile_type          = PPC_OPROFILE_G4,
diff --git a/arch/powerpc/kernel/dma_64.c b/arch/powerpc/kernel/dma-iommu.c
index ae5708e3a312..49248f89ce23 100644
--- a/arch/powerpc/kernel/dma_64.c
+++ b/arch/powerpc/kernel/dma-iommu.c
@@ -2,14 +2,10 @@
  * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corporation
  *
  * Provide default implementations of the DMA mapping callbacks for
- * directly mapped busses and busses using the iommu infrastructure
+ * busses using the iommu infrastructure
  */
 
-#include <linux/device.h>
-#include <linux/dma-mapping.h>
-#include <asm/bug.h>
 #include <asm/iommu.h>
-#include <asm/abs_addr.h>
 
 /*
  * Generic iommu implementation
@@ -24,7 +20,7 @@ static void *dma_iommu_alloc_coherent(struct device *dev, size_t size,
 {
         return iommu_alloc_coherent(dev, dev->archdata.dma_data, size,
                                     dma_handle, device_to_mask(dev), flag,
-                                    dev->archdata.numa_node);
+                                    dev_to_node(dev));
 }
 
 static void dma_iommu_free_coherent(struct device *dev, size_t size,
@@ -105,96 +101,3 @@ struct dma_mapping_ops dma_iommu_ops = {
         .dma_supported  = dma_iommu_dma_supported,
 };
 EXPORT_SYMBOL(dma_iommu_ops);
-
-/*
- * Generic direct DMA implementation
- *
- * This implementation supports a per-device offset that can be applied if
- * the address at which memory is visible to devices is not 0. Platform code
- * can set archdata.dma_data to an unsigned long holding the offset. By
- * default the offset is zero.
- */
-
-static unsigned long get_dma_direct_offset(struct device *dev)
-{
-        return (unsigned long)dev->archdata.dma_data;
-}
-
-static void *dma_direct_alloc_coherent(struct device *dev, size_t size,
-                                       dma_addr_t *dma_handle, gfp_t flag)
-{
-        struct page *page;
-        void *ret;
-        int node = dev->archdata.numa_node;
-
-        page = alloc_pages_node(node, flag, get_order(size));
-        if (page == NULL)
-                return NULL;
-        ret = page_address(page);
-        memset(ret, 0, size);
-        *dma_handle = virt_to_abs(ret) + get_dma_direct_offset(dev);
-
-        return ret;
-}
-
-static void dma_direct_free_coherent(struct device *dev, size_t size,
-                                     void *vaddr, dma_addr_t dma_handle)
-{
-        free_pages((unsigned long)vaddr, get_order(size));
-}
-
-static dma_addr_t dma_direct_map_single(struct device *dev, void *ptr,
-                                        size_t size,
-                                        enum dma_data_direction direction,
-                                        struct dma_attrs *attrs)
-{
-        return virt_to_abs(ptr) + get_dma_direct_offset(dev);
-}
-
-static void dma_direct_unmap_single(struct device *dev, dma_addr_t dma_addr,
-                                    size_t size,
-                                    enum dma_data_direction direction,
-                                    struct dma_attrs *attrs)
-{
-}
-
-static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
-                             int nents, enum dma_data_direction direction,
-                             struct dma_attrs *attrs)
-{
-        struct scatterlist *sg;
-        int i;
-
-        for_each_sg(sgl, sg, nents, i) {
-                sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev);
-                sg->dma_length = sg->length;
-        }
-
-        return nents;
-}
-
-static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,
-                                int nents, enum dma_data_direction direction,
-                                struct dma_attrs *attrs)
-{
-}
-
-static int dma_direct_dma_supported(struct device *dev, u64 mask)
-{
-        /* Could be improved to check for memory though it better be
-         * done via some global so platforms can set the limit in case
-         * they have limited DMA windows
-         */
-        return mask >= DMA_32BIT_MASK;
-}
-
-struct dma_mapping_ops dma_direct_ops = {
-        .alloc_coherent = dma_direct_alloc_coherent,
-        .free_coherent  = dma_direct_free_coherent,
-        .map_single     = dma_direct_map_single,
-        .unmap_single   = dma_direct_unmap_single,
-        .map_sg         = dma_direct_map_sg,
-        .unmap_sg       = dma_direct_unmap_sg,
-        .dma_supported  = dma_direct_dma_supported,
-};
-EXPORT_SYMBOL(dma_direct_ops);
diff --git a/arch/powerpc/kernel/dma.c b/arch/powerpc/kernel/dma.c
new file mode 100644
index 000000000000..1562daf8839a
--- /dev/null
+++ b/arch/powerpc/kernel/dma.c
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2006 Benjamin Herrenschmidt, IBM Corporation
+ *
+ * Provide default implementations of the DMA mapping callbacks for
+ * directly mapped busses.
+ */
+
+#include <linux/device.h>
+#include <linux/dma-mapping.h>
+#include <asm/bug.h>
+#include <asm/abs_addr.h>
+
+/*
+ * Generic direct DMA implementation
+ *
+ * This implementation supports a per-device offset that can be applied if
+ * the address at which memory is visible to devices is not 0. Platform code
+ * can set archdata.dma_data to an unsigned long holding the offset. By
+ * default the offset is PCI_DRAM_OFFSET.
+ */
+
+static unsigned long get_dma_direct_offset(struct device *dev)
+{
+        if (dev)
+                return (unsigned long)dev->archdata.dma_data;
+
+        return PCI_DRAM_OFFSET;
+}
+
+void *dma_direct_alloc_coherent(struct device *dev, size_t size,
+                                dma_addr_t *dma_handle, gfp_t flag)
+{
+        void *ret;
+#ifdef CONFIG_NOT_COHERENT_CACHE
+        ret = __dma_alloc_coherent(size, dma_handle, flag);
+        if (ret == NULL)
+                return NULL;
+        *dma_handle += get_dma_direct_offset(dev);
+        return ret;
+#else
+        struct page *page;
+        int node = dev_to_node(dev);
+
+        /* ignore region specifiers */
+        flag  &= ~(__GFP_HIGHMEM);
+
+        page = alloc_pages_node(node, flag, get_order(size));
+        if (page == NULL)
+                return NULL;
+        ret = page_address(page);
+        memset(ret, 0, size);
+        *dma_handle = virt_to_abs(ret) + get_dma_direct_offset(dev);
+
+        return ret;
+#endif
+}
+
+void dma_direct_free_coherent(struct device *dev, size_t size,
+                              void *vaddr, dma_addr_t dma_handle)
+{
+#ifdef CONFIG_NOT_COHERENT_CACHE
+        __dma_free_coherent(size, vaddr);
+#else
+        free_pages((unsigned long)vaddr, get_order(size));
+#endif
+}
+
+static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
+                             int nents, enum dma_data_direction direction,
+                             struct dma_attrs *attrs)
+{
+        struct scatterlist *sg;
+        int i;
+
+        for_each_sg(sgl, sg, nents, i) {
+                sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev);
+                sg->dma_length = sg->length;
+        }
+
+        return nents;
+}
+
+static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,
+                                int nents, enum dma_data_direction direction,
+                                struct dma_attrs *attrs)
+{
+}
+
+static int dma_direct_dma_supported(struct device *dev, u64 mask)
+{
+#ifdef CONFIG_PPC64
+        /* Could be improved to check for memory though it better be
+         * done via some global so platforms can set the limit in case
+         * they have limited DMA windows
+         */
+        return mask >= DMA_32BIT_MASK;
+#else
+        return 1;
+#endif
+}
+
+static inline dma_addr_t dma_direct_map_page(struct device *dev,
+                                             struct page *page,
+                                             unsigned long offset,
+                                             size_t size,
+                                             enum dma_data_direction dir,
+                                             struct dma_attrs *attrs)
+{
+        BUG_ON(dir == DMA_NONE);
+        __dma_sync_page(page, offset, size, dir);
+        return page_to_phys(page) + offset + get_dma_direct_offset(dev);
+}
+
+static inline void dma_direct_unmap_page(struct device *dev,
+                                         dma_addr_t dma_address,
+                                         size_t size,
+                                         enum dma_data_direction direction,
+                                         struct dma_attrs *attrs)
+{
+}
+
+struct dma_mapping_ops dma_direct_ops = {
+        .alloc_coherent = dma_direct_alloc_coherent,
+        .free_coherent  = dma_direct_free_coherent,
+        .map_sg         = dma_direct_map_sg,
+        .unmap_sg       = dma_direct_unmap_sg,
+        .dma_supported  = dma_direct_dma_supported,
+        .map_page       = dma_direct_map_page,
+        .unmap_page     = dma_direct_unmap_page,
+};
+EXPORT_SYMBOL(dma_direct_ops);
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 2d802e97097c..fd8b4bae9b04 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -512,31 +512,12 @@ _GLOBAL(ret_from_except_lite)
 #endif
 
 restore:
-        ld      r5,SOFTE(r1)
-#ifdef CONFIG_PPC_ISERIES
 BEGIN_FW_FTR_SECTION
-        cmpdi   0,r5,0
-        beq     4f
-        /* Check for pending interrupts (iSeries) */
-        ld      r3,PACALPPACAPTR(r13)
-        ld      r3,LPPACAANYINT(r3)
-        cmpdi   r3,0
-        beq+    4f                      /* skip do_IRQ if no interrupts */
-
-        li      r3,0
-        stb     r3,PACASOFTIRQEN(r13)   /* ensure we are soft-disabled */
-#ifdef CONFIG_TRACE_IRQFLAGS
-        bl      .trace_hardirqs_off
-        mfmsr   r10
-#endif
-        ori     r10,r10,MSR_EE
-        mtmsrd  r10                     /* hard-enable again */
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .do_IRQ
-        b       .ret_from_except_lite           /* loop back and handle more */
-4:
-END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
-#endif
+        ld      r5,SOFTE(r1)
+FW_FTR_SECTION_ELSE
+        b       iseries_check_pending_irqs
+ALT_FW_FTR_SECTION_END_IFCLR(FW_FEATURE_ISERIES)
+2:
         TRACE_AND_RESTORE_IRQ(r5);
 
         /* extract EE bit and use it to restore paca->hard_enabled */
@@ -592,6 +573,30 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
         rfid
         b       .       /* prevent speculative execution */
 
+iseries_check_pending_irqs:
+#ifdef CONFIG_PPC_ISERIES
+        ld      r5,SOFTE(r1)
+        cmpdi   0,r5,0
+        beq     2b
+        /* Check for pending interrupts (iSeries) */
+        ld      r3,PACALPPACAPTR(r13)
+        ld      r3,LPPACAANYINT(r3)
+        cmpdi   r3,0
+        beq+    2b                      /* skip do_IRQ if no interrupts */
+
+        li      r3,0
+        stb     r3,PACASOFTIRQEN(r13)   /* ensure we are soft-disabled */
+#ifdef CONFIG_TRACE_IRQFLAGS
+        bl      .trace_hardirqs_off
+        mfmsr   r10
+#endif
+        ori     r10,r10,MSR_EE
+        mtmsrd  r10                     /* hard-enable again */
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .do_IRQ
+        b       .ret_from_except_lite           /* loop back and handle more */
+#endif
+
 do_work:
 #ifdef CONFIG_PREEMPT
         andi.   r0,r3,MSR_PR    /* Returning to user mode? */
@@ -685,10 +690,6 @@ _GLOBAL(enter_rtas)
         std     r7,_DAR(r1)
         mfdsisr r8
         std     r8,_DSISR(r1)
-        mfsrr0  r9
-        std     r9,_SRR0(r1)
-        mfsrr1  r10
-        std     r10,_SRR1(r1)
 
         /* Temporary workaround to clear CR until RTAS can be modified to
          * ignore all bits.
@@ -749,6 +750,10 @@ _STATIC(rtas_return_loc)
         mfspr   r4,SPRN_SPRG3           /* Get PACA */
         clrldi  r4,r4,2                 /* convert to realmode address */
 
+        bcl     20,31,$+4
+0:      mflr    r3
+        ld      r3,(1f-0b)(r3)          /* get &.rtas_restore_regs */
+
         mfmsr   r6
         li      r0,MSR_RI
         andc    r6,r6,r0
@@ -756,7 +761,6 @@ _STATIC(rtas_return_loc)
         mtmsrd  r6
         
         ld      r1,PACAR1(r4)           /* Restore our SP */
-        LOAD_REG_IMMEDIATE(r3,.rtas_restore_regs)
         ld      r4,PACASAVEDMSR(r4)     /* Restore our MSR */
 
         mtspr   SPRN_SRR0,r3
@@ -764,6 +768,9 @@ _STATIC(rtas_return_loc)
         rfid
         b       .       /* prevent speculative execution */
 
+        .align  3
+1:      .llong  .rtas_restore_regs
+
 _STATIC(rtas_restore_regs)
         /* relocation is on at this point */
         REST_GPR(2, r1)                 /* Restore the TOC */
@@ -783,10 +790,6 @@ _STATIC(rtas_restore_regs)
         mtdar   r7
         ld      r8,_DSISR(r1)
         mtdsisr r8
-        ld      r9,_SRR0(r1)
-        mtsrr0  r9
-        ld      r10,_SRR1(r1)
-        mtsrr1  r10
 
         addi    r1,r1,RTAS_FRAME_SIZE   /* Unstack our frame */
         ld      r0,16(r1)               /* get return address */
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 8bb657519299..0c326823c6d4 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -110,6 +110,12 @@ __start:
 #ifdef CONFIG_PPC_MULTIPLATFORM
         cmpwi   0,r5,0
         beq     1f
+
+        /* find out where we are now */
+        bcl     20,31,$+4
+0:      mflr    r8                      /* r8 = runtime addr here */
+        addis   r8,r8,(_stext - 0b)@ha
+        addi    r8,r8,(_stext - 0b)@l   /* current runtime base addr */
         bl      prom_init
         trap
 #endif
@@ -369,13 +375,13 @@ i##n:								\
 DataAccess:
         EXCEPTION_PROLOG
         mfspr   r10,SPRN_DSISR
+        stw     r10,_DSISR(r11)
         andis.  r0,r10,0xa470           /* weird error? */
         bne     1f                      /* if not, try to put a PTE */
         mfspr   r4,SPRN_DAR             /* into the hash table */
         rlwinm  r3,r10,32-15,21,21      /* DSISR_STORE -> _PAGE_RW */
         bl      hash_page
-1:      stw     r10,_DSISR(r11)
-        mr      r5,r10
+1:      lwz     r5,_DSISR(r11)          /* get DSISR value */
         mfspr   r4,SPRN_DAR
         EXC_XFER_EE_LITE(0x300, handle_page_fault)
 
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index cc8fb474d520..84856bee33a5 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -82,7 +82,11 @@ END_FTR_SECTION(0, 1)
         /* Catch branch to 0 in real mode */
         trap
 
-        /* Secondary processors spin on this value until it goes to 1. */
+        /* Secondary processors spin on this value until it becomes nonzero.
+         * When it does it contains the real address of the descriptor
+         * of the function that the cpu should jump to to continue
+         * initialization.
+         */
         .globl  __secondary_hold_spinloop
 __secondary_hold_spinloop:
         .llong  0x0
@@ -109,8 +113,11 @@ __secondary_hold_acknowledge:
  * before the bulk of the kernel has been relocated.  This code
  * is relocated to physical address 0x60 before prom_init is run.
  * All of it must fit below the first exception vector at 0x100.
+ * Use .globl here not _GLOBAL because we want __secondary_hold
+ * to be the actual text address, not a descriptor.
  */
-_GLOBAL(__secondary_hold)
+        .globl  __secondary_hold
+__secondary_hold:
         mfmsr   r24
         ori     r24,r24,MSR_RI
         mtmsrd  r24                     /* RI on */
@@ -121,16 +128,16 @@ _GLOBAL(__secondary_hold)
         /* Tell the master cpu we're here */
         /* Relocation is off & we are located at an address less */
         /* than 0x100, so only need to grab low order offset.    */
-        std     r24,__secondary_hold_acknowledge@l(0)
+        std     r24,__secondary_hold_acknowledge-_stext(0)
         sync
 
         /* All secondary cpus wait here until told to start. */
-100:    ld      r4,__secondary_hold_spinloop@l(0)
-        cmpdi   0,r4,1
-        bne     100b
+100:    ld      r4,__secondary_hold_spinloop-_stext(0)
+        cmpdi   0,r4,0
+        beq     100b
 
 #if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)
-        LOAD_REG_IMMEDIATE(r4, .generic_secondary_smp_init)
+        ld      r4,0(r4)                /* deref function descriptor */
         mtctr   r4
         mr      r3,r24
         bctr
@@ -147,6 +154,10 @@ exception_marker:
 /*
  * This is the start of the interrupt handlers for pSeries
  * This code runs with relocation off.
+ * Code from here to __end_interrupts gets copied down to real
+ * address 0x100 when we are running a relocatable kernel.
+ * Therefore any relative branches in this section must only
+ * branch to labels in this section.
  */
         . = 0x100
         .globl __start_interrupts
@@ -200,7 +211,20 @@ data_access_slb_pSeries:
         mfspr   r10,SPRN_SPRG1
         std     r10,PACA_EXSLB+EX_R13(r13)
         mfspr   r12,SPRN_SRR1           /* and SRR1 */
-        b       .slb_miss_realmode      /* Rel. branch works in real mode */
+#ifndef CONFIG_RELOCATABLE
+        b       .slb_miss_realmode
+#else
+        /*
+         * We can't just use a direct branch to .slb_miss_realmode
+         * because the distance from here to there depends on where
+         * the kernel ends up being put.
+         */
+        mfctr   r11
+        ld      r10,PACAKBASE(r13)
+        LOAD_HANDLER(r10, .slb_miss_realmode)
+        mtctr   r10
+        bctr
+#endif
 
         STD_EXCEPTION_PSERIES(0x400, instruction_access)
 
@@ -225,7 +249,15 @@ instruction_access_slb_pSeries:
         mfspr   r10,SPRN_SPRG1
         std     r10,PACA_EXSLB+EX_R13(r13)
         mfspr   r12,SPRN_SRR1           /* and SRR1 */
-        b       .slb_miss_realmode      /* Rel. branch works in real mode */
+#ifndef CONFIG_RELOCATABLE
+        b       .slb_miss_realmode
+#else
+        mfctr   r11
+        ld      r10,PACAKBASE(r13)
+        LOAD_HANDLER(r10, .slb_miss_realmode)
+        mtctr   r10
+        bctr
+#endif
 
         MASKABLE_EXCEPTION_PSERIES(0x500, hardware_interrupt)
         STD_EXCEPTION_PSERIES(0x600, alignment)
@@ -244,14 +276,12 @@ BEGIN_FTR_SECTION
         beq-    1f
 END_FTR_SECTION_IFSET(CPU_FTR_REAL_LE)
         mr      r9,r13
-        mfmsr   r10
         mfspr   r13,SPRN_SPRG3
         mfspr   r11,SPRN_SRR0
-        clrrdi  r12,r13,32
-        oris    r12,r12,system_call_common@h
-        ori     r12,r12,system_call_common@l
+        ld      r12,PACAKBASE(r13)
+        ld      r10,PACAKMSR(r13)
+        LOAD_HANDLER(r12, system_call_entry)
         mtspr   SPRN_SRR0,r12
-        ori     r10,r10,MSR_IR|MSR_DR|MSR_RI
         mfspr   r12,SPRN_SRR1
         mtspr   SPRN_SRR1,r10
         rfid
@@ -325,16 +355,32 @@ do_stab_bolted_pSeries:
         mfspr   r12,SPRN_SPRG2
         EXCEPTION_PROLOG_PSERIES(PACA_EXSLB, .do_stab_bolted)
 
+#ifdef CONFIG_PPC_PSERIES
+/*
+ * Vectors for the FWNMI option.  Share common code.
+ */
+        .globl system_reset_fwnmi
+      .align 7
+system_reset_fwnmi:
+        HMT_MEDIUM
+        mtspr   SPRN_SPRG1,r13          /* save r13 */
+        EXCEPTION_PROLOG_PSERIES(PACA_EXGEN, system_reset_common)
+
+        .globl machine_check_fwnmi
+      .align 7
+machine_check_fwnmi:
+        HMT_MEDIUM
+        mtspr   SPRN_SPRG1,r13          /* save r13 */
+        EXCEPTION_PROLOG_PSERIES(PACA_EXMC, machine_check_common)
+
+#endif /* CONFIG_PPC_PSERIES */
+
+#ifdef __DISABLED__
 /*
- * We have some room here  we use that to put
- * the peries slb miss user trampoline code so it's reasonably
- * away from slb_miss_user_common to avoid problems with rfid
- *
  * This is used for when the SLB miss handler has to go virtual,
  * which doesn't happen for now anymore but will once we re-implement
  * dynamic VSIDs for shared page tables
  */
-#ifdef __DISABLED__
 slb_miss_user_pseries:
         std     r10,PACA_EXGEN+EX_R10(r13)
         std     r11,PACA_EXGEN+EX_R11(r13)
@@ -357,25 +403,17 @@ slb_miss_user_pseries:
         b       .                               /* prevent spec. execution */
 #endif /* __DISABLED__ */
 
-#ifdef CONFIG_PPC_PSERIES
+        .align  7
+        .globl  __end_interrupts
+__end_interrupts:
+
 /*
- * Vectors for the FWNMI option.  Share common code.
+ * Code from here down to __end_handlers is invoked from the
+ * exception prologs above.  Because the prologs assemble the
+ * addresses of these handlers using the LOAD_HANDLER macro,
+ * which uses an addi instruction, these handlers must be in
+ * the first 32k of the kernel image.
  */
-        .globl system_reset_fwnmi
-      .align 7
-system_reset_fwnmi:
-        HMT_MEDIUM
-        mtspr   SPRN_SPRG1,r13          /* save r13 */
-        EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXGEN, system_reset_common)
-
-        .globl machine_check_fwnmi
-      .align 7
-machine_check_fwnmi:
-        HMT_MEDIUM
-        mtspr   SPRN_SPRG1,r13          /* save r13 */
-        EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXMC, machine_check_common)
-
-#endif /* CONFIG_PPC_PSERIES */
 
 /*** Common interrupt handlers ***/
 
@@ -414,6 +452,10 @@ machine_check_common:
         STD_EXCEPTION_COMMON(0x1800, cbe_thermal, .cbe_thermal_exception)
 #endif /* CONFIG_CBE_RAS */
 
+        .align  7
+system_call_entry:
+        b       system_call_common
+
 /*
  * Here we have detected that the kernel stack pointer is bad.
  * R9 contains the saved CR, r13 points to the paca,
@@ -457,65 +499,6 @@ bad_stack:
         b       1b
 
 /*
- * Return from an exception with minimal checks.
- * The caller is assumed to have done EXCEPTION_PROLOG_COMMON.
- * If interrupts have been enabled, or anything has been
- * done that might have changed the scheduling status of
- * any task or sent any task a signal, you should use
- * ret_from_except or ret_from_except_lite instead of this.
- */
-fast_exc_return_irq:                    /* restores irq state too */
-        ld      r3,SOFTE(r1)
-        TRACE_AND_RESTORE_IRQ(r3);
-        ld      r12,_MSR(r1)
-        rldicl  r4,r12,49,63            /* get MSR_EE to LSB */
-        stb     r4,PACAHARDIRQEN(r13)   /* restore paca->hard_enabled */
-        b       1f
-
-        .globl  fast_exception_return
-fast_exception_return:
-        ld      r12,_MSR(r1)
-1:      ld      r11,_NIP(r1)
-        andi.   r3,r12,MSR_RI           /* check if RI is set */
-        beq-    unrecov_fer
-
-#ifdef CONFIG_VIRT_CPU_ACCOUNTING
-        andi.   r3,r12,MSR_PR
-        beq     2f
-        ACCOUNT_CPU_USER_EXIT(r3, r4)
-2:
-#endif
-
-        ld      r3,_CCR(r1)
-        ld      r4,_LINK(r1)
-        ld      r5,_CTR(r1)
-        ld      r6,_XER(r1)
-        mtcr    r3
-        mtlr    r4
-        mtctr   r5
-        mtxer   r6
-        REST_GPR(0, r1)
-        REST_8GPRS(2, r1)
-
-        mfmsr   r10
-        rldicl  r10,r10,48,1            /* clear EE */
-        rldicr  r10,r10,16,61           /* clear RI (LE is 0 already) */
-        mtmsrd  r10,1
-
-        mtspr   SPRN_SRR1,r12
-        mtspr   SPRN_SRR0,r11
-        REST_4GPRS(10, r1)
-        ld      r1,GPR1(r1)
-        rfid
-        b       .       /* prevent speculative execution */
-
-unrecov_fer:
-        bl      .save_nvgprs
-1:      addi    r3,r1,STACK_FRAME_OVERHEAD
-        bl      .unrecoverable_exception
-        b       1b
-
-/*
  * Here r13 points to the paca, r9 contains the saved CR,
  * SRR0 and SRR1 are saved in r11 and r12,
  * r9 - r13 are saved in paca->exgen.
@@ -616,6 +599,9 @@ unrecov_user_slb:
  */
 _GLOBAL(slb_miss_realmode)
         mflr    r10
+#ifdef CONFIG_RELOCATABLE
+        mtctr   r11
+#endif
 
         stw     r9,PACA_EXSLB+EX_CCR(r13)       /* save CR in exc. frame */
         std     r10,PACA_EXSLB+EX_LR(r13)       /* save LR */
@@ -666,11 +652,10 @@ BEGIN_FW_FTR_SECTION
 END_FW_FTR_SECTION_IFSET(FW_FEATURE_ISERIES)
 #endif /* CONFIG_PPC_ISERIES */
         mfspr   r11,SPRN_SRR0
-        clrrdi  r10,r13,32
+        ld      r10,PACAKBASE(r13)
         LOAD_HANDLER(r10,unrecov_slb)
         mtspr   SPRN_SRR0,r10
-        mfmsr   r10
-        ori     r10,r10,MSR_IR|MSR_DR|MSR_RI
+        ld      r10,PACAKMSR(r13)
         mtspr   SPRN_SRR1,r10
         rfid
         b       .
@@ -766,6 +751,85 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
         bl      .altivec_unavailable_exception
         b       .ret_from_except
 
+        .align  7
+        .globl vsx_unavailable_common
+vsx_unavailable_common:
+        EXCEPTION_PROLOG_COMMON(0xf40, PACA_EXGEN)
+#ifdef CONFIG_VSX
+BEGIN_FTR_SECTION
+        bne     .load_up_vsx
+1:
+END_FTR_SECTION_IFSET(CPU_FTR_VSX)
+#endif
+        bl      .save_nvgprs
+        addi    r3,r1,STACK_FRAME_OVERHEAD
+        ENABLE_INTS
+        bl      .vsx_unavailable_exception
+        b       .ret_from_except
+
+        .align  7
+        .globl  __end_handlers
+__end_handlers:
+
+/*
+ * Return from an exception with minimal checks.
+ * The caller is assumed to have done EXCEPTION_PROLOG_COMMON.
+ * If interrupts have been enabled, or anything has been
+ * done that might have changed the scheduling status of
+ * any task or sent any task a signal, you should use
+ * ret_from_except or ret_from_except_lite instead of this.
+ */
+fast_exc_return_irq:                    /* restores irq state too */
+        ld      r3,SOFTE(r1)
+        TRACE_AND_RESTORE_IRQ(r3);
+        ld      r12,_MSR(r1)
+        rldicl  r4,r12,49,63            /* get MSR_EE to LSB */
+        stb     r4,PACAHARDIRQEN(r13)   /* restore paca->hard_enabled */
+        b       1f
+
+        .globl  fast_exception_return
+fast_exception_return:
+        ld      r12,_MSR(r1)
+1:      ld      r11,_NIP(r1)
+        andi.   r3,r12,MSR_RI           /* check if RI is set */
+        beq-    unrecov_fer
+
+#ifdef CONFIG_VIRT_CPU_ACCOUNTING
+        andi.   r3,r12,MSR_PR
+        beq     2f
+        ACCOUNT_CPU_USER_EXIT(r3, r4)
+2:
+#endif
+
+        ld      r3,_CCR(r1)
+        ld      r4,_LINK(r1)
+        ld      r5,_CTR(r1)
+        ld      r6,_XER(r1)
+        mtcr    r3
+        mtlr    r4
+        mtctr   r5
+        mtxer   r6
+        REST_GPR(0, r1)
+        REST_8GPRS(2, r1)
+
+        mfmsr   r10
+        rldicl  r10,r10,48,1            /* clear EE */
+        rldicr  r10,r10,16,61           /* clear RI (LE is 0 already) */
+        mtmsrd  r10,1
+
+        mtspr   SPRN_SRR1,r12
+        mtspr   SPRN_SRR0,r11
+        REST_4GPRS(10, r1)
+        ld      r1,GPR1(r1)
+        rfid
+        b       .       /* prevent speculative execution */
+
+unrecov_fer:
+        bl      .save_nvgprs
+1:      addi    r3,r1,STACK_FRAME_OVERHEAD
+        bl      .unrecoverable_exception
+        b       1b
+
 #ifdef CONFIG_ALTIVEC
 /*
  * load_up_altivec(unused, unused, tsk)
@@ -840,22 +904,6 @@ _STATIC(load_up_altivec)
         blr
 #endif /* CONFIG_ALTIVEC */
 
-        .align  7
-        .globl vsx_unavailable_common
-vsx_unavailable_common:
-        EXCEPTION_PROLOG_COMMON(0xf40, PACA_EXGEN)
-#ifdef CONFIG_VSX
-BEGIN_FTR_SECTION
-        bne     .load_up_vsx
-1:
-END_FTR_SECTION_IFSET(CPU_FTR_VSX)
-#endif
-        bl      .save_nvgprs
-        addi    r3,r1,STACK_FRAME_OVERHEAD
-        ENABLE_INTS
-        bl      .vsx_unavailable_exception
-        b       .ret_from_except
-
 #ifdef CONFIG_VSX
 /*
  * load_up_vsx(unused, unused, tsk)
@@ -1175,11 +1223,14 @@ _GLOBAL(generic_secondary_smp_init)
         /* turn on 64-bit mode */
         bl      .enable_64b_mode
 
+        /* get the TOC pointer (real address) */
+        bl      .relative_toc
+
         /* Set up a paca value for this processor. Since we have the
          * physical cpu id in r24, we need to search the pacas to find
          * which logical id maps to our physical one.
          */
-        LOAD_REG_IMMEDIATE(r13, paca)   /* Get base vaddr of paca array  */
+        LOAD_REG_ADDR(r13, paca)        /* Get base vaddr of paca array  */
         li      r5,0                    /* logical cpu id                */
 1:      lhz     r6,PACAHWCPUID(r13)     /* Load HW procid from paca      */
         cmpw    r6,r24                  /* Compare to our id             */
@@ -1208,7 +1259,7 @@ _GLOBAL(generic_secondary_smp_init)
         sync                            /* order paca.run and cur_cpu_spec */
 
         /* See if we need to call a cpu state restore handler */
-        LOAD_REG_IMMEDIATE(r23, cur_cpu_spec)
+        LOAD_REG_ADDR(r23, cur_cpu_spec)
         ld      r23,0(r23)
         ld      r23,CPU_SPEC_RESTORE(r23)
         cmpdi   0,r23,0
@@ -1224,10 +1275,15 @@ _GLOBAL(generic_secondary_smp_init)
         b       __secondary_start
 #endif
 
+/*
+ * Turn the MMU off.
+ * Assumes we're mapped EA == RA if the MMU is on.
+ */
 _STATIC(__mmu_off)
         mfmsr   r3
         andi.   r0,r3,MSR_IR|MSR_DR
         beqlr
+        mflr    r4
         andc    r3,r3,r0
         mtspr   SPRN_SRR0,r4
         mtspr   SPRN_SRR1,r3
@@ -1248,6 +1304,18 @@ _STATIC(__mmu_off)
  *
  */
 _GLOBAL(__start_initialization_multiplatform)
+        /* Make sure we are running in 64 bits mode */
+        bl      .enable_64b_mode
+
+        /* Get TOC pointer (current runtime address) */
+        bl      .relative_toc
+
+        /* find out where we are now */
+        bcl     20,31,$+4
+0:      mflr    r26                     /* r26 = runtime addr here */
+        addis   r26,r26,(_stext - 0b)@ha
+        addi    r26,r26,(_stext - 0b)@l /* current runtime base addr */
+
         /*
          * Are we booted from a PROM Of-type client-interface ?
          */
@@ -1259,9 +1327,6 @@ _GLOBAL(__start_initialization_multiplatform)
         mr      r31,r3
         mr      r30,r4
 
-        /* Make sure we are running in 64 bits mode */
-        bl      .enable_64b_mode
-
         /* Setup some critical 970 SPRs before switching MMU off */
         mfspr   r0,SPRN_PVR
         srwi    r0,r0,16
@@ -1276,9 +1341,7 @@ _GLOBAL(__start_initialization_multiplatform)
 1:      bl      .__cpu_preinit_ppc970
 2:
 
-        /* Switch off MMU if not already */
-        LOAD_REG_IMMEDIATE(r4, .__after_prom_start - KERNELBASE)
-        add     r4,r4,r30
+        /* Switch off MMU if not already off */
         bl      .__mmu_off
         b       .__after_prom_start
 
@@ -1293,22 +1356,15 @@ _INIT_STATIC(__boot_from_prom)
         /*
          * Align the stack to 16-byte boundary
          * Depending on the size and layout of the ELF sections in the initial
-         * boot binary, the stack pointer will be unalignet on PowerMac
+         * boot binary, the stack pointer may be unaligned on PowerMac
          */
         rldicr  r1,r1,0,59
 
-        /* Make sure we are running in 64 bits mode */
-        bl      .enable_64b_mode
-
-        /* put a relocation offset into r3 */
-        bl      .reloc_offset
-
-        LOAD_REG_IMMEDIATE(r2,__toc_start)
-        addi    r2,r2,0x4000
-        addi    r2,r2,0x4000
-
-        /* Relocate the TOC from a virt addr to a real addr */
-        add     r2,r2,r3
+#ifdef CONFIG_RELOCATABLE
+        /* Relocate code for where we are now */
+        mr      r3,r26
+        bl      .relocate
+#endif
 
         /* Restore parameters */
         mr      r3,r31
@@ -1318,60 +1374,51 @@ _INIT_STATIC(__boot_from_prom)
         mr      r7,r27
 
         /* Do all of the interaction with OF client interface */
+        mr      r8,r26
         bl      .prom_init
         /* We never return */
         trap
 
 _STATIC(__after_prom_start)
+#ifdef CONFIG_RELOCATABLE
+        /* process relocations for the final address of the kernel */
+        lis     r25,PAGE_OFFSET@highest /* compute virtual base of kernel */
+        sldi    r25,r25,32
+        mr      r3,r25
+        bl      .relocate
+#endif
 
 /*
- * We need to run with __start at physical address PHYSICAL_START.
+ * We need to run with _stext at physical address PHYSICAL_START.
  * This will leave some code in the first 256B of
  * real memory, which are reserved for software use.
- * The remainder of the first page is loaded with the fixed
- * interrupt vectors.  The next two pages are filled with
- * unknown exception placeholders.
  *
  * Note: This process overwrites the OF exception vectors.
- *      r26 == relocation offset
- *      r27 == KERNELBASE
  */
-        bl      .reloc_offset
-        mr      r26,r3
-        LOAD_REG_IMMEDIATE(r27, KERNELBASE)
-
-        LOAD_REG_IMMEDIATE(r3, PHYSICAL_START)  /* target addr */
-
-        // XXX FIXME: Use phys returned by OF (r30)
-        add     r4,r27,r26              /* source addr                   */
-                                        /* current address of _start     */
-                                        /*   i.e. where we are running   */
-                                        /*      the source addr          */
-
-        cmpdi   r4,0                    /* In some cases the loader may  */
-        bne     1f
-        b       .start_here_multiplatform /* have already put us at zero */
-                                        /* so we can skip the copy.      */
-1:      LOAD_REG_IMMEDIATE(r5,copy_to_here) /* # bytes of memory to copy */
-        sub     r5,r5,r27
-
+        li      r3,0                    /* target addr */
+        mr.     r4,r26                  /* In some cases the loader may  */
+        beq     9f                      /* have already put us at zero */
+        lis     r5,(copy_to_here - _stext)@ha
+        addi    r5,r5,(copy_to_here - _stext)@l /* # bytes of memory to copy */
         li      r6,0x100                /* Start offset, the first 0x100 */
                                         /* bytes were copied earlier.    */
 
         bl      .copy_and_flush         /* copy the first n bytes        */
                                         /* this includes the code being  */
                                         /* executed here.                */
-
-        LOAD_REG_IMMEDIATE(r0, 4f)      /* Jump to the copy of this code */
-        mtctr   r0                      /* that we just made/relocated   */
+        addis   r8,r3,(4f - _stext)@ha  /* Jump to the copy of this code */
+        addi    r8,r8,(4f - _stext)@l   /* that we just made */
+        mtctr   r8
         bctr
 
-4:      LOAD_REG_IMMEDIATE(r5,klimit)
-        add     r5,r5,r26
-        ld      r5,0(r5)                /* get the value of klimit */
-        sub     r5,r5,r27
+4:      /* Now copy the rest of the kernel up to _end */
+        addis   r5,r26,(p_end - _stext)@ha
+        ld      r5,(p_end - _stext)@l(r5)       /* get _end */
         bl      .copy_and_flush         /* copy the rest */
-        b       .start_here_multiplatform
+
+9:      b       .start_here_multiplatform
+
+p_end:  .llong  _end - _stext
 
 /*
  * Copy routine used to copy the kernel to start at physical address 0
@@ -1436,6 +1483,9 @@ _GLOBAL(pmac_secondary_start)
         /* turn on 64-bit mode */
         bl      .enable_64b_mode
 
+        /* get TOC pointer (real address) */
+        bl      .relative_toc
+
         /* Copy some CPU settings from CPU 0 */
         bl      .__restore_cpu_ppc970
 
@@ -1445,10 +1495,10 @@ _GLOBAL(pmac_secondary_start)
         mtmsrd  r3                      /* RI on */
 
         /* Set up a paca value for this processor. */
-        LOAD_REG_IMMEDIATE(r4, paca)    /* Get base vaddr of paca array */
-        mulli   r13,r24,PACA_SIZE        /* Calculate vaddr of right paca */
+        LOAD_REG_ADDR(r4,paca)          /* Get base vaddr of paca array */
+        mulli   r13,r24,PACA_SIZE       /* Calculate vaddr of right paca */
         add     r13,r13,r4              /* for this processor.          */
-        mtspr   SPRN_SPRG3,r13           /* Save vaddr of paca in SPRG3 */
+        mtspr   SPRN_SPRG3,r13          /* Save vaddr of paca in SPRG3  */
 
         /* Create a temp kernel stack for use before relocation is on.  */
         ld      r1,PACAEMERGSP(r13)
@@ -1476,9 +1526,6 @@ __secondary_start:
         /* Set thread priority to MEDIUM */
         HMT_MEDIUM
 
-        /* Load TOC */
-        ld      r2,PACATOC(r13)
-
         /* Do early setup for that CPU (stab, slb, hash table pointer) */
         bl      .early_setup_secondary
 
@@ -1515,9 +1562,11 @@ END_FW_FTR_SECTION_IFCLR(FW_FEATURE_ISERIES)
 
 /* 
  * Running with relocation on at this point.  All we want to do is
- * zero the stack back-chain pointer before going into C code.
+ * zero the stack back-chain pointer and get the TOC virtual address
+ * before going into C code.
  */
 _GLOBAL(start_secondary_prolog)
+        ld      r2,PACATOC(r13)
         li      r3,0
         std     r3,0(r1)                /* Zero the stack frame pointer */
         bl      .start_secondary
@@ -1529,34 +1578,46 @@ _GLOBAL(start_secondary_prolog)
  */
 _GLOBAL(enable_64b_mode)
         mfmsr   r11                     /* grab the current MSR */
-        li      r12,1
-        rldicr  r12,r12,MSR_SF_LG,(63-MSR_SF_LG)
-        or      r11,r11,r12
-        li      r12,1
-        rldicr  r12,r12,MSR_ISF_LG,(63-MSR_ISF_LG)
+        li      r12,(MSR_SF | MSR_ISF)@highest
+        sldi    r12,r12,48
         or      r11,r11,r12
         mtmsrd  r11
         isync
         blr
 
 /*
+ * This puts the TOC pointer into r2, offset by 0x8000 (as expected
+ * by the toolchain).  It computes the correct value for wherever we
+ * are running at the moment, using position-independent code.
+ */
+_GLOBAL(relative_toc)
+        mflr    r0
+        bcl     20,31,$+4
+0:      mflr    r9
+        ld      r2,(p_toc - 0b)(r9)
+        add     r2,r2,r9
+        mtlr    r0
+        blr
+
+p_toc:  .llong  __toc_start + 0x8000 - 0b
+
+/*
  * This is where the main kernel code starts.
  */
 _INIT_STATIC(start_here_multiplatform)
-        /* get a new offset, now that the kernel has moved. */
-        bl      .reloc_offset
-        mr      r26,r3
+        /* set up the TOC (real address) */
+        bl      .relative_toc
 
         /* Clear out the BSS. It may have been done in prom_init,
          * already but that's irrelevant since prom_init will soon
          * be detached from the kernel completely. Besides, we need
          * to clear it now for kexec-style entry.
          */
-        LOAD_REG_IMMEDIATE(r11,__bss_stop)
-        LOAD_REG_IMMEDIATE(r8,__bss_start)
+        LOAD_REG_ADDR(r11,__bss_stop)
+        LOAD_REG_ADDR(r8,__bss_start)
         sub     r11,r11,r8              /* bss size                     */
         addi    r11,r11,7               /* round up to an even double word */
-        rldicl. r11,r11,61,3            /* shift right by 3             */
+        srdi.   r11,r11,3               /* shift right by 3             */
         beq     4f
         addi    r8,r8,-8
         li      r0,0
@@ -1569,35 +1630,35 @@ _INIT_STATIC(start_here_multiplatform)
         ori     r6,r6,MSR_RI
         mtmsrd  r6                      /* RI on */
 
-        /* The following gets the stack and TOC set up with the regs */
+#ifdef CONFIG_RELOCATABLE
+        /* Save the physical address we're running at in kernstart_addr */
+        LOAD_REG_ADDR(r4, kernstart_addr)
+        clrldi  r0,r25,2
+        std     r0,0(r4)
+#endif
+
+        /* The following gets the stack set up with the regs */
         /* pointing to the real addr of the kernel stack.  This is   */
         /* all done to support the C function call below which sets  */
         /* up the htab.  This is done because we have relocated the  */
         /* kernel but are still running in real mode. */
 
-        LOAD_REG_IMMEDIATE(r3,init_thread_union)
-        add     r3,r3,r26
+        LOAD_REG_ADDR(r3,init_thread_union)
 
-        /* set up a stack pointer (physical address) */
+        /* set up a stack pointer */
         addi    r1,r3,THREAD_SIZE
         li      r0,0
         stdu    r0,-STACK_FRAME_OVERHEAD(r1)
 
-        /* set up the TOC (physical address) */
-        LOAD_REG_IMMEDIATE(r2,__toc_start)
-        addi    r2,r2,0x4000
-        addi    r2,r2,0x4000
-        add     r2,r2,r26
-
         /* Do very early kernel initializations, including initial hash table,
          * stab and slb setup before we turn on relocation.     */
 
         /* Restore parameters passed from prom_init/kexec */
         mr      r3,r31
-        bl      .early_setup
+        bl      .early_setup            /* also sets r13 and SPRG3 */
 
-        LOAD_REG_IMMEDIATE(r3, .start_here_common)
-        LOAD_REG_IMMEDIATE(r4, MSR_KERNEL)
+        LOAD_REG_ADDR(r3, .start_here_common)
+        ld      r4,PACAKMSR(r13)
         mtspr   SPRN_SRR0,r3
         mtspr   SPRN_SRR1,r4
         rfid
@@ -1606,20 +1667,10 @@ _INIT_STATIC(start_here_multiplatform)
         /* This is where all platforms converge execution */
 _INIT_GLOBAL(start_here_common)
         /* relocation is on at this point */
+        std     r1,PACAKSAVE(r13)
 
-        /* The following code sets up the SP and TOC now that we are */
-        /* running with translation enabled. */
-
-        LOAD_REG_IMMEDIATE(r3,init_thread_union)
-
-        /* set up the stack */
-        addi    r1,r3,THREAD_SIZE
-        li      r0,0
-        stdu    r0,-STACK_FRAME_OVERHEAD(r1)
-
-        /* Load the TOC */
+        /* Load the TOC (virtual address) */
         ld      r2,PACATOC(r13)
-        std     r1,PACAKSAVE(r13)
 
         bl      .setup_system
 
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 3cb52fa0eda3..590304c24dad 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -422,7 +422,6 @@ skpinv:	addi	r6,r6,1				/* Increment */
  *   r12 is pointer to the pte
  */
 #ifdef CONFIG_PTE_64BIT
-#define PTE_FLAGS_OFFSET        4
 #define FIND_PTE        \
         rlwinm  r12, r10, 13, 19, 29;   /* Compute pgdir/pmd offset */  \
         lwzx    r11, r12, r11;          /* Get pgd/pmd entry */         \
@@ -431,7 +430,6 @@ skpinv:	addi	r6,r6,1				/* Increment */
         rlwimi  r12, r10, 23, 20, 28;   /* Compute pte address */       \
         lwz     r11, 4(r12);            /* Get pte entry */
 #else
-#define PTE_FLAGS_OFFSET        0
 #define FIND_PTE        \
         rlwimi  r11, r10, 12, 20, 29;   /* Create L1 (pgdir/pmd) address */     \
         lwz     r11, 0(r11);            /* Get L1 entry */                      \
@@ -579,13 +577,19 @@ interrupt_base:
 
         FIND_PTE
         andc.   r13,r13,r11             /* Check permission */
-        bne     2f                      /* Bail if permission mismach */
 
 #ifdef CONFIG_PTE_64BIT
-        lwz     r13, 0(r12)
+#ifdef CONFIG_SMP
+        subf    r10,r11,r12             /* create false data dep */
+        lwzx    r13,r11,r10             /* Get upper pte bits */
+#else
+        lwz     r13,0(r12)              /* Get upper pte bits */
+#endif
 #endif
 
-         /* Jump to common tlb load */
+        bne     2f                      /* Bail if permission/valid mismach */
+
+        /* Jump to common tlb load */
         b       finish_tlb_load
 2:
         /* The bailout.  Restore registers to pre-exception conditions
@@ -640,12 +644,18 @@ interrupt_base:
 
         FIND_PTE
         andc.   r13,r13,r11             /* Check permission */
-        bne     2f                      /* Bail if permission mismach */
 
 #ifdef CONFIG_PTE_64BIT
-        lwz     r13, 0(r12)
+#ifdef CONFIG_SMP
+        subf    r10,r11,r12             /* create false data dep */
+        lwzx    r13,r11,r10             /* Get upper pte bits */
+#else
+        lwz     r13,0(r12)              /* Get upper pte bits */
+#endif
 #endif
 
+        bne     2f                      /* Bail if permission mismach */
+
         /* Jump to common TLB load point */
         b       finish_tlb_load
 
@@ -702,7 +712,7 @@ interrupt_base:
 /*
  * Both the instruction and data TLB miss get to this
  * point to load the TLB.
- *      r10 - EA of fault
+ *      r10 - available to use
  *      r11 - TLB (info from Linux PTE)
  *      r12 - available to use
  *      r13 - upper bits of PTE (if PTE_64BIT) or available to use
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index d972decf0324..ac222d0ab12e 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -439,8 +439,8 @@ void do_softirq(void)
 
 static LIST_HEAD(irq_hosts);
 static DEFINE_SPINLOCK(irq_big_lock);
-static DEFINE_PER_CPU(unsigned int, irq_radix_reader);
-static unsigned int irq_radix_writer;
+static unsigned int revmap_trees_allocated;
+static DEFINE_MUTEX(revmap_trees_mutex);
 struct irq_map_entry irq_map[NR_IRQS];
 static unsigned int irq_virq_count = NR_IRQS;
 static struct irq_host *irq_default_host;
@@ -583,57 +583,6 @@ void irq_set_virq_count(unsigned int count)
                 irq_virq_count = count;
 }
 
-/* radix tree not lockless safe ! we use a brlock-type mecanism
- * for now, until we can use a lockless radix tree
- */
-static void irq_radix_wrlock(unsigned long *flags)
-{
-        unsigned int cpu, ok;
-
-        spin_lock_irqsave(&irq_big_lock, *flags);
-        irq_radix_writer = 1;
-        smp_mb();
-        do {
-                barrier();
-                ok = 1;
-                for_each_possible_cpu(cpu) {
-                        if (per_cpu(irq_radix_reader, cpu)) {
-                                ok = 0;
-                                break;
-                        }
-                }
-                if (!ok)
-                        cpu_relax();
-        } while(!ok);
-}
-
-static void irq_radix_wrunlock(unsigned long flags)
-{
-        smp_wmb();
-        irq_radix_writer = 0;
-        spin_unlock_irqrestore(&irq_big_lock, flags);
-}
-
-static void irq_radix_rdlock(unsigned long *flags)
-{
-        local_irq_save(*flags);
-        __get_cpu_var(irq_radix_reader) = 1;
-        smp_mb();
-        if (likely(irq_radix_writer == 0))
-                return;
-        __get_cpu_var(irq_radix_reader) = 0;
-        smp_wmb();
-        spin_lock(&irq_big_lock);
-        __get_cpu_var(irq_radix_reader) = 1;
-        spin_unlock(&irq_big_lock);
-}
-
-static void irq_radix_rdunlock(unsigned long flags)
-{
-        __get_cpu_var(irq_radix_reader) = 0;
-        local_irq_restore(flags);
-}
-
 static int irq_setup_virq(struct irq_host *host, unsigned int virq,
                             irq_hw_number_t hwirq)
 {
@@ -788,7 +737,6 @@ void irq_dispose_mapping(unsigned int virq)
 {
         struct irq_host *host;
         irq_hw_number_t hwirq;
-        unsigned long flags;
 
         if (virq == NO_IRQ)
                 return;
@@ -821,12 +769,16 @@ void irq_dispose_mapping(unsigned int virq)
                         host->revmap_data.linear.revmap[hwirq] = NO_IRQ;
                 break;
         case IRQ_HOST_MAP_TREE:
-                /* Check if radix tree allocated yet */
-                if (host->revmap_data.tree.gfp_mask == 0)
+                /*
+                 * Check if radix tree allocated yet, if not then nothing to
+                 * remove.
+                 */
+                smp_rmb();
+                if (revmap_trees_allocated < 1)
                         break;
-                irq_radix_wrlock(&flags);
+                mutex_lock(&revmap_trees_mutex);
                 radix_tree_delete(&host->revmap_data.tree, hwirq);
-                irq_radix_wrunlock(flags);
+                mutex_unlock(&revmap_trees_mutex);
                 break;
         }
 
@@ -875,43 +827,62 @@ unsigned int irq_find_mapping(struct irq_host *host,
 EXPORT_SYMBOL_GPL(irq_find_mapping);
 
 
-unsigned int irq_radix_revmap(struct irq_host *host,
-                              irq_hw_number_t hwirq)
+unsigned int irq_radix_revmap_lookup(struct irq_host *host,
+                                     irq_hw_number_t hwirq)
 {
-        struct radix_tree_root *tree;
         struct irq_map_entry *ptr;
         unsigned int virq;
-        unsigned long flags;
 
         WARN_ON(host->revmap_type != IRQ_HOST_MAP_TREE);
 
-        /* Check if the radix tree exist yet. We test the value of
-         * the gfp_mask for that. Sneaky but saves another int in the
-         * structure. If not, we fallback to slow mode
+        /*
+         * Check if the radix tree exists and has bee initialized.
+         * If not, we fallback to slow mode
          */
-        tree = &host->revmap_data.tree;
-        if (tree->gfp_mask == 0)
+        if (revmap_trees_allocated < 2)
                 return irq_find_mapping(host, hwirq);
 
         /* Now try to resolve */
-        irq_radix_rdlock(&flags);
-        ptr = radix_tree_lookup(tree, hwirq);
-        irq_radix_rdunlock(flags);
+        /*
+         * No rcu_read_lock(ing) needed, the ptr returned can't go under us
+         * as it's referencing an entry in the static irq_map table.
+         */
+        ptr = radix_tree_lookup(&host->revmap_data.tree, hwirq);
 
-        /* Found it, return */
-        if (ptr) {
+        /*
+         * If found in radix tree, then fine.
+         * Else fallback to linear lookup - this should not happen in practice
+         * as it means that we failed to insert the node in the radix tree.
+         */
+        if (ptr)
                 virq = ptr - irq_map;
-                return virq;
-        }
+        else
+                virq = irq_find_mapping(host, hwirq);
+
+        return virq;
+}
+
+void irq_radix_revmap_insert(struct irq_host *host, unsigned int virq,
+                             irq_hw_number_t hwirq)
+{
+
+        WARN_ON(host->revmap_type != IRQ_HOST_MAP_TREE);
+
+        /*
+         * Check if the radix tree exists yet.
+         * If not, then the irq will be inserted into the tree when it gets
+         * initialized.
+         */
+        smp_rmb();
+        if (revmap_trees_allocated < 1)
+                return;
 
-        /* If not there, try to insert it */
-        virq = irq_find_mapping(host, hwirq);
         if (virq != NO_IRQ) {
-                irq_radix_wrlock(&flags);
-                radix_tree_insert(tree, hwirq, &irq_map[virq]);
-                irq_radix_wrunlock(flags);
+                mutex_lock(&revmap_trees_mutex);
+                radix_tree_insert(&host->revmap_data.tree, hwirq,
+                                  &irq_map[virq]);
+                mutex_unlock(&revmap_trees_mutex);
         }
-        return virq;
 }
 
 unsigned int irq_linear_revmap(struct irq_host *host,
@@ -1020,14 +991,44 @@ void irq_early_init(void)
 static int irq_late_init(void)
 {
         struct irq_host *h;
-        unsigned long flags;
+        unsigned int i;
 
-        irq_radix_wrlock(&flags);
+        /*
+         * No mutual exclusion with respect to accessors of the tree is needed
+         * here as the synchronization is done via the state variable
+         * revmap_trees_allocated.
+         */
         list_for_each_entry(h, &irq_hosts, link) {
                 if (h->revmap_type == IRQ_HOST_MAP_TREE)
-                        INIT_RADIX_TREE(&h->revmap_data.tree, GFP_ATOMIC);
+                        INIT_RADIX_TREE(&h->revmap_data.tree, GFP_KERNEL);
+        }
+
+        /*
+         * Make sure the radix trees inits are visible before setting
+         * the flag
+         */
+        smp_wmb();
+        revmap_trees_allocated = 1;
+
+        /*
+         * Insert the reverse mapping for those interrupts already present
+         * in irq_map[].
+         */
+        mutex_lock(&revmap_trees_mutex);
+        for (i = 0; i < irq_virq_count; i++) {
+                if (irq_map[i].host &&
+                    (irq_map[i].host->revmap_type == IRQ_HOST_MAP_TREE))
+                        radix_tree_insert(&irq_map[i].host->revmap_data.tree,
+                                          irq_map[i].hwirq, &irq_map[i]);
         }
-        irq_radix_wrunlock(flags);
+        mutex_unlock(&revmap_trees_mutex);
+
+        /*
+         * Make sure the radix trees insertions are visible before setting
+         * the flag
+         */
+        smp_wmb();
+        revmap_trees_allocated = 2;
 
         return 0;
 }
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index b3eef30b5131..d051e8cbcd03 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -510,10 +510,10 @@ static ssize_t update_ppp(u64 *entitlement, u8 *weight)
                 return -EINVAL;
 
         pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
-                 __FUNCTION__, ppp_data.entitlement, ppp_data.weight);
+                 __func__, ppp_data.entitlement, ppp_data.weight);
 
         pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
-                 __FUNCTION__, new_entitled, new_weight);
+                 __func__, new_entitled, new_weight);
 
         retval = plpar_hcall_norets(H_SET_PPP, new_entitled, new_weight);
         return retval;
@@ -556,10 +556,10 @@ static ssize_t update_mpp(u64 *entitlement, u8 *weight)
                 return -EINVAL;
 
         pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
-                 __FUNCTION__, mpp_data.entitled_mem, mpp_data.mem_weight);
+                 __func__, mpp_data.entitled_mem, mpp_data.mem_weight);
 
         pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
-                 __FUNCTION__, new_entitled, new_weight);
+                 __func__, new_entitled, new_weight);
 
         rc = plpar_hcall_norets(H_SET_MPP, new_entitled, new_weight);
         return rc;
diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index 85cb6f340846..2d29752cbe16 100644
--- a/arch/powerpc/kernel/misc.S
+++ b/arch/powerpc/kernel/misc.S
@@ -31,11 +31,14 @@ _GLOBAL(reloc_offset)
         mflr    r0
         bl      1f
 1:      mflr    r3
-        LOAD_REG_IMMEDIATE(r4,1b)
+        PPC_LL  r4,(2f-1b)(r3)
         subf    r3,r4,r3
         mtlr    r0
         blr
 
+        .align  3
+2:      PPC_LONG 1b
+
 /*
  * add_reloc_offset(x) returns x + reloc_offset().
  */
@@ -43,12 +46,15 @@ _GLOBAL(add_reloc_offset)
         mflr    r0
         bl      1f
 1:      mflr    r5
-        LOAD_REG_IMMEDIATE(r4,1b)
+        PPC_LL  r4,(2f-1b)(r5)
         subf    r5,r4,r5
         add     r3,r3,r5
         mtlr    r0
         blr
 
+        .align  3
+2:      PPC_LONG 1b
+
 _GLOBAL(kernel_execve)
         li      r0,__NR_execve
         sc
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 7a6dfbca7682..6a9b4bf0d173 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -274,6 +274,10 @@ _GLOBAL(real_writeb)
 /*
  * Flush MMU TLB
  */
+#ifndef CONFIG_FSL_BOOKE
+_GLOBAL(_tlbil_all)
+_GLOBAL(_tlbil_pid)
+#endif
 _GLOBAL(_tlbia)
 #if defined(CONFIG_40x)
         sync                    /* Flush to memory before changing mapping */
@@ -344,6 +348,9 @@ _GLOBAL(_tlbia)
 /*
  * Flush MMU TLB for a particular address
  */
+#ifndef CONFIG_FSL_BOOKE
+_GLOBAL(_tlbil_va)
+#endif
 _GLOBAL(_tlbie)
 #if defined(CONFIG_40x)
         /* We run the search with interrupts disabled because we have to change
@@ -436,6 +443,53 @@ _GLOBAL(_tlbie)
 #endif /* ! CONFIG_40x */
         blr
 
+#if defined(CONFIG_FSL_BOOKE)
+/*
+ * Flush MMU TLB, but only on the local processor (no broadcast)
+ */
+_GLOBAL(_tlbil_all)
+#define MMUCSR0_TLBFI   (MMUCSR0_TLB0FI | MMUCSR0_TLB1FI | \
+                         MMUCSR0_TLB2FI | MMUCSR0_TLB3FI)
+        li      r3,(MMUCSR0_TLBFI)@l
+        mtspr   SPRN_MMUCSR0, r3
+1:
+        mfspr   r3,SPRN_MMUCSR0
+        andi.   r3,r3,MMUCSR0_TLBFI@l
+        bne     1b
+        blr
+
+/*
+ * Flush MMU TLB for a particular process id, but only on the local processor
+ * (no broadcast)
+ */
+_GLOBAL(_tlbil_pid)
+/* we currently do an invalidate all since we don't have per pid invalidate */
+        li      r3,(MMUCSR0_TLBFI)@l
+        mtspr   SPRN_MMUCSR0, r3
+1:
+        mfspr   r3,SPRN_MMUCSR0
+        andi.   r3,r3,MMUCSR0_TLBFI@l
+        bne     1b
+        blr
+
+/*
+ * Flush MMU TLB for a particular address, but only on the local processor
+ * (no broadcast)
+ */
+_GLOBAL(_tlbil_va)
+        slwi    r4,r4,16
+        mtspr   SPRN_MAS6,r4            /* assume AS=0 for now */
+        tlbsx   0,r3
+        mfspr   r4,SPRN_MAS1            /* check valid */
+        andis.  r3,r4,MAS1_VALID@h
+        beqlr
+        rlwinm  r4,r4,0,1,31
+        mtspr   SPRN_MAS1,r4
+        tlbwe
+        blr
+#endif /* CONFIG_FSL_BOOKE */
+
+
 /*
  * Flush instruction cache.
  * This is a no-op on the 601.
@@ -846,8 +900,10 @@ _GLOBAL(kernel_thread)
         li      r4,0            /* new sp (unused) */
         li      r0,__NR_clone
         sc
-        cmpwi   0,r3,0          /* parent or child? */
-        bne     1f              /* return if parent */
+        bns+    1f              /* did system call indicate error? */
+        neg     r3,r3           /* if so, make return code negative */
+1:      cmpwi   0,r3,0          /* parent or child? */
+        bne     2f              /* return if parent */
         li      r0,0            /* make top-level stack frame */
         stwu    r0,-16(r1)
         mtlr    r30             /* fn addr in lr */
@@ -857,7 +913,7 @@ _GLOBAL(kernel_thread)
         li      r0,__NR_exit    /* exit if function returns */
         li      r3,0
         sc
-1:      lwz     r30,8(r1)
+2:      lwz     r30,8(r1)
         lwz     r31,12(r1)
         addi    r1,r1,16
         blr
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index 4dd70cf7bb4e..3053fe5c62f2 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -426,8 +426,10 @@ _GLOBAL(kernel_thread)
         li      r4,0            /* new sp (unused) */
         li      r0,__NR_clone
         sc
-        cmpdi   0,r3,0          /* parent or child? */
-        bne     1f              /* return if parent */
+        bns+    1f              /* did system call indicate error? */
+        neg     r3,r3           /* if so, make return code negative */
+1:      cmpdi   0,r3,0          /* parent or child? */
+        bne     2f              /* return if parent */
         li      r0,0
         stdu    r0,-STACK_FRAME_OVERHEAD(r1)
         ld      r2,8(r29)
@@ -438,7 +440,7 @@ _GLOBAL(kernel_thread)
         li      r0,__NR_exit    /* exit after child exits */
         li      r3,0
         sc
-1:      addi    r1,r1,STACK_FRAME_OVERHEAD      
+2:      addi    r1,r1,STACK_FRAME_OVERHEAD
         ld      r29,-24(r1)
         ld      r30,-16(r1)
         blr
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c
index e9be908f199b..93ae5b169f41 100644
--- a/arch/powerpc/kernel/of_device.c
+++ b/arch/powerpc/kernel/of_device.c
@@ -78,7 +78,7 @@ struct of_device *of_device_alloc(struct device_node *np,
         dev->dev.parent = parent;
         dev->dev.release = of_release_dev;
         dev->dev.archdata.of_node = np;
-        dev->dev.archdata.numa_node = of_node_to_nid(np);
+        set_dev_node(&dev->dev, of_node_to_nid(np));
 
         if (bus_id)
                 strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index c9bf17eec31b..48a347133f41 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -12,6 +12,7 @@
 
 #include <asm/lppaca.h>
 #include <asm/paca.h>
+#include <asm/sections.h>
 
 /* This symbol is provided by the linker - let it fill in the paca
  * field correctly */
@@ -79,6 +80,8 @@ void __init initialise_pacas(void)
                 new_paca->lock_token = 0x8000;
                 new_paca->paca_index = cpu;
                 new_paca->kernel_toc = kernel_toc;
+                new_paca->kernelbase = (unsigned long) _stext;
+                new_paca->kernel_msr = MSR_KERNEL;
                 new_paca->hw_cpu_id = 0xffff;
                 new_paca->slb_shadow_ptr = &slb_shadow[cpu];
                 new_paca->__current = &init_task;
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index ea0c61e09b76..01ce8c38bae6 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -56,6 +56,34 @@ resource_size_t isa_mem_base;
 /* Default PCI flags is 0 */
 unsigned int ppc_pci_flags;
 
+static struct dma_mapping_ops *pci_dma_ops;
+
+void set_pci_dma_ops(struct dma_mapping_ops *dma_ops)
+{
+        pci_dma_ops = dma_ops;
+}
+
+struct dma_mapping_ops *get_pci_dma_ops(void)
+{
+        return pci_dma_ops;
+}
+EXPORT_SYMBOL(get_pci_dma_ops);
+
+int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
+{
+        return dma_set_mask(&dev->dev, mask);
+}
+
+int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
+{
+        int rc;
+
+        rc = dma_set_mask(&dev->dev, mask);
+        dev->dev.coherent_dma_mask = dev->dma_mask;
+
+        return rc;
+}
+
 struct pci_controller *pcibios_alloc_controller(struct device_node *dev)
 {
         struct pci_controller *phb;
@@ -180,6 +208,26 @@ char __devinit *pcibios_setup(char *str)
         return str;
 }
 
+void __devinit pcibios_setup_new_device(struct pci_dev *dev)
+{
+        struct dev_archdata *sd = &dev->dev.archdata;
+
+        sd->of_node = pci_device_to_OF_node(dev);
+
+        DBG("PCI: device %s OF node: %s\n", pci_name(dev),
+            sd->of_node ? sd->of_node->full_name : "<none>");
+
+        sd->dma_ops = pci_dma_ops;
+#ifdef CONFIG_PPC32
+        sd->dma_data = (void *)PCI_DRAM_OFFSET;
+#endif
+        set_dev_node(&dev->dev, pcibus_to_node(dev->bus));
+
+        if (ppc_md.pci_dma_dev_setup)
+                ppc_md.pci_dma_dev_setup(dev);
+}
+EXPORT_SYMBOL(pcibios_setup_new_device);
+
 /*
  * Reads the interrupt pin to determine if interrupt is use by card.
  * If the interrupt is used, then gets the interrupt line from the
@@ -371,7 +419,7 @@ pgprot_t pci_phys_mem_access_prot(struct file *file,
         struct pci_dev *pdev = NULL;
         struct resource *found = NULL;
         unsigned long prot = pgprot_val(protection);
-        unsigned long offset = pfn << PAGE_SHIFT;
+        resource_size_t offset = ((resource_size_t)pfn) << PAGE_SHIFT;
         int i;
 
         if (page_is_ram(pfn))
@@ -422,7 +470,8 @@ pgprot_t pci_phys_mem_access_prot(struct file *file,
 int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                         enum pci_mmap_state mmap_state, int write_combine)
 {
-        resource_size_t offset = vma->vm_pgoff << PAGE_SHIFT;
+        resource_size_t offset =
+                ((resource_size_t)vma->vm_pgoff) << PAGE_SHIFT;
         struct resource *rp;
         int ret;
 
@@ -731,11 +780,6 @@ static void __devinit fixup_resource(struct resource *res, struct pci_dev *dev)
 
         res->start = (res->start + offset) & mask;
         res->end = (res->end + offset) & mask;
-
-        pr_debug("PCI:%s            %016llx-%016llx\n",
-                 pci_name(dev),
-                 (unsigned long long)res->start,
-                 (unsigned long long)res->end);
 }
 
 
@@ -781,6 +825,11 @@ static void __devinit pcibios_fixup_resources(struct pci_dev *dev)
                          (unsigned int)res->flags);
 
                 fixup_resource(res, dev);
+
+                pr_debug("PCI:%s            %016llx-%016llx\n",
+                         pci_name(dev),
+                         (unsigned long long)res->start,
+                         (unsigned long long)res->end);
         }
 
         /* Call machine specific resource fixup */
@@ -789,58 +838,127 @@ static void __devinit pcibios_fixup_resources(struct pci_dev *dev)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_resources);
 
-static void __devinit __pcibios_fixup_bus(struct pci_bus *bus)
+/* This function tries to figure out if a bridge resource has been initialized
+ * by the firmware or not. It doesn't have to be absolutely bullet proof, but
+ * things go more smoothly when it gets it right. It should covers cases such
+ * as Apple "closed" bridge resources and bare-metal pSeries unassigned bridges
+ */
+static int __devinit pcibios_uninitialized_bridge_resource(struct pci_bus *bus,
+                                                           struct resource *res)
 {
         struct pci_controller *hose = pci_bus_to_host(bus);
         struct pci_dev *dev = bus->self;
+        resource_size_t offset;
+        u16 command;
+        int i;
 
-        pr_debug("PCI: Fixup bus %d (%s)\n", bus->number, dev ? pci_name(dev) : "PHB");
+        /* We don't do anything if PCI_PROBE_ONLY is set */
+        if (ppc_pci_flags & PPC_PCI_PROBE_ONLY)
+                return 0;
 
-        /* Fixup PCI<->PCI bridges. Host bridges are handled separately, for
-         * now differently between 32 and 64 bits.
-         */
-        if (dev != NULL) {
-                struct resource *res;
-                int i;
+        /* Job is a bit different between memory and IO */
+        if (res->flags & IORESOURCE_MEM) {
+                /* If the BAR is non-0 (res != pci_mem_offset) then it's probably been
+                 * initialized by somebody
+                 */
+                if (res->start != hose->pci_mem_offset)
+                        return 0;
 
-                for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) {
-                        if ((res = bus->resource[i]) == NULL)
-                                continue;
-                        if (!res->flags)
-                                continue;
-                        if (i >= 3 && bus->self->transparent)
-                                continue;
-                        /* On PowerMac, Apple leaves bridge windows open over
-                         * an inaccessible region of memory space (0...fffff)
-                         * which is somewhat bogus, but that's what they think
-                         * means disabled...
-                         *
-                         * We clear those to force them to be reallocated later
-                         *
-                         * We detect such regions by the fact that the base is
-                         * equal to the pci_mem_offset of the host bridge and
-                         * their size is smaller than 1M.
-                         */
-                        if (res->flags & IORESOURCE_MEM &&
-                            res->start == hose->pci_mem_offset &&
-                            res->end < 0x100000) {
-                                printk(KERN_INFO
-                                       "PCI: Closing bogus Apple Firmware"
-                                       " region %d on bus 0x%02x\n",
-                                       i, bus->number);
-                                res->flags = 0;
-                                continue;
-                        }
+                /* The BAR is 0, let's check if memory decoding is enabled on
+                 * the bridge. If not, we consider it unassigned
+                 */
+                pci_read_config_word(dev, PCI_COMMAND, &command);
+                if ((command & PCI_COMMAND_MEMORY) == 0)
+                        return 1;
 
-                        pr_debug("PCI:%s Bus rsrc %d %016llx-%016llx [%x] fixup...\n",
-                                 pci_name(dev), i,
-                                 (unsigned long long)res->start,\
-                                 (unsigned long long)res->end,
-                                 (unsigned int)res->flags);
+                /* Memory decoding is enabled and the BAR is 0. If any of the bridge
+                 * resources covers that starting address (0 then it's good enough for
+                 * us for memory
+                 */
+                for (i = 0; i < 3; i++) {
+                        if ((hose->mem_resources[i].flags & IORESOURCE_MEM) &&
+                            hose->mem_resources[i].start == hose->pci_mem_offset)
+                                return 0;
+                }
 
-                        fixup_resource(res, dev);
+                /* Well, it starts at 0 and we know it will collide so we may as
+                 * well consider it as unassigned. That covers the Apple case.
+                 */
+                return 1;
+        } else {
+                /* If the BAR is non-0, then we consider it assigned */
+                offset = (unsigned long)hose->io_base_virt - _IO_BASE;
+                if (((res->start - offset) & 0xfffffffful) != 0)
+                        return 0;
+
+                /* Here, we are a bit different than memory as typically IO space
+                 * starting at low addresses -is- valid. What we do instead if that
+                 * we consider as unassigned anything that doesn't have IO enabled
+                 * in the PCI command register, and that's it.
+                 */
+                pci_read_config_word(dev, PCI_COMMAND, &command);
+                if (command & PCI_COMMAND_IO)
+                        return 0;
+
+                /* It's starting at 0 and IO is disabled in the bridge, consider
+                 * it unassigned
+                 */
+                return 1;
+        }
+}
+
+/* Fixup resources of a PCI<->PCI bridge */
+static void __devinit pcibios_fixup_bridge(struct pci_bus *bus)
+{
+        struct resource *res;
+        int i;
+
+        struct pci_dev *dev = bus->self;
+
+        for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) {
+                if ((res = bus->resource[i]) == NULL)
+                        continue;
+                if (!res->flags)
+                        continue;
+                if (i >= 3 && bus->self->transparent)
+                        continue;
+
+                pr_debug("PCI:%s Bus rsrc %d %016llx-%016llx [%x] fixup...\n",
+                         pci_name(dev), i,
+                         (unsigned long long)res->start,\
+                         (unsigned long long)res->end,
+                         (unsigned int)res->flags);
+
+                /* Perform fixup */
+                fixup_resource(res, dev);
+
+                /* Try to detect uninitialized P2P bridge resources,
+                 * and clear them out so they get re-assigned later
+                 */
+                if (pcibios_uninitialized_bridge_resource(bus, res)) {
+                        res->flags = 0;
+                        pr_debug("PCI:%s            (unassigned)\n", pci_name(dev));
+                } else {
+
+                        pr_debug("PCI:%s            %016llx-%016llx\n",
+                                 pci_name(dev),
+                                 (unsigned long long)res->start,
+                                 (unsigned long long)res->end);
                 }
         }
+}
+
+static void __devinit __pcibios_fixup_bus(struct pci_bus *bus)
+{
+        struct pci_dev *dev = bus->self;
+
+        pr_debug("PCI: Fixup bus %d (%s)\n", bus->number, dev ? pci_name(dev) : "PHB");
+
+        /* Fixup PCI<->PCI bridges. Host bridges are handled separately, for
+         * now differently between 32 and 64 bits.
+         */
+        if (dev != NULL)
+                pcibios_fixup_bridge(bus);
 
         /* Additional setup that is different between 32 and 64 bits for now */
         pcibios_do_bus_setup(bus);
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 88db4ffaf11c..131b1dfa68c6 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -53,12 +53,19 @@ LIST_HEAD(hose_list);
 
 static int pci_bus_count;
 
+/* This will remain NULL for now, until isa-bridge.c is made common
+ * to both 32-bit and 64-bit.
+ */
+struct pci_dev *isa_bridge_pcidev;
+EXPORT_SYMBOL_GPL(isa_bridge_pcidev);
+
 static void
-fixup_hide_host_resource_fsl(struct pci_dev* dev)
+fixup_hide_host_resource_fsl(struct pci_dev *dev)
 {
         int i, class = dev->class >> 8;
 
-        if ((class == PCI_CLASS_PROCESSOR_POWERPC) &&
+        if ((class == PCI_CLASS_PROCESSOR_POWERPC ||
+             class == PCI_CLASS_BRIDGE_OTHER) &&
                 (dev->hdr_type == PCI_HEADER_TYPE_NORMAL) &&
                 (dev->bus->parent == NULL)) {
                 for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
@@ -424,6 +431,7 @@ void __devinit pcibios_do_bus_setup(struct pci_bus *bus)
         unsigned long io_offset;
         struct resource *res;
         int i;
+        struct pci_dev *dev;
 
         /* Hookup PHB resources */
         io_offset = (unsigned long)hose->io_base_virt - isa_io_base;
@@ -457,6 +465,12 @@ void __devinit pcibios_do_bus_setup(struct pci_bus *bus)
                         bus->resource[i+1] = res;
                 }
         }
+
+        if (ppc_md.pci_dma_bus_setup)
+                ppc_md.pci_dma_bus_setup(bus);
+
+        list_for_each_entry(dev, &bus->devices, bus_list)
+                pcibios_setup_new_device(dev);
 }
 
 /* the next one is stolen from the alpha port... */
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 30eedfc5a566..8247cff1cb3e 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -52,35 +52,6 @@ EXPORT_SYMBOL(pci_io_base);
 
 LIST_HEAD(hose_list);
 
-static struct dma_mapping_ops *pci_dma_ops;
-
-void set_pci_dma_ops(struct dma_mapping_ops *dma_ops)
-{
-        pci_dma_ops = dma_ops;
-}
-
-struct dma_mapping_ops *get_pci_dma_ops(void)
-{
-        return pci_dma_ops;
-}
-EXPORT_SYMBOL(get_pci_dma_ops);
-
-
-int pci_set_dma_mask(struct pci_dev *dev, u64 mask)
-{
-        return dma_set_mask(&dev->dev, mask);
-}
-
-int pci_set_consistent_dma_mask(struct pci_dev *dev, u64 mask)
-{
-        int rc;
-
-        rc = dma_set_mask(&dev->dev, mask);
-        dev->dev.coherent_dma_mask = dev->dma_mask;
-
-        return rc;
-}
-
 static void fixup_broken_pcnet32(struct pci_dev* dev)
 {
         if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {
@@ -548,26 +519,6 @@ int __devinit pcibios_map_io_space(struct pci_bus *bus)
 }
 EXPORT_SYMBOL_GPL(pcibios_map_io_space);
 
-void __devinit pcibios_setup_new_device(struct pci_dev *dev)
-{
-        struct dev_archdata *sd = &dev->dev.archdata;
-
-        sd->of_node = pci_device_to_OF_node(dev);
-
-        DBG("PCI: device %s OF node: %s\n", pci_name(dev),
-            sd->of_node ? sd->of_node->full_name : "<none>");
-
-        sd->dma_ops = pci_dma_ops;
-#ifdef CONFIG_NUMA
-        sd->numa_node = pcibus_to_node(dev->bus);
-#else
-        sd->numa_node = -1;
-#endif
-        if (ppc_md.pci_dma_dev_setup)
-                ppc_md.pci_dma_dev_setup(dev);
-}
-EXPORT_SYMBOL(pcibios_setup_new_device);
-
 void __devinit pcibios_do_bus_setup(struct pci_bus *bus)
 {
         struct pci_dev *dev;
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index e1ea4fe5cfbd..8edc2359c419 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -119,6 +119,9 @@ EXPORT_SYMBOL(flush_instruction_cache);
 EXPORT_SYMBOL(flush_tlb_kernel_range);
 EXPORT_SYMBOL(flush_tlb_page);
 EXPORT_SYMBOL(_tlbie);
+#if defined(CONFIG_4xx) || defined(CONFIG_8xx) || defined(CONFIG_FSL_BOOKE)
+EXPORT_SYMBOL(_tlbil_va);
+#endif
 #endif
 EXPORT_SYMBOL(__flush_icache_range);
 EXPORT_SYMBOL(flush_dcache_range);
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 87d83c56b31e..3a2dc7e6586a 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -888,9 +888,10 @@ static u64 __init dt_mem_next_cell(int s, cell_t **cellp)
  */
 static int __init early_init_dt_scan_drconf_memory(unsigned long node)
 {
-        cell_t *dm, *ls;
+        cell_t *dm, *ls, *usm;
         unsigned long l, n, flags;
         u64 base, size, lmb_size;
+        unsigned int is_kexec_kdump = 0, rngs;
 
         ls = (cell_t *)of_get_flat_dt_prop(node, "ibm,lmb-size", &l);
         if (ls == NULL || l < dt_root_size_cells * sizeof(cell_t))
@@ -905,6 +906,12 @@ static int __init early_init_dt_scan_drconf_memory(unsigned long node)
         if (l < (n * (dt_root_addr_cells + 4) + 1) * sizeof(cell_t))
                 return 0;
 
+        /* check if this is a kexec/kdump kernel. */
+        usm = (cell_t *)of_get_flat_dt_prop(node, "linux,drconf-usable-memory",
+                                                 &l);
+        if (usm != NULL)
+                is_kexec_kdump = 1;
+
         for (; n != 0; --n) {
                 base = dt_mem_next_cell(dt_root_addr_cells, &dm);
                 flags = dm[3];
@@ -915,13 +922,34 @@ static int __init early_init_dt_scan_drconf_memory(unsigned long node)
                 if ((flags & 0x80) || !(flags & 0x8))
                         continue;
                 size = lmb_size;
-                if (iommu_is_off) {
-                        if (base >= 0x80000000ul)
+                rngs = 1;
+                if (is_kexec_kdump) {
+                        /*
+                         * For each lmb in ibm,dynamic-memory, a corresponding
+                         * entry in linux,drconf-usable-memory property contains
+                         * a counter 'p' followed by 'p' (base, size) duple.
+                         * Now read the counter from
+                         * linux,drconf-usable-memory property
+                         */
+                        rngs = dt_mem_next_cell(dt_root_size_cells, &usm);
+                        if (!rngs) /* there are no (base, size) duple */
                                 continue;
-                        if ((base + size) > 0x80000000ul)
-                                size = 0x80000000ul - base;
                 }
-                lmb_add(base, size);
+                do {
+                        if (is_kexec_kdump) {
+                                base = dt_mem_next_cell(dt_root_addr_cells,
+                                                         &usm);
+                                size = dt_mem_next_cell(dt_root_size_cells,
+                                                         &usm);
+                        }
+                        if (iommu_is_off) {
+                                if (base >= 0x80000000ul)
+                                        continue;
+                                if ((base + size) > 0x80000000ul)
+                                        size = 0x80000000ul - base;
+                        }
+                        lmb_add(base, size);
+                } while (--rngs);
         }
         lmb_dump_all();
         return 0;
@@ -1164,6 +1192,9 @@ void __init early_init_devtree(void *params)
 
         /* Reserve LMB regions used by kernel, initrd, dt, etc... */
         lmb_reserve(PHYSICAL_START, __pa(klimit) - PHYSICAL_START);
+        /* If relocatable, reserve first 32k for interrupt vectors etc. */
+        if (PHYSICAL_START > MEMORY_START)
+                lmb_reserve(MEMORY_START, 0x8000);
         reserve_kdump_trampoline();
         reserve_crashkernel();
         early_reserve_mem();
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index b72849ac7db3..2fdbc18ae94a 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -732,7 +732,7 @@ static struct fake_elf {
                         u32     ignore_me;
                 } rpadesc;
         } rpanote;
-} fake_elf = {
+} fake_elf __section(.fakeelf) = {
         .elfhdr = {
                 .e_ident = { 0x7f, 'E', 'L', 'F',
                              ELFCLASS32, ELFDATA2MSB, EV_CURRENT },
@@ -774,13 +774,13 @@ static struct fake_elf {
                 .type = 0x12759999,
                 .name = "IBM,RPA-Client-Config",
                 .rpadesc = {
-                        .lpar_affinity = 0,
-                        .min_rmo_size = 64,     /* in megabytes */
+                        .lpar_affinity = 1,
+                        .min_rmo_size = 128,    /* in megabytes */
                         .min_rmo_percent = 0,
-                        .max_pft_size = 48,     /* 2^48 bytes max PFT size */
+                        .max_pft_size = 46,     /* 2^46 bytes max PFT size */
                         .splpar = 1,
                         .min_load = ~0U,
-                        .new_mem_def = 0
+                        .new_mem_def = 1
                 }
         }
 };
@@ -1321,7 +1321,7 @@ static void __init prom_initialize_tce_table(void)
  *
  * -- Cort
  */
-extern void __secondary_hold(void);
+extern char __secondary_hold;
 extern unsigned long __secondary_hold_spinloop;
 extern unsigned long __secondary_hold_acknowledge;
 
@@ -1342,13 +1342,7 @@ static void __init prom_hold_cpus(void)
                 = (void *) LOW_ADDR(__secondary_hold_spinloop);
         unsigned long *acknowledge
                 = (void *) LOW_ADDR(__secondary_hold_acknowledge);
-#ifdef CONFIG_PPC64
-        /* __secondary_hold is actually a descriptor, not the text address */
-        unsigned long secondary_hold
-                = __pa(*PTRRELOC((unsigned long *)__secondary_hold));
-#else
         unsigned long secondary_hold = LOW_ADDR(__secondary_hold);
-#endif
 
         prom_debug("prom_hold_cpus: start...\n");
         prom_debug("    1) spinloop       = 0x%x\n", (unsigned long)spinloop);
@@ -2315,13 +2309,14 @@ static void __init prom_check_initrd(unsigned long r3, unsigned long r4)
 
 unsigned long __init prom_init(unsigned long r3, unsigned long r4,
                                unsigned long pp,
-                               unsigned long r6, unsigned long r7)
+                               unsigned long r6, unsigned long r7,
+                               unsigned long kbase)
 {       
         struct prom_t *_prom;
         unsigned long hdr;
-        unsigned long offset = reloc_offset();
 
 #ifdef CONFIG_PPC32
+        unsigned long offset = reloc_offset();
         reloc_got2(offset);
 #endif
 
@@ -2355,9 +2350,11 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          */
         RELOC(of_platform) = prom_find_machine_type();
 
+#ifndef CONFIG_RELOCATABLE
         /* Bail if this is a kdump kernel. */
         if (PHYSICAL_START > 0)
                 prom_panic("Error: You can't boot a kdump kernel from OF!\n");
+#endif
 
         /*
          * Check for an initrd
@@ -2377,7 +2374,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          * Copy the CPU hold code
          */
         if (RELOC(of_platform) != PLATFORM_POWERMAC)
-                copy_and_flush(0, KERNELBASE + offset, 0x100, 0);
+                copy_and_flush(0, kbase, 0x100, 0);
 
         /*
          * Do early parsing of command line
@@ -2480,7 +2477,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
         reloc_got2(-offset);
 #endif
 
-        __start(hdr, KERNELBASE + offset, 0);
+        __start(hdr, kbase, 0);
 
         return 0;
 }
diff --git a/arch/powerpc/kernel/reloc_64.S b/arch/powerpc/kernel/reloc_64.S
new file mode 100644
index 000000000000..b47a0e1ab001
--- /dev/null
+++ b/arch/powerpc/kernel/reloc_64.S
@@ -0,0 +1,87 @@
+/*
+ * Code to process dynamic relocations in the kernel.
+ *
+ * Copyright 2008 Paul Mackerras, IBM Corp.
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  as published by the Free Software Foundation; either version
+ *  2 of the License, or (at your option) any later version.
+ */
+
+#include <asm/ppc_asm.h>
+
+RELA = 7
+RELACOUNT = 0x6ffffff9
+R_PPC64_RELATIVE = 22
+
+/*
+ * r3 = desired final address of kernel
+ */
+_GLOBAL(relocate)
+        mflr    r0
+        bcl     20,31,$+4
+0:      mflr    r12             /* r12 has runtime addr of label 0 */
+        mtlr    r0
+        ld      r11,(p_dyn - 0b)(r12)
+        add     r11,r11,r12     /* r11 has runtime addr of .dynamic section */
+        ld      r9,(p_rela - 0b)(r12)
+        add     r9,r9,r12       /* r9 has runtime addr of .rela.dyn section */
+        ld      r10,(p_st - 0b)(r12)
+        add     r10,r10,r12     /* r10 has runtime addr of _stext */
+
+        /*
+         * Scan the dynamic section for the RELA and RELACOUNT entries.
+         */
+        li      r7,0
+        li      r8,0
+1:      ld      r6,0(r11)       /* get tag */
+        cmpdi   r6,0
+        beq     4f              /* end of list */
+        cmpdi   r6,RELA
+        bne     2f
+        ld      r7,8(r11)       /* get RELA pointer in r7 */
+        b       3f
+2:      addis   r6,r6,(-RELACOUNT)@ha
+        cmpdi   r6,RELACOUNT@l
+        bne     3f
+        ld      r8,8(r11)       /* get RELACOUNT value in r8 */
+3:      addi    r11,r11,16
+        b       1b
+4:      cmpdi   r7,0            /* check we have both RELA and RELACOUNT */
+        cmpdi   cr1,r8,0
+        beq     6f
+        beq     cr1,6f
+
+        /*
+         * Work out linktime address of _stext and hence the
+         * relocation offset to be applied.
+         * cur_offset [r7] = rela.run [r9] - rela.link [r7]
+         * _stext.link [r10] = _stext.run [r10] - cur_offset [r7]
+         * final_offset [r3] = _stext.final [r3] - _stext.link [r10]
+         */
+        subf    r7,r7,r9        /* cur_offset */
+        subf    r10,r7,r10
+        subf    r3,r10,r3       /* final_offset */
+
+        /*
+         * Run through the list of relocations and process the
+         * R_PPC64_RELATIVE ones.
+         */
+        mtctr   r8
+5:      lwz     r0,12(9)        /* ELF64_R_TYPE(reloc->r_info) */
+        cmpwi   r0,R_PPC64_RELATIVE
+        bne     6f
+        ld      r6,0(r9)        /* reloc->r_offset */
+        ld      r0,16(r9)       /* reloc->r_addend */
+        add     r0,r0,r3
+        stdx    r0,r7,r6
+        addi    r9,r9,24
+        bdnz    5b
+
+6:      blr
+
+p_dyn:  .llong  __dynamic_start - 0b
+p_rela: .llong  __rela_dyn_start - 0b
+p_st:   .llong  _stext - 0b
+
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 9cc5a52711e5..5ec56ff03e86 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -254,8 +254,21 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         /* If we are a Freescale core do a simple check so
          * we dont have to keep adding cases in the future */
         if (PVR_VER(pvr) & 0x8000) {
-                maj = PVR_MAJ(pvr);
-                min = PVR_MIN(pvr);
+                switch (PVR_VER(pvr)) {
+                case 0x8000:    /* 7441/7450/7451, Voyager */
+                case 0x8001:    /* 7445/7455, Apollo 6 */
+                case 0x8002:    /* 7447/7457, Apollo 7 */
+                case 0x8003:    /* 7447A, Apollo 7 PM */
+                case 0x8004:    /* 7448, Apollo 8 */
+                case 0x800c:    /* 7410, Nitro */
+                        maj = ((pvr >> 8) & 0xF);
+                        min = PVR_MIN(pvr);
+                        break;
+                default:        /* e500/book-e */
+                        maj = PVR_MAJ(pvr);
+                        min = PVR_MIN(pvr);
+                        break;
+                }
         } else {
                 switch (PVR_VER(pvr)) {
                         case 0x0020:    /* 403 family */
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index 066e65c59b58..c1a27626a940 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -111,7 +111,7 @@ notrace unsigned long __init early_init(unsigned long dt_ptr)
  * This is called very early on the boot process, after a minimal
  * MMU environment has been set up but before MMU_init is called.
  */
-notrace void __init machine_init(unsigned long dt_ptr, unsigned long phys)
+notrace void __init machine_init(unsigned long dt_ptr)
 {
         /* Enable early debugging if any specified (see udbg.h) */
         udbg_early_init();
@@ -209,23 +209,12 @@ EXPORT_SYMBOL(nvram_sync);
 
 #endif /* CONFIG_NVRAM */
 
-static DEFINE_PER_CPU(struct cpu, cpu_devices);
-
 int __init ppc_init(void)
 {
-        int cpu;
-
         /* clear the progress line */
         if (ppc_md.progress)
                 ppc_md.progress("             ", 0xffff);
 
-        /* register CPU devices */
-        for_each_possible_cpu(cpu) {
-                struct cpu *c = &per_cpu(cpu_devices, cpu);
-                c->hotpluggable = 1;
-                register_cpu(c, cpu);
-        }
-
         /* call platform init */
         if (ppc_md.init != NULL) {
                 ppc_md.init();
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 8b25f51f03bf..843c0af210d0 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -255,9 +255,11 @@ void early_setup_secondary(void)
 #endif /* CONFIG_SMP */
 
 #if defined(CONFIG_SMP) || defined(CONFIG_KEXEC)
+extern unsigned long __secondary_hold_spinloop;
+extern void generic_secondary_smp_init(void);
+
 void smp_release_cpus(void)
 {
-        extern unsigned long __secondary_hold_spinloop;
         unsigned long *ptr;
 
         DBG(" -> smp_release_cpus()\n");
@@ -266,12 +268,11 @@ void smp_release_cpus(void)
          * all now so they can start to spin on their individual paca
          * spinloops. For non SMP kernels, the secondary cpus never get out
          * of the common spinloop.
-         * This is useless but harmless on iSeries, secondaries are already
-         * waiting on their paca spinloops. */
+         */
 
         ptr  = (unsigned long *)((unsigned long)&__secondary_hold_spinloop
                         - PHYSICAL_START);
-        *ptr = 1;
+        *ptr = __pa(generic_secondary_smp_init);
         mb();
 
         DBG(" <- smp_release_cpus()\n");
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index c27b10a1bd79..ff9f7010097d 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -101,8 +101,7 @@ void smp_message_recv(int msg)
                 generic_smp_call_function_interrupt();
                 break;
         case PPC_MSG_RESCHEDULE:
-                /* XXX Do we have to do this? */
-                set_need_resched();
+                /* we notice need_resched on exit */
                 break;
         case PPC_MSG_CALL_FUNC_SINGLE:
                 generic_smp_call_function_single_interrupt();
diff --git a/arch/powerpc/kernel/swsusp_asm64.S b/arch/powerpc/kernel/swsusp_asm64.S
index e092c3cbdb9b..86ac1d90d02b 100644
--- a/arch/powerpc/kernel/swsusp_asm64.S
+++ b/arch/powerpc/kernel/swsusp_asm64.S
@@ -133,7 +133,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
 
         cmpdi   r12,0
         beq-    nothing_to_copy
-        li      r15,512
+        li      r15,PAGE_SIZE>>3
 copyloop:
         ld      r13,pbe_address(r12)
         ld      r14,pbe_orig_address(r12)
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index d98634c76060..ff7de7b0797e 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -107,14 +107,6 @@ asmlinkage long compat_sys_sysfs(u32 option, u32 arg1, u32 arg2)
         return sys_sysfs((int)option, arg1, arg2);
 }
 
-asmlinkage long compat_sys_pause(void)
-{
-        current->state = TASK_INTERRUPTIBLE;
-        schedule();
-        
-        return -ERESTARTNOHAND;
-}
-
 static inline long get_ts32(struct timespec *o, struct compat_timeval __user *i)
 {
         long usec;
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index 56d172d16e56..86a2ffccef25 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -15,18 +15,24 @@
 #include <asm/firmware.h>
 #include <asm/hvcall.h>
 #include <asm/prom.h>
-#include <asm/paca.h>
-#include <asm/lppaca.h>
 #include <asm/machdep.h>
 #include <asm/smp.h>
 
+#ifdef CONFIG_PPC64
+#include <asm/paca.h>
+#include <asm/lppaca.h>
+#endif
+
 static DEFINE_PER_CPU(struct cpu, cpu_devices);
 
 static DEFINE_PER_CPU(struct kobject *, cache_toplevel);
 
-/* SMT stuff */
+/*
+ * SMT snooze delay stuff, 64-bit only for now
+ */
+
+#ifdef CONFIG_PPC64
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
 /* Time in microseconds we delay before sleeping in the idle loop */
 DEFINE_PER_CPU(unsigned long, smt_snooze_delay) = { 100 };
 
@@ -106,7 +112,7 @@ static int __init setup_smt_snooze_delay(char *str)
 }
 __setup("smt-snooze-delay=", setup_smt_snooze_delay);
 
-#endif /* CONFIG_PPC_MULTIPLATFORM */
+#endif /* CONFIG_PPC64 */
 
 /*
  * Enabling PMCs will slow partition context switch times so we only do
@@ -115,7 +121,7 @@ __setup("smt-snooze-delay=", setup_smt_snooze_delay);
 
 static DEFINE_PER_CPU(char, pmcs_enabled);
 
-void ppc64_enable_pmcs(void)
+void ppc_enable_pmcs(void)
 {
         /* Only need to enable them once */
         if (__get_cpu_var(pmcs_enabled))
@@ -126,8 +132,9 @@ void ppc64_enable_pmcs(void)
         if (ppc_md.enable_pmcs)
                 ppc_md.enable_pmcs();
 }
-EXPORT_SYMBOL(ppc64_enable_pmcs);
+EXPORT_SYMBOL(ppc_enable_pmcs);
 
+#if defined(CONFIG_6xx) || defined(CONFIG_PPC64)
 /* XXX convert to rusty's on_one_cpu */
 static unsigned long run_on_cpu(unsigned long cpu,
                                 unsigned long (*func)(unsigned long),
@@ -146,6 +153,7 @@ static unsigned long run_on_cpu(unsigned long cpu,
 
         return ret;
 }
+#endif
 
 #define SYSFS_PMCSETUP(NAME, ADDRESS) \
 static unsigned long read_##NAME(unsigned long junk) \
@@ -154,7 +162,7 @@ static unsigned long read_##NAME(unsigned long junk) \
 } \
 static unsigned long write_##NAME(unsigned long val) \
 { \
-        ppc64_enable_pmcs(); \
+        ppc_enable_pmcs(); \
         mtspr(ADDRESS, val); \
         return 0; \
 } \
@@ -184,28 +192,53 @@ static ssize_t __used \
  * that are implemented on the current processor
  */
 
+#if defined(CONFIG_PPC64)
+#define HAS_PPC_PMC_CLASSIC     1
+#define HAS_PPC_PMC_IBM         1
+#define HAS_PPC_PMC_PA6T        1
+#elif defined(CONFIG_6xx)
+#define HAS_PPC_PMC_CLASSIC     1
+#define HAS_PPC_PMC_IBM         1
+#define HAS_PPC_PMC_G4          1
+#endif
+
+
+#ifdef HAS_PPC_PMC_CLASSIC
 SYSFS_PMCSETUP(mmcr0, SPRN_MMCR0);
 SYSFS_PMCSETUP(mmcr1, SPRN_MMCR1);
-SYSFS_PMCSETUP(mmcra, SPRN_MMCRA);
 SYSFS_PMCSETUP(pmc1, SPRN_PMC1);
 SYSFS_PMCSETUP(pmc2, SPRN_PMC2);
 SYSFS_PMCSETUP(pmc3, SPRN_PMC3);
 SYSFS_PMCSETUP(pmc4, SPRN_PMC4);
 SYSFS_PMCSETUP(pmc5, SPRN_PMC5);
 SYSFS_PMCSETUP(pmc6, SPRN_PMC6);
+
+#ifdef HAS_PPC_PMC_G4
+SYSFS_PMCSETUP(mmcr2, SPRN_MMCR2);
+#endif
+
+#ifdef CONFIG_PPC64
 SYSFS_PMCSETUP(pmc7, SPRN_PMC7);
 SYSFS_PMCSETUP(pmc8, SPRN_PMC8);
+
+SYSFS_PMCSETUP(mmcra, SPRN_MMCRA);
 SYSFS_PMCSETUP(purr, SPRN_PURR);
 SYSFS_PMCSETUP(spurr, SPRN_SPURR);
 SYSFS_PMCSETUP(dscr, SPRN_DSCR);
 
+static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
+static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);
+static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr);
+static SYSDEV_ATTR(purr, 0600, show_purr, store_purr);
+#endif /* CONFIG_PPC64 */
+
+#ifdef HAS_PPC_PMC_PA6T
 SYSFS_PMCSETUP(pa6t_pmc0, SPRN_PA6T_PMC0);
 SYSFS_PMCSETUP(pa6t_pmc1, SPRN_PA6T_PMC1);
 SYSFS_PMCSETUP(pa6t_pmc2, SPRN_PA6T_PMC2);
 SYSFS_PMCSETUP(pa6t_pmc3, SPRN_PA6T_PMC3);
 SYSFS_PMCSETUP(pa6t_pmc4, SPRN_PA6T_PMC4);
 SYSFS_PMCSETUP(pa6t_pmc5, SPRN_PA6T_PMC5);
-
 #ifdef CONFIG_DEBUG_KERNEL
 SYSFS_PMCSETUP(hid0, SPRN_HID0);
 SYSFS_PMCSETUP(hid1, SPRN_HID1);
@@ -236,28 +269,37 @@ SYSFS_PMCSETUP(tsr1, SPRN_PA6T_TSR1);
 SYSFS_PMCSETUP(tsr2, SPRN_PA6T_TSR2);
 SYSFS_PMCSETUP(tsr3, SPRN_PA6T_TSR3);
 #endif /* CONFIG_DEBUG_KERNEL */
+#endif /* HAS_PPC_PMC_PA6T */
 
-static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
-static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);
-static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr);
-static SYSDEV_ATTR(purr, 0600, show_purr, store_purr);
-
+#ifdef HAS_PPC_PMC_IBM
 static struct sysdev_attribute ibm_common_attrs[] = {
         _SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
         _SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
 };
+#endif /* HAS_PPC_PMC_G4 */
+
+#ifdef HAS_PPC_PMC_G4
+static struct sysdev_attribute g4_common_attrs[] = {
+        _SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
+        _SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
+        _SYSDEV_ATTR(mmcr2, 0600, show_mmcr2, store_mmcr2),
+};
+#endif /* HAS_PPC_PMC_G4 */
 
-static struct sysdev_attribute ibm_pmc_attrs[] = {
+static struct sysdev_attribute classic_pmc_attrs[] = {
         _SYSDEV_ATTR(pmc1, 0600, show_pmc1, store_pmc1),
         _SYSDEV_ATTR(pmc2, 0600, show_pmc2, store_pmc2),
         _SYSDEV_ATTR(pmc3, 0600, show_pmc3, store_pmc3),
         _SYSDEV_ATTR(pmc4, 0600, show_pmc4, store_pmc4),
         _SYSDEV_ATTR(pmc5, 0600, show_pmc5, store_pmc5),
         _SYSDEV_ATTR(pmc6, 0600, show_pmc6, store_pmc6),
+#ifdef CONFIG_PPC64
         _SYSDEV_ATTR(pmc7, 0600, show_pmc7, store_pmc7),
         _SYSDEV_ATTR(pmc8, 0600, show_pmc8, store_pmc8),
+#endif
 };
 
+#ifdef HAS_PPC_PMC_PA6T
 static struct sysdev_attribute pa6t_attrs[] = {
         _SYSDEV_ATTR(mmcr0, 0600, show_mmcr0, store_mmcr0),
         _SYSDEV_ATTR(mmcr1, 0600, show_mmcr1, store_mmcr1),
@@ -298,6 +340,8 @@ static struct sysdev_attribute pa6t_attrs[] = {
         _SYSDEV_ATTR(tsr3, 0600, show_tsr3, store_tsr3),
 #endif /* CONFIG_DEBUG_KERNEL */
 };
+#endif /* HAS_PPC_PMC_PA6T */
+#endif /* HAS_PPC_PMC_CLASSIC */
 
 struct cache_desc {
         struct kobject kobj;
@@ -588,23 +632,36 @@ static void __cpuinit register_cpu_online(unsigned int cpu)
         struct sysdev_attribute *attrs, *pmc_attrs;
         int i, nattrs;
 
+#ifdef CONFIG_PPC64
         if (!firmware_has_feature(FW_FEATURE_ISERIES) &&
                         cpu_has_feature(CPU_FTR_SMT))
                 sysdev_create_file(s, &attr_smt_snooze_delay);
+#endif
 
         /* PMC stuff */
         switch (cur_cpu_spec->pmc_type) {
+#ifdef HAS_PPC_PMC_IBM
         case PPC_PMC_IBM:
                 attrs = ibm_common_attrs;
                 nattrs = sizeof(ibm_common_attrs) / sizeof(struct sysdev_attribute);
-                pmc_attrs = ibm_pmc_attrs;
+                pmc_attrs = classic_pmc_attrs;
                 break;
+#endif /* HAS_PPC_PMC_IBM */
+#ifdef HAS_PPC_PMC_G4
+        case PPC_PMC_G4:
+                attrs = g4_common_attrs;
+                nattrs = sizeof(g4_common_attrs) / sizeof(struct sysdev_attribute);
+                pmc_attrs = classic_pmc_attrs;
+                break;
+#endif /* HAS_PPC_PMC_G4 */
+#ifdef HAS_PPC_PMC_PA6T
         case PPC_PMC_PA6T:
                 /* PA Semi starts counting at PMC0 */
                 attrs = pa6t_attrs;
                 nattrs = sizeof(pa6t_attrs) / sizeof(struct sysdev_attribute);
                 pmc_attrs = NULL;
                 break;
+#endif /* HAS_PPC_PMC_PA6T */
         default:
                 attrs = NULL;
                 nattrs = 0;
@@ -618,6 +675,7 @@ static void __cpuinit register_cpu_online(unsigned int cpu)
                 for (i = 0; i < cur_cpu_spec->num_pmcs; i++)
                         sysdev_create_file(s, &pmc_attrs[i]);
 
+#ifdef CONFIG_PPC64
         if (cpu_has_feature(CPU_FTR_MMCRA))
                 sysdev_create_file(s, &attr_mmcra);
 
@@ -629,6 +687,7 @@ static void __cpuinit register_cpu_online(unsigned int cpu)
 
         if (cpu_has_feature(CPU_FTR_DSCR))
                 sysdev_create_file(s, &attr_dscr);
+#endif /* CONFIG_PPC64 */
 
         create_cache_info(s);
 }
@@ -641,16 +700,9 @@ static void remove_cache_info(struct sys_device *sysdev)
         int cpu = sysdev->id;
 
         cache_desc = per_cpu(cache_desc, cpu);
-        if (cache_desc != NULL) {
-                sysfs_remove_file(&cache_desc->kobj, &cache_size_attr.attr);
-                sysfs_remove_file(&cache_desc->kobj, &cache_line_size_attr.attr);
-                sysfs_remove_file(&cache_desc->kobj, &cache_type_attr.attr);
-                sysfs_remove_file(&cache_desc->kobj, &cache_level_attr.attr);
-                sysfs_remove_file(&cache_desc->kobj, &cache_nr_sets_attr.attr);
-                sysfs_remove_file(&cache_desc->kobj, &cache_assoc_attr.attr);
-
+        if (cache_desc != NULL)
                 kobject_put(&cache_desc->kobj);
-        }
+
         cache_toplevel = per_cpu(cache_toplevel, cpu);
         if (cache_toplevel != NULL)
                 kobject_put(cache_toplevel);
@@ -671,17 +723,28 @@ static void unregister_cpu_online(unsigned int cpu)
 
         /* PMC stuff */
         switch (cur_cpu_spec->pmc_type) {
+#ifdef HAS_PPC_PMC_IBM
         case PPC_PMC_IBM:
                 attrs = ibm_common_attrs;
                 nattrs = sizeof(ibm_common_attrs) / sizeof(struct sysdev_attribute);
-                pmc_attrs = ibm_pmc_attrs;
+                pmc_attrs = classic_pmc_attrs;
+                break;
+#endif /* HAS_PPC_PMC_IBM */
+#ifdef HAS_PPC_PMC_G4
+        case PPC_PMC_G4:
+                attrs = g4_common_attrs;
+                nattrs = sizeof(g4_common_attrs) / sizeof(struct sysdev_attribute);
+                pmc_attrs = classic_pmc_attrs;
                 break;
+#endif /* HAS_PPC_PMC_G4 */
+#ifdef HAS_PPC_PMC_PA6T
         case PPC_PMC_PA6T:
                 /* PA Semi starts counting at PMC0 */
                 attrs = pa6t_attrs;
                 nattrs = sizeof(pa6t_attrs) / sizeof(struct sysdev_attribute);
                 pmc_attrs = NULL;
                 break;
+#endif /* HAS_PPC_PMC_PA6T */
         default:
                 attrs = NULL;
                 nattrs = 0;
@@ -695,6 +758,7 @@ static void unregister_cpu_online(unsigned int cpu)
                 for (i = 0; i < cur_cpu_spec->num_pmcs; i++)
                         sysdev_remove_file(s, &pmc_attrs[i]);
 
+#ifdef CONFIG_PPC64
         if (cpu_has_feature(CPU_FTR_MMCRA))
                 sysdev_remove_file(s, &attr_mmcra);
 
@@ -706,6 +770,7 @@ static void unregister_cpu_online(unsigned int cpu)
 
         if (cpu_has_feature(CPU_FTR_DSCR))
                 sysdev_remove_file(s, &attr_dscr);
+#endif /* CONFIG_PPC64 */
 
         remove_cache_info(s);
 }
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 2750fbab1975..434c92a85c03 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -1232,7 +1232,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
         else
                 viodev->dev.archdata.dma_ops = &dma_iommu_ops;
         viodev->dev.archdata.dma_data = vio_build_iommu_table(viodev);
-        viodev->dev.archdata.numa_node = of_node_to_nid(of_node);
+        set_dev_node(&viodev->dev, of_node_to_nid(of_node));
 
         /* init generic 'struct device' fields: */
         viodev->dev.parent = &vio_bus_device.dev;
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 9f6c1ca1739e..b39c27ed7919 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -187,6 +187,24 @@ SECTIONS
                 *(.machine.desc)
                 __machine_desc_end = . ;
         }
+        . = ALIGN(8);
+        .dynsym : AT(ADDR(.dynsym) - LOAD_OFFSET) { *(.dynsym) }
+        .dynstr : AT(ADDR(.dynstr) - LOAD_OFFSET) { *(.dynstr) }
+        .dynamic : AT(ADDR(.dynamic) - LOAD_OFFSET)
+        {
+                __dynamic_start = .;
+                *(.dynamic)
+        }
+        .hash : AT(ADDR(.hash) - LOAD_OFFSET) { *(.hash) }
+        .interp : AT(ADDR(.interp) - LOAD_OFFSET) { *(.interp) }
+        .rela.dyn : AT(ADDR(.rela.dyn) - LOAD_OFFSET)
+        {
+                __rela_dyn_start = .;
+                *(.rela*)
+        }
+
+        /* Fake ELF header containing RPA note; for addnote */
+        .fakeelf : AT(ADDR(.fakeelf) - LOAD_OFFSET) { *(.fakeelf) }
 
         /* freed after init ends here */
         . = ALIGN(PAGE_SIZE);
diff --git a/arch/powerpc/lib/copypage_64.S b/arch/powerpc/lib/copypage_64.S
index f9837f44ac0b..75f3267fdc30 100644
--- a/arch/powerpc/lib/copypage_64.S
+++ b/arch/powerpc/lib/copypage_64.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002 Paul Mackerras, IBM Corp.
+ * Copyright (C) 2008 Mark Nelson, IBM Corp.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -8,112 +8,100 @@
  */
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
+#include <asm/asm-offsets.h>
+
+        .section        ".toc","aw"
+PPC64_CACHES:
+        .tc             ppc64_caches[TC],ppc64_caches
+        .section        ".text"
+
 
 _GLOBAL(copy_4K_page)
-        std     r31,-8(1)
-        std     r30,-16(1)
-        std     r29,-24(1)
-        std     r28,-32(1)
-        std     r27,-40(1)
-        std     r26,-48(1)
-        std     r25,-56(1)
-        std     r24,-64(1)
-        std     r23,-72(1)
-        std     r22,-80(1)
-        std     r21,-88(1)
-        std     r20,-96(1)
-        li      r5,4096/32 - 1
+        li      r5,4096         /* 4K page size */
+BEGIN_FTR_SECTION
+        ld      r10,PPC64_CACHES@toc(r2)
+        lwz     r11,DCACHEL1LOGLINESIZE(r10)    /* log2 of cache line size */
+        lwz     r12,DCACHEL1LINESIZE(r10)       /* get cache line size */
+        li      r9,0
+        srd     r8,r5,r11
+
+        mtctr   r8
+setup:
+        dcbt    r9,r4
+        dcbz    r9,r3
+        add     r9,r9,r12
+        bdnz    setup
+END_FTR_SECTION_IFSET(CPU_FTR_CP_USE_DCBTZ)
         addi    r3,r3,-8
-        li      r12,5
-0:      addi    r5,r5,-24
-        mtctr   r12
-        ld      r22,640(4)
-        ld      r21,512(4)
-        ld      r20,384(4)
-        ld      r11,256(4)
-        ld      r9,128(4)
-        ld      r7,0(4)
-        ld      r25,648(4)
-        ld      r24,520(4)
-        ld      r23,392(4)
-        ld      r10,264(4)
-        ld      r8,136(4)
-        ldu     r6,8(4)
-        cmpwi   r5,24
-1:      std     r22,648(3)
-        std     r21,520(3)
-        std     r20,392(3)
-        std     r11,264(3)
-        std     r9,136(3)
-        std     r7,8(3)
-        ld      r28,648(4)
-        ld      r27,520(4)
-        ld      r26,392(4)
-        ld      r31,264(4)
-        ld      r30,136(4)
-        ld      r29,8(4)
-        std     r25,656(3)
-        std     r24,528(3)
-        std     r23,400(3)
-        std     r10,272(3)
-        std     r8,144(3)
-        std     r6,16(3)
-        ld      r22,656(4)
-        ld      r21,528(4)
-        ld      r20,400(4)
-        ld      r11,272(4)
-        ld      r9,144(4)
-        ld      r7,16(4)
-        std     r28,664(3)
-        std     r27,536(3)
-        std     r26,408(3)
-        std     r31,280(3)
-        std     r30,152(3)
-        stdu    r29,24(3)
-        ld      r25,664(4)
-        ld      r24,536(4)
-        ld      r23,408(4)
-        ld      r10,280(4)
-        ld      r8,152(4)
-        ldu     r6,24(4)
+        srdi    r8,r5,7         /* page is copied in 128 byte strides */
+        addi    r8,r8,-1        /* one stride copied outside loop */
+
+        mtctr   r8
+
+        ld      r5,0(r4)
+        ld      r6,8(r4)
+        ld      r7,16(r4)
+        ldu     r8,24(r4)
+1:      std     r5,8(r3)
+        ld      r9,8(r4)
+        std     r6,16(r3)
+        ld      r10,16(r4)
+        std     r7,24(r3)
+        ld      r11,24(r4)
+        std     r8,32(r3)
+        ld      r12,32(r4)
+        std     r9,40(r3)
+        ld      r5,40(r4)
+        std     r10,48(r3)
+        ld      r6,48(r4)
+        std     r11,56(r3)
+        ld      r7,56(r4)
+        std     r12,64(r3)
+        ld      r8,64(r4)
+        std     r5,72(r3)
+        ld      r9,72(r4)
+        std     r6,80(r3)
+        ld      r10,80(r4)
+        std     r7,88(r3)
+        ld      r11,88(r4)
+        std     r8,96(r3)
+        ld      r12,96(r4)
+        std     r9,104(r3)
+        ld      r5,104(r4)
+        std     r10,112(r3)
+        ld      r6,112(r4)
+        std     r11,120(r3)
+        ld      r7,120(r4)
+        stdu    r12,128(r3)
+        ldu     r8,128(r4)
         bdnz    1b
-        std     r22,648(3)
-        std     r21,520(3)
-        std     r20,392(3)
-        std     r11,264(3)
-        std     r9,136(3)
-        std     r7,8(3)
-        addi    r4,r4,640
-        addi    r3,r3,648
-        bge     0b
-        mtctr   r5
-        ld      r7,0(4)
-        ld      r8,8(4)
-        ldu     r9,16(4)
-3:      ld      r10,8(4)
-        std     r7,8(3)
-        ld      r7,16(4)
-        std     r8,16(3)
-        ld      r8,24(4)
-        std     r9,24(3)
-        ldu     r9,32(4)
-        stdu    r10,32(3)
-        bdnz    3b
-4:      ld      r10,8(4)
-        std     r7,8(3)
-        std     r8,16(3)
-        std     r9,24(3)
-        std     r10,32(3)
-9:      ld      r20,-96(1)
-        ld      r21,-88(1)
-        ld      r22,-80(1)
-        ld      r23,-72(1)
-        ld      r24,-64(1)
-        ld      r25,-56(1)
-        ld      r26,-48(1)
-        ld      r27,-40(1)
-        ld      r28,-32(1)
-        ld      r29,-24(1)
-        ld      r30,-16(1)
-        ld      r31,-8(1)
+
+        std     r5,8(r3)
+        ld      r9,8(r4)
+        std     r6,16(r3)
+        ld      r10,16(r4)
+        std     r7,24(r3)
+        ld      r11,24(r4)
+        std     r8,32(r3)
+        ld      r12,32(r4)
+        std     r9,40(r3)
+        ld      r5,40(r4)
+        std     r10,48(r3)
+        ld      r6,48(r4)
+        std     r11,56(r3)
+        ld      r7,56(r4)
+        std     r12,64(r3)
+        ld      r8,64(r4)
+        std     r5,72(r3)
+        ld      r9,72(r4)
+        std     r6,80(r3)
+        ld      r10,80(r4)
+        std     r7,88(r3)
+        ld      r11,88(r4)
+        std     r8,96(r3)
+        ld      r12,96(r4)
+        std     r9,104(r3)
+        std     r10,112(r3)
+        std     r11,120(r3)
+        std     r12,128(r3)
         blr
diff --git a/arch/powerpc/lib/dma-noncoherent.c b/arch/powerpc/lib/dma-noncoherent.c
index 5d83907f6591..31734c0969cd 100644
--- a/arch/powerpc/lib/dma-noncoherent.c
+++ b/arch/powerpc/lib/dma-noncoherent.c
@@ -203,7 +203,7 @@ __dma_alloc_coherent(size_t size, dma_addr_t *handle, gfp_t gfp)
                 /*
                  * Set the "dma handle"
                  */
-                *handle = page_to_bus(page);
+                *handle = page_to_phys(page);
 
                 do {
                         BUG_ON(!pte_none(*pte));
diff --git a/arch/powerpc/math-emu/Makefile b/arch/powerpc/math-emu/Makefile
index 29bc9126241b..03aa98dd9f0a 100644
--- a/arch/powerpc/math-emu/Makefile
+++ b/arch/powerpc/math-emu/Makefile
@@ -4,13 +4,14 @@ obj-y				:= math.o fmr.o lfd.o stfd.o
 obj-$(CONFIG_MATH_EMULATION)    += fabs.o fadd.o fadds.o fcmpo.o fcmpu.o \
                                         fctiw.o fctiwz.o fdiv.o fdivs.o \
                                         fmadd.o fmadds.o fmsub.o fmsubs.o \
-                                        fmul.o fmuls.o fnabs.o fneg.o types.o \
+                                        fmul.o fmuls.o fnabs.o fneg.o \
                                         fnmadd.o fnmadds.o fnmsub.o fnmsubs.o \
                                         fres.o frsp.o frsqrte.o fsel.o lfs.o \
                                         fsqrt.o fsqrts.o fsub.o fsubs.o \
                                         mcrfs.o mffs.o mtfsb0.o mtfsb1.o \
-                                        mtfsf.o mtfsfi.o stfiwx.o stfs.o \
-                                        udivmodti4.o
+                                        mtfsf.o mtfsfi.o stfiwx.o stfs.o
 
 CFLAGS_fabs.o = -fno-builtin-fabs
 CFLAGS_math.o = -fno-builtin-fabs
+
+EXTRA_CFLAGS = -I. -Iinclude/math-emu -w
diff --git a/arch/powerpc/math-emu/double.h b/arch/powerpc/math-emu/double.h
deleted file mode 100644
index ffba8b67f059..000000000000
--- a/arch/powerpc/math-emu/double.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Definitions for IEEE Double Precision
- */
-
-#if _FP_W_TYPE_SIZE < 32
-#error "Here's a nickel kid.  Go buy yourself a real computer."
-#endif
-
-#if _FP_W_TYPE_SIZE < 64
-#define _FP_FRACTBITS_D         (2 * _FP_W_TYPE_SIZE)
-#else
-#define _FP_FRACTBITS_D         _FP_W_TYPE_SIZE
-#endif
-
-#define _FP_FRACBITS_D          53
-#define _FP_FRACXBITS_D         (_FP_FRACTBITS_D - _FP_FRACBITS_D)
-#define _FP_WFRACBITS_D         (_FP_WORKBITS + _FP_FRACBITS_D)
-#define _FP_WFRACXBITS_D        (_FP_FRACTBITS_D - _FP_WFRACBITS_D)
-#define _FP_EXPBITS_D           11
-#define _FP_EXPBIAS_D           1023
-#define _FP_EXPMAX_D            2047
-
-#define _FP_QNANBIT_D           \
-        ((_FP_W_TYPE)1 << ((_FP_FRACBITS_D-2) % _FP_W_TYPE_SIZE))
-#define _FP_IMPLBIT_D           \
-        ((_FP_W_TYPE)1 << ((_FP_FRACBITS_D-1) % _FP_W_TYPE_SIZE))
-#define _FP_OVERFLOW_D          \
-        ((_FP_W_TYPE)1 << (_FP_WFRACBITS_D % _FP_W_TYPE_SIZE))
-
-#if _FP_W_TYPE_SIZE < 64
-
-union _FP_UNION_D
-{
-  double flt;
-  struct {
-#if __BYTE_ORDER == __BIG_ENDIAN
-    unsigned sign  : 1;
-    unsigned exp   : _FP_EXPBITS_D;
-    unsigned frac1 : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0) - _FP_W_TYPE_SIZE;
-    unsigned frac0 : _FP_W_TYPE_SIZE;
-#else
-    unsigned frac0 : _FP_W_TYPE_SIZE;
-    unsigned frac1 : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0) - _FP_W_TYPE_SIZE;
-    unsigned exp   : _FP_EXPBITS_D;
-    unsigned sign  : 1;
-#endif
-  } bits __attribute__((packed));
-};
-
-#define FP_DECL_D(X)            _FP_DECL(2,X)
-#define FP_UNPACK_RAW_D(X,val)  _FP_UNPACK_RAW_2(D,X,val)
-#define FP_PACK_RAW_D(val,X)    _FP_PACK_RAW_2(D,val,X)
-
-#define FP_UNPACK_D(X,val)              \
-  do {                                  \
-    _FP_UNPACK_RAW_2(D,X,val);          \
-    _FP_UNPACK_CANONICAL(D,2,X);        \
-  } while (0)
-
-#define FP_PACK_D(val,X)                \
-  do {                                  \
-    _FP_PACK_CANONICAL(D,2,X);          \
-    _FP_PACK_RAW_2(D,val,X);            \
-  } while (0)
-
-#define FP_NEG_D(R,X)           _FP_NEG(D,2,R,X)
-#define FP_ADD_D(R,X,Y)         _FP_ADD(D,2,R,X,Y)
-#define FP_SUB_D(R,X,Y)         _FP_SUB(D,2,R,X,Y)
-#define FP_MUL_D(R,X,Y)         _FP_MUL(D,2,R,X,Y)
-#define FP_DIV_D(R,X,Y)         _FP_DIV(D,2,R,X,Y)
-#define FP_SQRT_D(R,X)          _FP_SQRT(D,2,R,X)
-
-#define FP_CMP_D(r,X,Y,un)      _FP_CMP(D,2,r,X,Y,un)
-#define FP_CMP_EQ_D(r,X,Y)      _FP_CMP_EQ(D,2,r,X,Y)
-
-#define FP_TO_INT_D(r,X,rsz,rsg)  _FP_TO_INT(D,2,r,X,rsz,rsg)
-#define FP_FROM_INT_D(X,r,rs,rt)  _FP_FROM_INT(D,2,X,r,rs,rt)
-
-#else
-
-union _FP_UNION_D
-{
-  double flt;
-  struct {
-#if __BYTE_ORDER == __BIG_ENDIAN
-    unsigned sign : 1;
-    unsigned exp  : _FP_EXPBITS_D;
-    unsigned long frac : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0);
-#else
-    unsigned long frac : _FP_FRACBITS_D - (_FP_IMPLBIT_D != 0);
-    unsigned exp  : _FP_EXPBITS_D;
-    unsigned sign : 1;
-#endif
-  } bits __attribute__((packed));
-};
-
-#define FP_DECL_D(X)            _FP_DECL(1,X)
-#define FP_UNPACK_RAW_D(X,val)  _FP_UNPACK_RAW_1(D,X,val)
-#define FP_PACK_RAW_D(val,X)    _FP_PACK_RAW_1(D,val,X)
-
-#define FP_UNPACK_D(X,val)              \
-  do {                                  \
-    _FP_UNPACK_RAW_1(D,X,val);          \
-    _FP_UNPACK_CANONICAL(D,1,X);        \
-  } while (0)
-
-#define FP_PACK_D(val,X)                \
-  do {                                  \
-    _FP_PACK_CANONICAL(D,1,X);          \
-    _FP_PACK_RAW_1(D,val,X);            \
-  } while (0)
-
-#define FP_NEG_D(R,X)           _FP_NEG(D,1,R,X)
-#define FP_ADD_D(R,X,Y)         _FP_ADD(D,1,R,X,Y)
-#define FP_SUB_D(R,X,Y)         _FP_SUB(D,1,R,X,Y)
-#define FP_MUL_D(R,X,Y)         _FP_MUL(D,1,R,X,Y)
-#define FP_DIV_D(R,X,Y)         _FP_DIV(D,1,R,X,Y)
-#define FP_SQRT_D(R,X)          _FP_SQRT(D,1,R,X)
-
-/* The implementation of _FP_MUL_D and _FP_DIV_D should be chosen by
-   the target machine.  */
-
-#define FP_CMP_D(r,X,Y,un)      _FP_CMP(D,1,r,X,Y,un)
-#define FP_CMP_EQ_D(r,X,Y)      _FP_CMP_EQ(D,1,r,X,Y)
-
-#define FP_TO_INT_D(r,X,rsz,rsg)  _FP_TO_INT(D,1,r,X,rsz,rsg)
-#define FP_FROM_INT_D(X,r,rs,rt)  _FP_FROM_INT(D,1,X,r,rs,rt)
-
-#endif /* W_TYPE_SIZE < 64 */
diff --git a/arch/powerpc/math-emu/fadd.c b/arch/powerpc/math-emu/fadd.c
index 7befbbf2c332..04d3b4aa32ce 100644
--- a/arch/powerpc/math-emu/fadd.c
+++ b/arch/powerpc/math-emu/fadd.c
@@ -2,8 +2,9 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fadd(void *frD, void *frA, void *frB)
@@ -11,28 +12,28 @@ fadd(void *frD, void *frA, void *frB)
         FP_DECL_D(A);
         FP_DECL_D(B);
         FP_DECL_D(R);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
         printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
 #endif
 
-        if (A_s != B_s && A_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
         FP_ADD_D(R, A, B);
 
 #ifdef DEBUG
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_D(frD, R));
+        __FP_PACK_D(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fadds.c b/arch/powerpc/math-emu/fadds.c
index 2b346b38b480..5930f40a8687 100644
--- a/arch/powerpc/math-emu/fadds.c
+++ b/arch/powerpc/math-emu/fadds.c
@@ -2,9 +2,10 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 fadds(void *frD, void *frA, void *frB)
@@ -12,28 +13,27 @@ fadds(void *frD, void *frA, void *frB)
         FP_DECL_D(A);
         FP_DECL_D(B);
         FP_DECL_D(R);
-        int ret = 0;
+        FP_DECL_EX;
 
 #ifdef DEBUG
         printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
         printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
 #endif
 
-        if (A_s != B_s && A_c == FP_CLS_INF && B_c == FP_CLS_INF)
-                ret |= EFLAG_VXISI;
-
         FP_ADD_D(R, A, B);
 
 #ifdef DEBUG
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_DS(frD, R));
+        __FP_PACK_DS(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fcmpo.c b/arch/powerpc/math-emu/fcmpo.c
index 36d689044c63..b5dc4498cd71 100644
--- a/arch/powerpc/math-emu/fcmpo.c
+++ b/arch/powerpc/math-emu/fcmpo.c
@@ -2,14 +2,16 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fcmpo(u32 *ccr, int crfD, void *frA, void *frB)
 {
         FP_DECL_D(A);
         FP_DECL_D(B);
+        FP_DECL_EX;
         int code[4] = { (1 << 3), (1 << 1), (1 << 2), (1 << 0) };
         long cmp;
         int ret = 0;
@@ -18,8 +20,8 @@ fcmpo(u32 *ccr, int crfD, void *frA, void *frB)
         printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
diff --git a/arch/powerpc/math-emu/fcmpu.c b/arch/powerpc/math-emu/fcmpu.c
index 53d93894f2a6..d4fb1babc6ad 100644
--- a/arch/powerpc/math-emu/fcmpu.c
+++ b/arch/powerpc/math-emu/fcmpu.c
@@ -2,14 +2,16 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fcmpu(u32 *ccr, int crfD, void *frA, void *frB)
 {
         FP_DECL_D(A);
         FP_DECL_D(B);
+        FP_DECL_EX;
         int code[4] = { (1 << 3), (1 << 1), (1 << 2), (1 << 0) };
         long cmp;
 
@@ -17,8 +19,8 @@ fcmpu(u32 *ccr, int crfD, void *frA, void *frB)
         printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
diff --git a/arch/powerpc/math-emu/fctiw.c b/arch/powerpc/math-emu/fctiw.c
index fcd7a95e021d..f694440ddc00 100644
--- a/arch/powerpc/math-emu/fctiw.c
+++ b/arch/powerpc/math-emu/fctiw.c
@@ -2,16 +2,18 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fctiw(u32 *frD, void *frB)
 {
         FP_DECL_D(B);
+        FP_DECL_EX;
         unsigned int r;
 
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(B, frB);
         FP_TO_INT_D(r, B, 32, 1);
         frD[1] = r;
 
diff --git a/arch/powerpc/math-emu/fctiwz.c b/arch/powerpc/math-emu/fctiwz.c
index 1514d59e146e..71e782fd4fe3 100644
--- a/arch/powerpc/math-emu/fctiwz.c
+++ b/arch/powerpc/math-emu/fctiwz.c
@@ -2,13 +2,15 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fctiwz(u32 *frD, void *frB)
 {
         FP_DECL_D(B);
+        FP_DECL_EX;
         u32 fpscr;
         unsigned int r;
 
@@ -16,7 +18,7 @@ fctiwz(u32 *frD, void *frB)
         __FPU_FPSCR &= ~(3);
         __FPU_FPSCR |= FP_RND_ZERO;
 
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(B, frB);
         FP_TO_INT_D(r, B, 32, 1);
         frD[1] = r;
 
diff --git a/arch/powerpc/math-emu/fdiv.c b/arch/powerpc/math-emu/fdiv.c
index 18a20fe396b0..2db15097d98e 100644
--- a/arch/powerpc/math-emu/fdiv.c
+++ b/arch/powerpc/math-emu/fdiv.c
@@ -2,8 +2,9 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fdiv(void *frD, void *frA, void *frB)
@@ -11,14 +12,15 @@ fdiv(void *frD, void *frA, void *frB)
         FP_DECL_D(A);
         FP_DECL_D(B);
         FP_DECL_D(R);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -49,5 +51,7 @@ fdiv(void *frD, void *frA, void *frB)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_D(frD, R));
+        __FP_PACK_D(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fdivs.c b/arch/powerpc/math-emu/fdivs.c
index 24feed689c35..797f6a9a20b5 100644
--- a/arch/powerpc/math-emu/fdivs.c
+++ b/arch/powerpc/math-emu/fdivs.c
@@ -2,9 +2,10 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 fdivs(void *frD, void *frA, void *frB)
@@ -12,14 +13,15 @@ fdivs(void *frD, void *frA, void *frB)
         FP_DECL_D(A);
         FP_DECL_D(B);
         FP_DECL_D(R);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -51,5 +53,7 @@ fdivs(void *frD, void *frA, void *frB)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_DS(frD, R));
+        __FP_PACK_DS(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fmadd.c b/arch/powerpc/math-emu/fmadd.c
index dedb465fdc68..925313aa6f82 100644
--- a/arch/powerpc/math-emu/fmadd.c
+++ b/arch/powerpc/math-emu/fmadd.c
@@ -2,8 +2,9 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fmadd(void *frD, void *frA, void *frB, void *frC)
@@ -13,15 +14,16 @@ fmadd(void *frD, void *frA, void *frB, void *frC)
         FP_DECL_D(B);
         FP_DECL_D(C);
         FP_DECL_D(T);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
+        FP_UNPACK_DP(C, frC);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -44,5 +46,7 @@ fmadd(void *frD, void *frA, void *frB, void *frC)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_D(frD, R));
+        __FP_PACK_D(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fmadds.c b/arch/powerpc/math-emu/fmadds.c
index 6bbb56d5502c..aea80ef79399 100644
--- a/arch/powerpc/math-emu/fmadds.c
+++ b/arch/powerpc/math-emu/fmadds.c
@@ -2,9 +2,10 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 fmadds(void *frD, void *frA, void *frB, void *frC)
@@ -14,15 +15,16 @@ fmadds(void *frD, void *frA, void *frB, void *frC)
         FP_DECL_D(B);
         FP_DECL_D(C);
         FP_DECL_D(T);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
+        FP_UNPACK_DP(C, frC);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -45,5 +47,7 @@ fmadds(void *frD, void *frA, void *frB, void *frC)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_DS(frD, R));
+        __FP_PACK_DS(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fmsub.c b/arch/powerpc/math-emu/fmsub.c
index f311e2c7e67e..a644d525fca6 100644
--- a/arch/powerpc/math-emu/fmsub.c
+++ b/arch/powerpc/math-emu/fmsub.c
@@ -2,8 +2,9 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fmsub(void *frD, void *frA, void *frB, void *frC)
@@ -13,15 +14,16 @@ fmsub(void *frD, void *frA, void *frB, void *frC)
         FP_DECL_D(B);
         FP_DECL_D(C);
         FP_DECL_D(T);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
+        FP_UNPACK_DP(C, frC);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -47,5 +49,7 @@ fmsub(void *frD, void *frA, void *frB, void *frC)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_D(frD, R));
+        __FP_PACK_D(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fmsubs.c b/arch/powerpc/math-emu/fmsubs.c
index 81a716d3ee2e..2fdeeb9bb569 100644
--- a/arch/powerpc/math-emu/fmsubs.c
+++ b/arch/powerpc/math-emu/fmsubs.c
@@ -2,9 +2,10 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 fmsubs(void *frD, void *frA, void *frB, void *frC)
@@ -14,15 +15,16 @@ fmsubs(void *frD, void *frA, void *frB, void *frC)
         FP_DECL_D(B);
         FP_DECL_D(C);
         FP_DECL_D(T);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
+        FP_UNPACK_DP(C, frC);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -48,5 +50,7 @@ fmsubs(void *frD, void *frA, void *frB, void *frC)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_DS(frD, R));
+        __FP_PACK_DS(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fmul.c b/arch/powerpc/math-emu/fmul.c
index 2f3d32784a04..391fd17d3440 100644
--- a/arch/powerpc/math-emu/fmul.c
+++ b/arch/powerpc/math-emu/fmul.c
@@ -2,8 +2,9 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fmul(void *frD, void *frA, void *frB)
@@ -11,14 +12,15 @@ fmul(void *frD, void *frA, void *frB)
         FP_DECL_D(A);
         FP_DECL_D(B);
         FP_DECL_D(R);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
@@ -38,5 +40,7 @@ fmul(void *frD, void *frA, void *frB)
                R_s, R_f1, R_f0, R_e, R_c, R_f1, R_f0, R_e + 1023);
 #endif
 
-        return (ret | __FP_PACK_D(frD, R));
+        __FP_PACK_D(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fmuls.c b/arch/powerpc/math-emu/fmuls.c
index 962b5883f784..2d3ec5f7da20 100644
--- a/arch/powerpc/math-emu/fmuls.c
+++ b/arch/powerpc/math-emu/fmuls.c
@@ -2,9 +2,10 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 fmuls(void *frD, void *frA, void *frB)
@@ -12,14 +13,15 @@ fmuls(void *frD, void *frA, void *frB)
         FP_DECL_D(A);
         FP_DECL_D(B);
         FP_DECL_D(R);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld) [%08lx.%08lx %lx]\n",
@@ -39,5 +41,7 @@ fmuls(void *frD, void *frA, void *frB)
                R_s, R_f1, R_f0, R_e, R_c, R_f1, R_f0, R_e + 1023);
 #endif
 
-        return (ret | __FP_PACK_DS(frD, R));
+        __FP_PACK_DS(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fnmadd.c b/arch/powerpc/math-emu/fnmadd.c
index 8cf7827c4fb5..2497b86494e5 100644
--- a/arch/powerpc/math-emu/fnmadd.c
+++ b/arch/powerpc/math-emu/fnmadd.c
@@ -2,8 +2,9 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fnmadd(void *frD, void *frA, void *frB, void *frC)
@@ -13,15 +14,16 @@ fnmadd(void *frD, void *frA, void *frB, void *frC)
         FP_DECL_D(B);
         FP_DECL_D(C);
         FP_DECL_D(T);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
+        FP_UNPACK_DP(C, frC);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -47,5 +49,7 @@ fnmadd(void *frD, void *frA, void *frB, void *frC)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_D(frD, R));
+        __FP_PACK_D(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fnmadds.c b/arch/powerpc/math-emu/fnmadds.c
index f1c4f0f0d807..ee9d71e0b376 100644
--- a/arch/powerpc/math-emu/fnmadds.c
+++ b/arch/powerpc/math-emu/fnmadds.c
@@ -2,9 +2,10 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 fnmadds(void *frD, void *frA, void *frB, void *frC)
@@ -14,15 +15,16 @@ fnmadds(void *frD, void *frA, void *frB, void *frC)
         FP_DECL_D(B);
         FP_DECL_D(C);
         FP_DECL_D(T);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
+        FP_UNPACK_DP(C, frC);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -48,5 +50,7 @@ fnmadds(void *frD, void *frA, void *frB, void *frC)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_DS(frD, R));
+        __FP_PACK_DS(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fnmsub.c b/arch/powerpc/math-emu/fnmsub.c
index 98944e6e2601..3885a77acc93 100644
--- a/arch/powerpc/math-emu/fnmsub.c
+++ b/arch/powerpc/math-emu/fnmsub.c
@@ -2,8 +2,9 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fnmsub(void *frD, void *frA, void *frB, void *frC)
@@ -13,15 +14,16 @@ fnmsub(void *frD, void *frA, void *frB, void *frC)
         FP_DECL_D(B);
         FP_DECL_D(C);
         FP_DECL_D(T);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
+        FP_UNPACK_DP(C, frC);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -50,5 +52,7 @@ fnmsub(void *frD, void *frA, void *frB, void *frC)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_D(frD, R));
+        __FP_PACK_D(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fnmsubs.c b/arch/powerpc/math-emu/fnmsubs.c
index b20f4eb63fb9..f835dfeb0fd1 100644
--- a/arch/powerpc/math-emu/fnmsubs.c
+++ b/arch/powerpc/math-emu/fnmsubs.c
@@ -2,9 +2,10 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 fnmsubs(void *frD, void *frA, void *frB, void *frC)
@@ -14,15 +15,16 @@ fnmsubs(void *frD, void *frA, void *frB, void *frC)
         FP_DECL_D(B);
         FP_DECL_D(C);
         FP_DECL_D(T);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
-        __FP_UNPACK_D(C, frC);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
+        FP_UNPACK_DP(C, frC);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -51,5 +53,7 @@ fnmsubs(void *frD, void *frA, void *frB, void *frC)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_DS(frD, R));
+        __FP_PACK_DS(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/frsp.c b/arch/powerpc/math-emu/frsp.c
index 724ccbc0468e..ddcc14664b1a 100644
--- a/arch/powerpc/math-emu/frsp.c
+++ b/arch/powerpc/math-emu/frsp.c
@@ -2,24 +2,28 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 frsp(void *frD, void *frB)
 {
         FP_DECL_D(B);
+        FP_DECL_EX;
 
 #ifdef DEBUG
         printk("%s: D %p, B %p\n", __func__, frD, frB);
 #endif
 
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
 #endif
 
-        return __FP_PACK_DS(frD, B);
+        __FP_PACK_DS(frD, B);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fsel.c b/arch/powerpc/math-emu/fsel.c
index ecb5f28eb1f3..1b0c14498032 100644
--- a/arch/powerpc/math-emu/fsel.c
+++ b/arch/powerpc/math-emu/fsel.c
@@ -2,19 +2,21 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fsel(u32 *frD, void *frA, u32 *frB, u32 *frC)
 {
         FP_DECL_D(A);
+        FP_DECL_EX;
 
 #ifdef DEBUG
         printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
 
-        __FP_UNPACK_D(A, frA);
+        FP_UNPACK_DP(A, frA);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
diff --git a/arch/powerpc/math-emu/fsqrt.c b/arch/powerpc/math-emu/fsqrt.c
index 38ec2b752e9d..3e90072693a0 100644
--- a/arch/powerpc/math-emu/fsqrt.c
+++ b/arch/powerpc/math-emu/fsqrt.c
@@ -2,21 +2,23 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fsqrt(void *frD, void *frB)
 {
         FP_DECL_D(B);
         FP_DECL_D(R);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p %p\n", __func__, frD, frB);
 #endif
 
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
@@ -33,5 +35,7 @@ fsqrt(void *frD, void *frB)
         printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_D(frD, R));
+        __FP_PACK_D(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fsqrts.c b/arch/powerpc/math-emu/fsqrts.c
index 335263e06ee5..2843be986e2e 100644
--- a/arch/powerpc/math-emu/fsqrts.c
+++ b/arch/powerpc/math-emu/fsqrts.c
@@ -2,22 +2,24 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 fsqrts(void *frD, void *frB)
 {
         FP_DECL_D(B);
         FP_DECL_D(R);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p %p\n", __func__, frD, frB);
 #endif
 
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("B: %ld %lu %lu %ld (%ld)\n", B_s, B_f1, B_f0, B_e, B_c);
@@ -34,5 +36,7 @@ fsqrts(void *frD, void *frB)
         printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_DS(frD, R));
+        __FP_PACK_DS(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fsub.c b/arch/powerpc/math-emu/fsub.c
index 208d20fc52a5..78b09446a0e1 100644
--- a/arch/powerpc/math-emu/fsub.c
+++ b/arch/powerpc/math-emu/fsub.c
@@ -2,8 +2,9 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
 
 int
 fsub(void *frD, void *frA, void *frB)
@@ -11,14 +12,15 @@ fsub(void *frD, void *frA, void *frB)
         FP_DECL_D(A);
         FP_DECL_D(B);
         FP_DECL_D(R);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -37,5 +39,7 @@ fsub(void *frD, void *frA, void *frB)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_D(frD, R));
+        __FP_PACK_D(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/fsubs.c b/arch/powerpc/math-emu/fsubs.c
index 0e61b808c44b..d3bf90863cf2 100644
--- a/arch/powerpc/math-emu/fsubs.c
+++ b/arch/powerpc/math-emu/fsubs.c
@@ -2,9 +2,10 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 fsubs(void *frD, void *frA, void *frB)
@@ -12,14 +13,15 @@ fsubs(void *frD, void *frA, void *frB)
         FP_DECL_D(A);
         FP_DECL_D(B);
         FP_DECL_D(R);
+        FP_DECL_EX;
         int ret = 0;
 
 #ifdef DEBUG
         printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
 
-        __FP_UNPACK_D(A, frA);
-        __FP_UNPACK_D(B, frB);
+        FP_UNPACK_DP(A, frA);
+        FP_UNPACK_DP(B, frB);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -38,5 +40,7 @@ fsubs(void *frD, void *frA, void *frB)
         printk("D: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return (ret | __FP_PACK_DS(frD, R));
+        __FP_PACK_DS(frD, R);
+
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/lfd.c b/arch/powerpc/math-emu/lfd.c
index 6ec90b57c61a..79ac76d596c3 100644
--- a/arch/powerpc/math-emu/lfd.c
+++ b/arch/powerpc/math-emu/lfd.c
@@ -2,8 +2,8 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "sfp-machine.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/double.h>
 
 int
 lfd(void *frD, void *ea)
diff --git a/arch/powerpc/math-emu/lfs.c b/arch/powerpc/math-emu/lfs.c
index 6f18ebe3a7ff..434ed27be8db 100644
--- a/arch/powerpc/math-emu/lfs.c
+++ b/arch/powerpc/math-emu/lfs.c
@@ -2,15 +2,17 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 lfs(void *frD, void *ea)
 {
         FP_DECL_D(R);
         FP_DECL_S(A);
+        FP_DECL_EX;
         float f;
 
 #ifdef DEBUG
@@ -20,7 +22,7 @@ lfs(void *frD, void *ea)
         if (copy_from_user(&f, ea, sizeof(float)))
                 return -EFAULT;
 
-        __FP_UNPACK_S(A, &f);
+        FP_UNPACK_S(A, f);
 
 #ifdef DEBUG
         printk("A: %ld %lu %ld (%ld) [%08lx]\n", A_s, A_f, A_e, A_c,
@@ -33,5 +35,12 @@ lfs(void *frD, void *ea)
         printk("R: %ld %lu %lu %ld (%ld)\n", R_s, R_f1, R_f0, R_e, R_c);
 #endif
 
-        return __FP_PACK_D(frD, R);
+        if (R_c == FP_CLS_NAN) {
+                R_e = _FP_EXPMAX_D;
+                _FP_PACK_RAW_2_P(D, frD, R);
+        } else {
+                __FP_PACK_D(frD, R);
+        }
+
+        return 0;
 }
diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c
index 29e545e0272e..164d55935bd8 100644
--- a/arch/powerpc/math-emu/math.c
+++ b/arch/powerpc/math-emu/math.c
@@ -8,8 +8,8 @@
 #include <asm/uaccess.h>
 #include <asm/reg.h>
 
-#include "sfp-machine.h"
-#include "double.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/double.h>
 
 #define FLOATFUNC(x)    extern int x(void *, void *, void *, void *)
 
@@ -168,6 +168,8 @@ record_exception(struct pt_regs *regs, int eflag)
                         fpscr |= FPSCR_ZX;
                 if (eflag & EFLAG_INEXACT)
                         fpscr |= FPSCR_XX;
+                if (eflag & EFLAG_INVALID)
+                        fpscr |= FPSCR_VX;
                 if (eflag & EFLAG_VXSNAN)
                         fpscr |= FPSCR_VXSNAN;
                 if (eflag & EFLAG_VXISI)
@@ -188,7 +190,7 @@ record_exception(struct pt_regs *regs, int eflag)
                         fpscr |= FPSCR_VXCVI;
         }
 
-        fpscr &= ~(FPSCR_VX);
+//      fpscr &= ~(FPSCR_VX);
         if (fpscr & (FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI |
                      FPSCR_VXZDZ | FPSCR_VXIMZ | FPSCR_VXVC |
                      FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI))
diff --git a/arch/powerpc/math-emu/mcrfs.c b/arch/powerpc/math-emu/mcrfs.c
index 41ba247faf89..e948d5708e2b 100644
--- a/arch/powerpc/math-emu/mcrfs.c
+++ b/arch/powerpc/math-emu/mcrfs.c
@@ -2,7 +2,8 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
 
 int
 mcrfs(u32 *ccr, u32 crfD, u32 crfS)
diff --git a/arch/powerpc/math-emu/mffs.c b/arch/powerpc/math-emu/mffs.c
index b0e2106e6eb6..5526cf96ede5 100644
--- a/arch/powerpc/math-emu/mffs.c
+++ b/arch/powerpc/math-emu/mffs.c
@@ -2,7 +2,8 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
 
 int
 mffs(u32 *frD)
diff --git a/arch/powerpc/math-emu/mtfsb0.c b/arch/powerpc/math-emu/mtfsb0.c
index d3062350ea21..bc985585bca8 100644
--- a/arch/powerpc/math-emu/mtfsb0.c
+++ b/arch/powerpc/math-emu/mtfsb0.c
@@ -2,7 +2,8 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
 
 int
 mtfsb0(int crbD)
diff --git a/arch/powerpc/math-emu/mtfsb1.c b/arch/powerpc/math-emu/mtfsb1.c
index 2e948704b56e..fe6ed5ac85b3 100644
--- a/arch/powerpc/math-emu/mtfsb1.c
+++ b/arch/powerpc/math-emu/mtfsb1.c
@@ -2,7 +2,8 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
 
 int
 mtfsb1(int crbD)
diff --git a/arch/powerpc/math-emu/mtfsf.c b/arch/powerpc/math-emu/mtfsf.c
index 48014d8e3af1..dbce92e4f046 100644
--- a/arch/powerpc/math-emu/mtfsf.c
+++ b/arch/powerpc/math-emu/mtfsf.c
@@ -2,12 +2,14 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
 
 int
 mtfsf(unsigned int FM, u32 *frB)
 {
         u32 mask;
+        u32 fpscr;
 
         if (FM == 0)
                 return 0;
@@ -37,6 +39,22 @@ mtfsf(unsigned int FM, u32 *frB)
         __FPU_FPSCR &= ~(mask);
         __FPU_FPSCR |= (frB[1] & mask);
 
+        __FPU_FPSCR &= ~(FPSCR_VX);
+        if (__FPU_FPSCR & (FPSCR_VXSNAN | FPSCR_VXISI | FPSCR_VXIDI |
+                     FPSCR_VXZDZ | FPSCR_VXIMZ | FPSCR_VXVC |
+                     FPSCR_VXSOFT | FPSCR_VXSQRT | FPSCR_VXCVI))
+                __FPU_FPSCR |= FPSCR_VX;
+
+        fpscr = __FPU_FPSCR;
+        fpscr &= ~(FPSCR_FEX);
+        if (((fpscr & FPSCR_VX) && (fpscr & FPSCR_VE)) ||
+            ((fpscr & FPSCR_OX) && (fpscr & FPSCR_OE)) ||
+            ((fpscr & FPSCR_UX) && (fpscr & FPSCR_UE)) ||
+            ((fpscr & FPSCR_ZX) && (fpscr & FPSCR_ZE)) ||
+            ((fpscr & FPSCR_XX) && (fpscr & FPSCR_XE)))
+                fpscr |= FPSCR_FEX;
+        __FPU_FPSCR = fpscr;
+
 #ifdef DEBUG
         printk("%s: %02x %p: %08lx\n", __func__, FM, frB, __FPU_FPSCR);
 #endif
diff --git a/arch/powerpc/math-emu/mtfsfi.c b/arch/powerpc/math-emu/mtfsfi.c
index 031e20093549..fd2acc26813b 100644
--- a/arch/powerpc/math-emu/mtfsfi.c
+++ b/arch/powerpc/math-emu/mtfsfi.c
@@ -2,7 +2,8 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
 
 int
 mtfsfi(unsigned int crfD, unsigned int IMM)
diff --git a/arch/powerpc/math-emu/op-1.h b/arch/powerpc/math-emu/op-1.h
deleted file mode 100644
index c92fa95f562e..000000000000
--- a/arch/powerpc/math-emu/op-1.h
+++ /dev/null
@@ -1,245 +0,0 @@
-/*
- * Basic one-word fraction declaration and manipulation.
- */
-
-#define _FP_FRAC_DECL_1(X)      _FP_W_TYPE X##_f
-#define _FP_FRAC_COPY_1(D,S)    (D##_f = S##_f)
-#define _FP_FRAC_SET_1(X,I)     (X##_f = I)
-#define _FP_FRAC_HIGH_1(X)      (X##_f)
-#define _FP_FRAC_LOW_1(X)       (X##_f)
-#define _FP_FRAC_WORD_1(X,w)    (X##_f)
-
-#define _FP_FRAC_ADDI_1(X,I)    (X##_f += I)
-#define _FP_FRAC_SLL_1(X,N)                     \
-  do {                                          \
-    if (__builtin_constant_p(N) && (N) == 1)    \
-      X##_f += X##_f;                           \
-    else                                        \
-      X##_f <<= (N);                            \
-  } while (0)
-#define _FP_FRAC_SRL_1(X,N)     (X##_f >>= N)
-
-/* Right shift with sticky-lsb.  */
-#define _FP_FRAC_SRS_1(X,N,sz)  __FP_FRAC_SRS_1(X##_f, N, sz)
-
-#define __FP_FRAC_SRS_1(X,N,sz)                                         \
-   (X = (X >> (N) | (__builtin_constant_p(N) && (N) == 1                \
-                     ? X & 1 : (X << (_FP_W_TYPE_SIZE - (N))) != 0)))
-
-#define _FP_FRAC_ADD_1(R,X,Y)   (R##_f = X##_f + Y##_f)
-#define _FP_FRAC_SUB_1(R,X,Y)   (R##_f = X##_f - Y##_f)
-#define _FP_FRAC_CLZ_1(z, X)    __FP_CLZ(z, X##_f)
-
-/* Predicates */
-#define _FP_FRAC_NEGP_1(X)      ((_FP_WS_TYPE)X##_f < 0)
-#define _FP_FRAC_ZEROP_1(X)     (X##_f == 0)
-#define _FP_FRAC_OVERP_1(fs,X)  (X##_f & _FP_OVERFLOW_##fs)
-#define _FP_FRAC_EQ_1(X, Y)     (X##_f == Y##_f)
-#define _FP_FRAC_GE_1(X, Y)     (X##_f >= Y##_f)
-#define _FP_FRAC_GT_1(X, Y)     (X##_f > Y##_f)
-
-#define _FP_ZEROFRAC_1          0
-#define _FP_MINFRAC_1           1
-
-/*
- * Unpack the raw bits of a native fp value.  Do not classify or
- * normalize the data.
- */
-
-#define _FP_UNPACK_RAW_1(fs, X, val)                            \
-  do {                                                          \
-    union _FP_UNION_##fs _flo; _flo.flt = (val);                \
-                                                                \
-    X##_f = _flo.bits.frac;                                     \
-    X##_e = _flo.bits.exp;                                      \
-    X##_s = _flo.bits.sign;                                     \
-  } while (0)
-
-
-/*
- * Repack the raw bits of a native fp value.
- */
-
-#define _FP_PACK_RAW_1(fs, val, X)                              \
-  do {                                                          \
-    union _FP_UNION_##fs _flo;                                  \
-                                                                \
-    _flo.bits.frac = X##_f;                                     \
-    _flo.bits.exp  = X##_e;                                     \
-    _flo.bits.sign = X##_s;                                     \
-                                                                \
-    (val) = _flo.flt;                                           \
-  } while (0)
-
-
-/*
- * Multiplication algorithms:
- */
-
-/* Basic.  Assuming the host word size is >= 2*FRACBITS, we can do the
-   multiplication immediately.  */
-
-#define _FP_MUL_MEAT_1_imm(fs, R, X, Y)                                 \
-  do {                                                                  \
-    R##_f = X##_f * Y##_f;                                              \
-    /* Normalize since we know where the msb of the multiplicands       \
-       were (bit B), we know that the msb of the of the product is      \
-       at either 2B or 2B-1.  */                                        \
-    _FP_FRAC_SRS_1(R, _FP_WFRACBITS_##fs-1, 2*_FP_WFRACBITS_##fs);      \
-  } while (0)
-
-/* Given a 1W * 1W => 2W primitive, do the extended multiplication.  */
-
-#define _FP_MUL_MEAT_1_wide(fs, R, X, Y, doit)                          \
-  do {                                                                  \
-    _FP_W_TYPE _Z_f0, _Z_f1;                                            \
-    doit(_Z_f1, _Z_f0, X##_f, Y##_f);                                   \
-    /* Normalize since we know where the msb of the multiplicands       \
-       were (bit B), we know that the msb of the of the product is      \
-       at either 2B or 2B-1.  */                                        \
-    _FP_FRAC_SRS_2(_Z, _FP_WFRACBITS_##fs-1, 2*_FP_WFRACBITS_##fs);     \
-    R##_f = _Z_f0;                                                      \
-  } while (0)
-
-/* Finally, a simple widening multiply algorithm.  What fun!  */
-
-#define _FP_MUL_MEAT_1_hard(fs, R, X, Y)                                \
-  do {                                                                  \
-    _FP_W_TYPE _xh, _xl, _yh, _yl, _z_f0, _z_f1, _a_f0, _a_f1;          \
-                                                                        \
-    /* split the words in half */                                       \
-    _xh = X##_f >> (_FP_W_TYPE_SIZE/2);                                 \
-    _xl = X##_f & (((_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE/2)) - 1);         \
-    _yh = Y##_f >> (_FP_W_TYPE_SIZE/2);                                 \
-    _yl = Y##_f & (((_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE/2)) - 1);         \
-                                                                        \
-    /* multiply the pieces */                                           \
-    _z_f0 = _xl * _yl;                                                  \
-    _a_f0 = _xh * _yl;                                                  \
-    _a_f1 = _xl * _yh;                                                  \
-    _z_f1 = _xh * _yh;                                                  \
-                                                                        \
-    /* reassemble into two full words */                                \
-    if ((_a_f0 += _a_f1) < _a_f1)                                       \
-      _z_f1 += (_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE/2);                    \
-    _a_f1 = _a_f0 >> (_FP_W_TYPE_SIZE/2);                               \
-    _a_f0 = _a_f0 << (_FP_W_TYPE_SIZE/2);                               \
-    _FP_FRAC_ADD_2(_z, _z, _a);                                         \
-                                                                        \
-    /* normalize */                                                     \
-    _FP_FRAC_SRS_2(_z, _FP_WFRACBITS_##fs - 1, 2*_FP_WFRACBITS_##fs);   \
-    R##_f = _z_f0;                                                      \
-  } while (0)
-
-
-/*
- * Division algorithms:
- */
-
-/* Basic.  Assuming the host word size is >= 2*FRACBITS, we can do the
-   division immediately.  Give this macro either _FP_DIV_HELP_imm for
-   C primitives or _FP_DIV_HELP_ldiv for the ISO function.  Which you
-   choose will depend on what the compiler does with divrem4.  */
-
-#define _FP_DIV_MEAT_1_imm(fs, R, X, Y, doit)           \
-  do {                                                  \
-    _FP_W_TYPE _q, _r;                                  \
-    X##_f <<= (X##_f < Y##_f                            \
-               ? R##_e--, _FP_WFRACBITS_##fs            \
-               : _FP_WFRACBITS_##fs - 1);               \
-    doit(_q, _r, X##_f, Y##_f);                         \
-    R##_f = _q | (_r != 0);                             \
-  } while (0)
-
-/* GCC's longlong.h defines a 2W / 1W => (1W,1W) primitive udiv_qrnnd
-   that may be useful in this situation.  This first is for a primitive
-   that requires normalization, the second for one that does not.  Look
-   for UDIV_NEEDS_NORMALIZATION to tell which your machine needs.  */
-
-#define _FP_DIV_MEAT_1_udiv_norm(fs, R, X, Y)                           \
-  do {                                                                  \
-    _FP_W_TYPE _nh, _nl, _q, _r;                                        \
-                                                                        \
-    /* Normalize Y -- i.e. make the most significant bit set.  */       \
-    Y##_f <<= _FP_WFRACXBITS_##fs - 1;                                  \
-                                                                        \
-    /* Shift X op correspondingly high, that is, up one full word.  */  \
-    if (X##_f <= Y##_f)                                                 \
-      {                                                                 \
-        _nl = 0;                                                        \
-        _nh = X##_f;                                                    \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        R##_e++;                                                        \
-        _nl = X##_f << (_FP_W_TYPE_SIZE-1);                             \
-        _nh = X##_f >> 1;                                               \
-      }                                                                 \
-                                                                        \
-    udiv_qrnnd(_q, _r, _nh, _nl, Y##_f);                                \
-    R##_f = _q | (_r != 0);                                             \
-  } while (0)
-
-#define _FP_DIV_MEAT_1_udiv(fs, R, X, Y)                \
-  do {                                                  \
-    _FP_W_TYPE _nh, _nl, _q, _r;                        \
-    if (X##_f < Y##_f)                                  \
-      {                                                 \
-        R##_e--;                                        \
-        _nl = X##_f << _FP_WFRACBITS_##fs;              \
-        _nh = X##_f >> _FP_WFRACXBITS_##fs;             \
-      }                                                 \
-    else                                                \
-      {                                                 \
-        _nl = X##_f << (_FP_WFRACBITS_##fs - 1);        \
-        _nh = X##_f >> (_FP_WFRACXBITS_##fs + 1);       \
-      }                                                 \
-    udiv_qrnnd(_q, _r, _nh, _nl, Y##_f);                \
-    R##_f = _q | (_r != 0);                             \
-  } while (0)
-
-
-/*
- * Square root algorithms:
- * We have just one right now, maybe Newton approximation
- * should be added for those machines where division is fast.
- */
-
-#define _FP_SQRT_MEAT_1(R, S, T, X, q)                  \
-  do {                                                  \
-    while (q)                                           \
-      {                                                 \
-        T##_f = S##_f + q;                              \
-        if (T##_f <= X##_f)                             \
-          {                                             \
-            S##_f = T##_f + q;                          \
-            X##_f -= T##_f;                             \
-            R##_f += q;                                 \
-          }                                             \
-        _FP_FRAC_SLL_1(X, 1);                           \
-        q >>= 1;                                        \
-      }                                                 \
-  } while (0)
-
-/*
- * Assembly/disassembly for converting to/from integral types.
- * No shifting or overflow handled here.
- */
-
-#define _FP_FRAC_ASSEMBLE_1(r, X, rsize)        (r = X##_f)
-#define _FP_FRAC_DISASSEMBLE_1(X, r, rsize)     (X##_f = r)
-
-
-/*
- * Convert FP values between word sizes
- */
-
-#define _FP_FRAC_CONV_1_1(dfs, sfs, D, S)                               \
-  do {                                                                  \
-    D##_f = S##_f;                                                      \
-    if (_FP_WFRACBITS_##sfs > _FP_WFRACBITS_##dfs)                      \
-      _FP_FRAC_SRS_1(D, (_FP_WFRACBITS_##sfs-_FP_WFRACBITS_##dfs),      \
-                     _FP_WFRACBITS_##sfs);                              \
-    else                                                                \
-      D##_f <<= _FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs;              \
-  } while (0)
diff --git a/arch/powerpc/math-emu/op-2.h b/arch/powerpc/math-emu/op-2.h
deleted file mode 100644
index 7d6f17cc2929..000000000000
--- a/arch/powerpc/math-emu/op-2.h
+++ /dev/null
@@ -1,434 +0,0 @@
-/*
- * Basic two-word fraction declaration and manipulation.
- */
-
-#define _FP_FRAC_DECL_2(X)      _FP_W_TYPE X##_f0, X##_f1
-#define _FP_FRAC_COPY_2(D,S)    (D##_f0 = S##_f0, D##_f1 = S##_f1)
-#define _FP_FRAC_SET_2(X,I)     __FP_FRAC_SET_2(X, I)
-#define _FP_FRAC_HIGH_2(X)      (X##_f1)
-#define _FP_FRAC_LOW_2(X)       (X##_f0)
-#define _FP_FRAC_WORD_2(X,w)    (X##_f##w)
-
-#define _FP_FRAC_SLL_2(X,N)                                             \
-  do {                                                                  \
-    if ((N) < _FP_W_TYPE_SIZE)                                          \
-      {                                                                 \
-        if (__builtin_constant_p(N) && (N) == 1)                        \
-          {                                                             \
-            X##_f1 = X##_f1 + X##_f1 + (((_FP_WS_TYPE)(X##_f0)) < 0);   \
-            X##_f0 += X##_f0;                                           \
-          }                                                             \
-        else                                                            \
-          {                                                             \
-            X##_f1 = X##_f1 << (N) | X##_f0 >> (_FP_W_TYPE_SIZE - (N)); \
-            X##_f0 <<= (N);                                             \
-          }                                                             \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        X##_f1 = X##_f0 << ((N) - _FP_W_TYPE_SIZE);                     \
-        X##_f0 = 0;                                                     \
-      }                                                                 \
-  } while (0)
-
-#define _FP_FRAC_SRL_2(X,N)                                             \
-  do {                                                                  \
-    if ((N) < _FP_W_TYPE_SIZE)                                          \
-      {                                                                 \
-        X##_f0 = X##_f0 >> (N) | X##_f1 << (_FP_W_TYPE_SIZE - (N));     \
-        X##_f1 >>= (N);                                                 \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        X##_f0 = X##_f1 >> ((N) - _FP_W_TYPE_SIZE);                     \
-        X##_f1 = 0;                                                     \
-      }                                                                 \
-  } while (0)
-
-/* Right shift with sticky-lsb.  */
-#define _FP_FRAC_SRS_2(X,N,sz)                                          \
-  do {                                                                  \
-    if ((N) < _FP_W_TYPE_SIZE)                                          \
-      {                                                                 \
-        X##_f0 = (X##_f1 << (_FP_W_TYPE_SIZE - (N)) | X##_f0 >> (N) |   \
-                  (__builtin_constant_p(N) && (N) == 1                  \
-                   ? X##_f0 & 1                                         \
-                   : (X##_f0 << (_FP_W_TYPE_SIZE - (N))) != 0));        \
-        X##_f1 >>= (N);                                                 \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        X##_f0 = (X##_f1 >> ((N) - _FP_W_TYPE_SIZE) |                   \
-                  (((X##_f1 << (2 * _FP_W_TYPE_SIZE - (N))) |           \
-                   X##_f0) != 0));                                      \
-        X##_f1 = 0;                                                     \
-      }                                                                 \
-  } while (0)
-
-#define _FP_FRAC_ADDI_2(X,I) \
-  __FP_FRAC_ADDI_2(X##_f1, X##_f0, I)
-
-#define _FP_FRAC_ADD_2(R,X,Y) \
-  __FP_FRAC_ADD_2(R##_f1, R##_f0, X##_f1, X##_f0, Y##_f1, Y##_f0)
-
-#define _FP_FRAC_SUB_2(R,X,Y) \
-  __FP_FRAC_SUB_2(R##_f1, R##_f0, X##_f1, X##_f0, Y##_f1, Y##_f0)
-
-#define _FP_FRAC_CLZ_2(R,X)     \
-  do {                          \
-    if (X##_f1)                 \
-      __FP_CLZ(R,X##_f1);       \
-    else                        \
-    {                           \
-      __FP_CLZ(R,X##_f0);       \
-      R += _FP_W_TYPE_SIZE;     \
-    }                           \
-  } while(0)
-
-/* Predicates */
-#define _FP_FRAC_NEGP_2(X)      ((_FP_WS_TYPE)X##_f1 < 0)
-#define _FP_FRAC_ZEROP_2(X)     ((X##_f1 | X##_f0) == 0)
-#define _FP_FRAC_OVERP_2(fs,X)  (X##_f1 & _FP_OVERFLOW_##fs)
-#define _FP_FRAC_EQ_2(X, Y)     (X##_f1 == Y##_f1 && X##_f0 == Y##_f0)
-#define _FP_FRAC_GT_2(X, Y)     \
-  ((X##_f1 > Y##_f1) || (X##_f1 == Y##_f1 && X##_f0 > Y##_f0))
-#define _FP_FRAC_GE_2(X, Y)     \
-  ((X##_f1 > Y##_f1) || (X##_f1 == Y##_f1 && X##_f0 >= Y##_f0))
-
-#define _FP_ZEROFRAC_2          0, 0
-#define _FP_MINFRAC_2           0, 1
-
-/*
- * Internals
- */
-
-#define __FP_FRAC_SET_2(X,I1,I0)        (X##_f0 = I0, X##_f1 = I1)
-
-#define __FP_CLZ_2(R, xh, xl)   \
-  do {                          \
-    if (xh)                     \
-      __FP_CLZ(R,xl);           \
-    else                        \
-    {                           \
-      __FP_CLZ(R,xl);           \
-      R += _FP_W_TYPE_SIZE;     \
-    }                           \
-  } while(0)
-
-#if 0
-
-#ifndef __FP_FRAC_ADDI_2
-#define __FP_FRAC_ADDI_2(xh, xl, i) \
-  (xh += ((xl += i) < i))
-#endif
-#ifndef __FP_FRAC_ADD_2
-#define __FP_FRAC_ADD_2(rh, rl, xh, xl, yh, yl) \
-  (rh = xh + yh + ((rl = xl + yl) < xl))
-#endif
-#ifndef __FP_FRAC_SUB_2
-#define __FP_FRAC_SUB_2(rh, rl, xh, xl, yh, yl) \
-  (rh = xh - yh - ((rl = xl - yl) > xl))
-#endif
-
-#else
-
-#undef __FP_FRAC_ADDI_2
-#define __FP_FRAC_ADDI_2(xh, xl, i)     add_ssaaaa(xh, xl, xh, xl, 0, i)
-#undef __FP_FRAC_ADD_2
-#define __FP_FRAC_ADD_2                 add_ssaaaa
-#undef __FP_FRAC_SUB_2
-#define __FP_FRAC_SUB_2                 sub_ddmmss
-
-#endif
-
-/*
- * Unpack the raw bits of a native fp value.  Do not classify or
- * normalize the data.
- */
-
-#define _FP_UNPACK_RAW_2(fs, X, val)                    \
-  do {                                                  \
-    union _FP_UNION_##fs _flo; _flo.flt = (val);        \
-                                                        \
-    X##_f0 = _flo.bits.frac0;                           \
-    X##_f1 = _flo.bits.frac1;                           \
-    X##_e  = _flo.bits.exp;                             \
-    X##_s  = _flo.bits.sign;                            \
-  } while (0)
-
-
-/*
- * Repack the raw bits of a native fp value.
- */
-
-#define _FP_PACK_RAW_2(fs, val, X)                      \
-  do {                                                  \
-    union _FP_UNION_##fs _flo;                          \
-                                                        \
-    _flo.bits.frac0 = X##_f0;                           \
-    _flo.bits.frac1 = X##_f1;                           \
-    _flo.bits.exp   = X##_e;                            \
-    _flo.bits.sign  = X##_s;                            \
-                                                        \
-    (val) = _flo.flt;                                   \
-  } while (0)
-
-
-/*
- * Multiplication algorithms:
- */
-
-/* Given a 1W * 1W => 2W primitive, do the extended multiplication.  */
-
-#define _FP_MUL_MEAT_2_wide(fs, R, X, Y, doit)                          \
-  do {                                                                  \
-    _FP_FRAC_DECL_4(_z); _FP_FRAC_DECL_2(_b); _FP_FRAC_DECL_2(_c);      \
-                                                                        \
-    doit(_FP_FRAC_WORD_4(_z,1), _FP_FRAC_WORD_4(_z,0), X##_f0, Y##_f0); \
-    doit(_b_f1, _b_f0, X##_f0, Y##_f1);                                 \
-    doit(_c_f1, _c_f0, X##_f1, Y##_f0);                                 \
-    doit(_FP_FRAC_WORD_4(_z,3), _FP_FRAC_WORD_4(_z,2), X##_f1, Y##_f1); \
-                                                                        \
-    __FP_FRAC_ADD_4(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),        \
-                    _FP_FRAC_WORD_4(_z,1),_FP_FRAC_WORD_4(_z,0),        \
-                    0, _b_f1, _b_f0, 0,                                 \
-                    _FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),        \
-                    _FP_FRAC_WORD_4(_z,1),_FP_FRAC_WORD_4(_z,0));       \
-    __FP_FRAC_ADD_4(_FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),        \
-                    _FP_FRAC_WORD_4(_z,1),_FP_FRAC_WORD_4(_z,0),        \
-                    0, _c_f1, _c_f0, 0,                                 \
-                    _FP_FRAC_WORD_4(_z,3),_FP_FRAC_WORD_4(_z,2),        \
-                    _FP_FRAC_WORD_4(_z,1),_FP_FRAC_WORD_4(_z,0));       \
-                                                                        \
-    /* Normalize since we know where the msb of the multiplicands       \
-       were (bit B), we know that the msb of the of the product is      \
-       at either 2B or 2B-1.  */                                        \
-    _FP_FRAC_SRS_4(_z, _FP_WFRACBITS_##fs-1, 2*_FP_WFRACBITS_##fs);     \
-    R##_f0 = _FP_FRAC_WORD_4(_z,0);                                     \
-    R##_f1 = _FP_FRAC_WORD_4(_z,1);                                     \
-  } while (0)
-
-/* This next macro appears to be totally broken. Fortunately nowhere
- * seems to use it :-> The problem is that we define _z[4] but
- * then use it in _FP_FRAC_SRS_4, which will attempt to access
- * _z_f[n] which will cause an error. The fix probably involves
- * declaring it with _FP_FRAC_DECL_4, see previous macro. -- PMM 02/1998
- */
-#define _FP_MUL_MEAT_2_gmp(fs, R, X, Y)                                 \
-  do {                                                                  \
-    _FP_W_TYPE _x[2], _y[2], _z[4];                                     \
-    _x[0] = X##_f0; _x[1] = X##_f1;                                     \
-    _y[0] = Y##_f0; _y[1] = Y##_f1;                                     \
-                                                                        \
-    mpn_mul_n(_z, _x, _y, 2);                                           \
-                                                                        \
-    /* Normalize since we know where the msb of the multiplicands       \
-       were (bit B), we know that the msb of the of the product is      \
-       at either 2B or 2B-1.  */                                        \
-    _FP_FRAC_SRS_4(_z, _FP_WFRACBITS##_fs-1, 2*_FP_WFRACBITS_##fs);     \
-    R##_f0 = _z[0];                                                     \
-    R##_f1 = _z[1];                                                     \
-  } while (0)
-
-
-/*
- * Division algorithms:
- * This seems to be giving me difficulties -- PMM
- * Look, NetBSD seems to be able to comment algorithms. Can't you?
- * I've thrown printks at the problem.
- * This now appears to work, but I still don't really know why.
- * Also, I don't think the result is properly normalised...
- */
-
-#define _FP_DIV_MEAT_2_udiv_64(fs, R, X, Y)                             \
-  do {                                                                  \
-    extern void _fp_udivmodti4(_FP_W_TYPE q[2], _FP_W_TYPE r[2],        \
-                               _FP_W_TYPE n1, _FP_W_TYPE n0,            \
-                               _FP_W_TYPE d1, _FP_W_TYPE d0);           \
-    _FP_W_TYPE _n_f3, _n_f2, _n_f1, _n_f0, _r_f1, _r_f0;                \
-    _FP_W_TYPE _q_f1, _q_f0, _m_f1, _m_f0;                              \
-    _FP_W_TYPE _rmem[2], _qmem[2];                                      \
-    /* I think this check is to ensure that the result is normalised.   \
-     * Assuming X,Y normalised (ie in [1.0,2.0)) X/Y will be in         \
-     * [0.5,2.0). Furthermore, it will be less than 1.0 iff X < Y.      \
-     * In this case we tweak things. (this is based on comments in      \
-     * the NetBSD FPU emulation code. )                                 \
-     * We know X,Y are normalised because we ensure this as part of     \
-     * the unpacking process. -- PMM                                    \
-     */                                                                 \
-    if (_FP_FRAC_GT_2(X, Y))                                            \
-      {                                                                 \
-/*      R##_e++; */                                                     \
-        _n_f3 = X##_f1 >> 1;                                            \
-        _n_f2 = X##_f1 << (_FP_W_TYPE_SIZE - 1) | X##_f0 >> 1;          \
-        _n_f1 = X##_f0 << (_FP_W_TYPE_SIZE - 1);                        \
-        _n_f0 = 0;                                                      \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        R##_e--;                                                        \
-        _n_f3 = X##_f1;                                                 \
-        _n_f2 = X##_f0;                                                 \
-        _n_f1 = _n_f0 = 0;                                              \
-      }                                                                 \
-                                                                        \
-    /* Normalize, i.e. make the most significant bit of the             \
-       denominator set.  CHANGED: - 1 to nothing -- PMM */              \
-    _FP_FRAC_SLL_2(Y, _FP_WFRACXBITS_##fs /* -1 */);                    \
-                                                                        \
-    /* Do the 256/128 bit division given the 128-bit _fp_udivmodtf4     \
-       primitive snagged from libgcc2.c.  */                            \
-                                                                        \
-    _fp_udivmodti4(_qmem, _rmem, _n_f3, _n_f2, 0, Y##_f1);              \
-    _q_f1 = _qmem[0];                                                   \
-    umul_ppmm(_m_f1, _m_f0, _q_f1, Y##_f0);                             \
-    _r_f1 = _rmem[0];                                                   \
-    _r_f0 = _n_f1;                                                      \
-    if (_FP_FRAC_GT_2(_m, _r))                                          \
-      {                                                                 \
-        _q_f1--;                                                        \
-        _FP_FRAC_ADD_2(_r, _r, Y);                                      \
-        if (_FP_FRAC_GE_2(_r, Y) && _FP_FRAC_GT_2(_m, _r))              \
-          {                                                             \
-            _q_f1--;                                                    \
-            _FP_FRAC_ADD_2(_r, _r, Y);                                  \
-          }                                                             \
-      }                                                                 \
-    _FP_FRAC_SUB_2(_r, _r, _m);                                         \
-                                                                        \
-    _fp_udivmodti4(_qmem, _rmem, _r_f1, _r_f0, 0, Y##_f1);              \
-    _q_f0 = _qmem[0];                                                   \
-    umul_ppmm(_m_f1, _m_f0, _q_f0, Y##_f0);                             \
-    _r_f1 = _rmem[0];                                                   \
-    _r_f0 = _n_f0;                                                      \
-    if (_FP_FRAC_GT_2(_m, _r))                                          \
-      {                                                                 \
-        _q_f0--;                                                        \
-        _FP_FRAC_ADD_2(_r, _r, Y);                                      \
-        if (_FP_FRAC_GE_2(_r, Y) && _FP_FRAC_GT_2(_m, _r))              \
-          {                                                             \
-            _q_f0--;                                                    \
-            _FP_FRAC_ADD_2(_r, _r, Y);                                  \
-          }                                                             \
-      }                                                                 \
-    _FP_FRAC_SUB_2(_r, _r, _m);                                         \
-                                                                        \
-    R##_f1 = _q_f1;                                                     \
-    R##_f0 = _q_f0 | ((_r_f1 | _r_f0) != 0);                            \
-    /* adjust so answer is normalized again. I'm not sure what the      \
-     * final sz param should be. In practice it's never used since      \
-     * N is 1 which is always going to be < _FP_W_TYPE_SIZE...          \
-     */                                                                 \
-    /* _FP_FRAC_SRS_2(R,1,_FP_WFRACBITS_##fs);  */                      \
-  } while (0)
-
-
-#define _FP_DIV_MEAT_2_gmp(fs, R, X, Y)                                 \
-  do {                                                                  \
-    _FP_W_TYPE _x[4], _y[2], _z[4];                                     \
-    _y[0] = Y##_f0; _y[1] = Y##_f1;                                     \
-    _x[0] = _x[3] = 0;                                                  \
-    if (_FP_FRAC_GT_2(X, Y))                                            \
-      {                                                                 \
-        R##_e++;                                                        \
-        _x[1] = (X##_f0 << (_FP_WFRACBITS-1 - _FP_W_TYPE_SIZE) |        \
-                 X##_f1 >> (_FP_W_TYPE_SIZE -                           \
-                            (_FP_WFRACBITS-1 - _FP_W_TYPE_SIZE)));      \
-        _x[2] = X##_f1 << (_FP_WFRACBITS-1 - _FP_W_TYPE_SIZE);          \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        _x[1] = (X##_f0 << (_FP_WFRACBITS - _FP_W_TYPE_SIZE) |          \
-                 X##_f1 >> (_FP_W_TYPE_SIZE -                           \
-                            (_FP_WFRACBITS - _FP_W_TYPE_SIZE)));        \
-        _x[2] = X##_f1 << (_FP_WFRACBITS - _FP_W_TYPE_SIZE);            \
-      }                                                                 \
-                                                                        \
-    (void) mpn_divrem (_z, 0, _x, 4, _y, 2);                            \
-    R##_f1 = _z[1];                                                     \
-    R##_f0 = _z[0] | ((_x[0] | _x[1]) != 0);                            \
-  } while (0)
-
-
-/*
- * Square root algorithms:
- * We have just one right now, maybe Newton approximation
- * should be added for those machines where division is fast.
- */
-
-#define _FP_SQRT_MEAT_2(R, S, T, X, q)                  \
-  do {                                                  \
-    while (q)                                           \
-      {                                                 \
-        T##_f1 = S##_f1 + q;                            \
-        if (T##_f1 <= X##_f1)                           \
-          {                                             \
-            S##_f1 = T##_f1 + q;                        \
-            X##_f1 -= T##_f1;                           \
-            R##_f1 += q;                                \
-          }                                             \
-        _FP_FRAC_SLL_2(X, 1);                           \
-        q >>= 1;                                        \
-      }                                                 \
-    q = (_FP_W_TYPE)1 << (_FP_W_TYPE_SIZE - 1);         \
-    while (q)                                           \
-      {                                                 \
-        T##_f0 = S##_f0 + q;                            \
-        T##_f1 = S##_f1;                                \
-        if (T##_f1 < X##_f1 ||                          \
-            (T##_f1 == X##_f1 && T##_f0 < X##_f0))      \
-          {                                             \
-            S##_f0 = T##_f0 + q;                        \
-            if (((_FP_WS_TYPE)T##_f0) < 0 &&            \
-                ((_FP_WS_TYPE)S##_f0) >= 0)             \
-              S##_f1++;                                 \
-            _FP_FRAC_SUB_2(X, X, T);                    \
-            R##_f0 += q;                                \
-          }                                             \
-        _FP_FRAC_SLL_2(X, 1);                           \
-        q >>= 1;                                        \
-      }                                                 \
-  } while (0)
-
-
-/*
- * Assembly/disassembly for converting to/from integral types.
- * No shifting or overflow handled here.
- */
-
-#define _FP_FRAC_ASSEMBLE_2(r, X, rsize)        \
-  do {                                          \
-    if (rsize <= _FP_W_TYPE_SIZE)               \
-      r = X##_f0;                               \
-    else                                        \
-      {                                         \
-        r = X##_f1;                             \
-        r <<= _FP_W_TYPE_SIZE;                  \
-        r += X##_f0;                            \
-      }                                         \
-  } while (0)
-
-#define _FP_FRAC_DISASSEMBLE_2(X, r, rsize)                             \
-  do {                                                                  \
-    X##_f0 = r;                                                         \
-    X##_f1 = (rsize <= _FP_W_TYPE_SIZE ? 0 : r >> _FP_W_TYPE_SIZE);     \
-  } while (0)
-
-/*
- * Convert FP values between word sizes
- */
-
-#define _FP_FRAC_CONV_1_2(dfs, sfs, D, S)                               \
-  do {                                                                  \
-    _FP_FRAC_SRS_2(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs),      \
-                   _FP_WFRACBITS_##sfs);                                \
-    D##_f = S##_f0;                                                     \
-  } while (0)
-
-#define _FP_FRAC_CONV_2_1(dfs, sfs, D, S)                               \
-  do {                                                                  \
-    D##_f0 = S##_f;                                                     \
-    D##_f1 = 0;                                                         \
-    _FP_FRAC_SLL_2(D, (_FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs));     \
-  } while (0)
-
diff --git a/arch/powerpc/math-emu/op-4.h b/arch/powerpc/math-emu/op-4.h
deleted file mode 100644
index c9ae626070da..000000000000
--- a/arch/powerpc/math-emu/op-4.h
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Basic four-word fraction declaration and manipulation.
- *
- * When adding quadword support for 32 bit machines, we need
- * to be a little careful as double multiply uses some of these
- * macros: (in op-2.h)
- * _FP_MUL_MEAT_2_wide() uses _FP_FRAC_DECL_4, _FP_FRAC_WORD_4,
- * _FP_FRAC_ADD_4, _FP_FRAC_SRS_4
- * _FP_MUL_MEAT_2_gmp() uses _FP_FRAC_SRS_4 (and should use
- * _FP_FRAC_DECL_4: it appears to be broken and is not used
- * anywhere anyway. )
- *
- * I've now fixed all the macros that were here from the sparc64 code.
- * [*none* of the shift macros were correct!] -- PMM 02/1998
- *
- * The only quadword stuff that remains to be coded is:
- * 1) the conversion to/from ints, which requires
- * that we check (in op-common.h) that the following do the right thing
- * for quadwords: _FP_TO_INT(Q,4,r,X,rsz,rsg), _FP_FROM_INT(Q,4,X,r,rs,rt)
- * 2) multiply, divide and sqrt, which require:
- * _FP_MUL_MEAT_4_*(R,X,Y), _FP_DIV_MEAT_4_*(R,X,Y), _FP_SQRT_MEAT_4(R,S,T,X,q),
- * This also needs _FP_MUL_MEAT_Q and _FP_DIV_MEAT_Q to be defined to
- * some suitable _FP_MUL_MEAT_4_* macros in sfp-machine.h.
- * [we're free to choose whatever FP_MUL_MEAT_4_* macros we need for
- * these; they are used nowhere else. ]
- */
-
-#define _FP_FRAC_DECL_4(X)      _FP_W_TYPE X##_f[4]
-#define _FP_FRAC_COPY_4(D,S)                    \
-  (D##_f[0] = S##_f[0], D##_f[1] = S##_f[1],    \
-   D##_f[2] = S##_f[2], D##_f[3] = S##_f[3])
-/* The _FP_FRAC_SET_n(X,I) macro is intended for use with another
- * macro such as _FP_ZEROFRAC_n which returns n comma separated values.
- * The result is that we get an expansion of __FP_FRAC_SET_n(X,I0,I1,I2,I3)
- * which just assigns the In values to the array X##_f[].
- * This is why the number of parameters doesn't appear to match
- * at first glance...      -- PMM
- */
-#define _FP_FRAC_SET_4(X,I)     __FP_FRAC_SET_4(X, I)
-#define _FP_FRAC_HIGH_4(X)      (X##_f[3])
-#define _FP_FRAC_LOW_4(X)       (X##_f[0])
-#define _FP_FRAC_WORD_4(X,w)    (X##_f[w])
-
-#define _FP_FRAC_SLL_4(X,N)                                             \
-  do {                                                                  \
-    _FP_I_TYPE _up, _down, _skip, _i;                                   \
-    _skip = (N) / _FP_W_TYPE_SIZE;                                      \
-    _up = (N) % _FP_W_TYPE_SIZE;                                        \
-    _down = _FP_W_TYPE_SIZE - _up;                                      \
-    for (_i = 3; _i > _skip; --_i)                                      \
-      X##_f[_i] = X##_f[_i-_skip] << _up | X##_f[_i-_skip-1] >> _down;  \
-/* bugfixed: was X##_f[_i] <<= _up;  -- PMM 02/1998 */                  \
-    X##_f[_i] = X##_f[0] << _up;                                        \
-    for (--_i; _i >= 0; --_i)                                           \
-      X##_f[_i] = 0;                                                    \
-  } while (0)
-
-/* This one was broken too */
-#define _FP_FRAC_SRL_4(X,N)                                             \
-  do {                                                                  \
-    _FP_I_TYPE _up, _down, _skip, _i;                                   \
-    _skip = (N) / _FP_W_TYPE_SIZE;                                      \
-    _down = (N) % _FP_W_TYPE_SIZE;                                      \
-    _up = _FP_W_TYPE_SIZE - _down;                                      \
-    for (_i = 0; _i < 3-_skip; ++_i)                                    \
-      X##_f[_i] = X##_f[_i+_skip] >> _down | X##_f[_i+_skip+1] << _up;  \
-    X##_f[_i] = X##_f[3] >> _down;                                      \
-    for (++_i; _i < 4; ++_i)                                            \
-      X##_f[_i] = 0;                                                    \
-  } while (0)
-
-
-/* Right shift with sticky-lsb.
- * What this actually means is that we do a standard right-shift,
- * but that if any of the bits that fall off the right hand side
- * were one then we always set the LSbit.
- */
-#define _FP_FRAC_SRS_4(X,N,size)                                        \
-  do {                                                                  \
-    _FP_I_TYPE _up, _down, _skip, _i;                                   \
-    _FP_W_TYPE _s;                                                      \
-    _skip = (N) / _FP_W_TYPE_SIZE;                                      \
-    _down = (N) % _FP_W_TYPE_SIZE;                                      \
-    _up = _FP_W_TYPE_SIZE - _down;                                      \
-    for (_s = _i = 0; _i < _skip; ++_i)                                 \
-      _s |= X##_f[_i];                                                  \
-    _s |= X##_f[_i] << _up;                                             \
-/* s is now != 0 if we want to set the LSbit */                         \
-    for (_i = 0; _i < 3-_skip; ++_i)                                    \
-      X##_f[_i] = X##_f[_i+_skip] >> _down | X##_f[_i+_skip+1] << _up;  \
-    X##_f[_i] = X##_f[3] >> _down;                                      \
-    for (++_i; _i < 4; ++_i)                                            \
-      X##_f[_i] = 0;                                                    \
-    /* don't fix the LSB until the very end when we're sure f[0] is stable */ \
-    X##_f[0] |= (_s != 0);                                              \
-  } while (0)
-
-#define _FP_FRAC_ADD_4(R,X,Y)                                           \
-  __FP_FRAC_ADD_4(R##_f[3], R##_f[2], R##_f[1], R##_f[0],               \
-                  X##_f[3], X##_f[2], X##_f[1], X##_f[0],               \
-                  Y##_f[3], Y##_f[2], Y##_f[1], Y##_f[0])
-
-#define _FP_FRAC_SUB_4(R,X,Y)                                           \
-  __FP_FRAC_SUB_4(R##_f[3], R##_f[2], R##_f[1], R##_f[0],               \
-                  X##_f[3], X##_f[2], X##_f[1], X##_f[0],               \
-                  Y##_f[3], Y##_f[2], Y##_f[1], Y##_f[0])
-
-#define _FP_FRAC_ADDI_4(X,I)                                            \
-  __FP_FRAC_ADDI_4(X##_f[3], X##_f[2], X##_f[1], X##_f[0], I)
-
-#define _FP_ZEROFRAC_4  0,0,0,0
-#define _FP_MINFRAC_4   0,0,0,1
-
-#define _FP_FRAC_ZEROP_4(X)     ((X##_f[0] | X##_f[1] | X##_f[2] | X##_f[3]) == 0)
-#define _FP_FRAC_NEGP_4(X)      ((_FP_WS_TYPE)X##_f[3] < 0)
-#define _FP_FRAC_OVERP_4(fs,X)  (X##_f[0] & _FP_OVERFLOW_##fs)
-
-#define _FP_FRAC_EQ_4(X,Y)                              \
- (X##_f[0] == Y##_f[0] && X##_f[1] == Y##_f[1]          \
-  && X##_f[2] == Y##_f[2] && X##_f[3] == Y##_f[3])
-
-#define _FP_FRAC_GT_4(X,Y)                              \
- (X##_f[3] > Y##_f[3] ||                                \
-  (X##_f[3] == Y##_f[3] && (X##_f[2] > Y##_f[2] ||      \
-   (X##_f[2] == Y##_f[2] && (X##_f[1] > Y##_f[1] ||     \
-    (X##_f[1] == Y##_f[1] && X##_f[0] > Y##_f[0])       \
-   ))                                                   \
-  ))                                                    \
- )
-
-#define _FP_FRAC_GE_4(X,Y)                              \
- (X##_f[3] > Y##_f[3] ||                                \
-  (X##_f[3] == Y##_f[3] && (X##_f[2] > Y##_f[2] ||      \
-   (X##_f[2] == Y##_f[2] && (X##_f[1] > Y##_f[1] ||     \
-    (X##_f[1] == Y##_f[1] && X##_f[0] >= Y##_f[0])      \
-   ))                                                   \
-  ))                                                    \
- )
-
-
-#define _FP_FRAC_CLZ_4(R,X)             \
-  do {                                  \
-    if (X##_f[3])                       \
-    {                                   \
-        __FP_CLZ(R,X##_f[3]);           \
-    }                                   \
-    else if (X##_f[2])                  \
-    {                                   \
-        __FP_CLZ(R,X##_f[2]);           \
-        R += _FP_W_TYPE_SIZE;           \
-    }                                   \
-    else if (X##_f[1])                  \
-    {                                   \
-        __FP_CLZ(R,X##_f[2]);           \
-        R += _FP_W_TYPE_SIZE*2;         \
-    }                                   \
-    else                                \
-    {                                   \
-        __FP_CLZ(R,X##_f[0]);           \
-        R += _FP_W_TYPE_SIZE*3;         \
-    }                                   \
-  } while(0)
-
-
-#define _FP_UNPACK_RAW_4(fs, X, val)                            \
-  do {                                                          \
-    union _FP_UNION_##fs _flo; _flo.flt = (val);                \
-    X##_f[0] = _flo.bits.frac0;                                 \
-    X##_f[1] = _flo.bits.frac1;                                 \
-    X##_f[2] = _flo.bits.frac2;                                 \
-    X##_f[3] = _flo.bits.frac3;                                 \
-    X##_e  = _flo.bits.exp;                                     \
-    X##_s  = _flo.bits.sign;                                    \
-  } while (0)
-
-#define _FP_PACK_RAW_4(fs, val, X)                              \
-  do {                                                          \
-    union _FP_UNION_##fs _flo;                                  \
-    _flo.bits.frac0 = X##_f[0];                                 \
-    _flo.bits.frac1 = X##_f[1];                                 \
-    _flo.bits.frac2 = X##_f[2];                                 \
-    _flo.bits.frac3 = X##_f[3];                                 \
-    _flo.bits.exp   = X##_e;                                    \
-    _flo.bits.sign  = X##_s;                                    \
-    (val) = _flo.flt;                                           \
-  } while (0)
-
-
-/*
- * Internals
- */
-
-#define __FP_FRAC_SET_4(X,I3,I2,I1,I0)                                  \
-  (X##_f[3] = I3, X##_f[2] = I2, X##_f[1] = I1, X##_f[0] = I0)
-
-#ifndef __FP_FRAC_ADD_4
-#define __FP_FRAC_ADD_4(r3,r2,r1,r0,x3,x2,x1,x0,y3,y2,y1,y0)    \
-  do {                                                          \
-    int _c1, _c2, _c3;                                          \
-    r0 = x0 + y0;                                               \
-    _c1 = r0 < x0;                                              \
-    r1 = x1 + y1;                                               \
-    _c2 = r1 < x1;                                              \
-    r1 += _c1;                                                  \
-    _c2 |= r1 < _c1;                                            \
-    r2 = x2 + y2;                                               \
-    _c3 = r2 < x2;                                              \
-    r2 += _c2;                                                  \
-    _c3 |= r2 < _c2;                                            \
-    r3 = x3 + y3 + _c3;                                         \
-  } while (0)
-#endif
-
-#ifndef __FP_FRAC_SUB_4
-#define __FP_FRAC_SUB_4(r3,r2,r1,r0,x3,x2,x1,x0,y3,y2,y1,y0)    \
-  do {                                                          \
-    int _c1, _c2, _c3;                                          \
-    r0 = x0 - y0;                                               \
-    _c1 = r0 > x0;                                              \
-    r1 = x1 - y1;                                               \
-    _c2 = r1 > x1;                                              \
-    r1 -= _c1;                                                  \
-    _c2 |= r1 > _c1;                                            \
-    r2 = x2 - y2;                                               \
-    _c3 = r2 > x2;                                              \
-    r2 -= _c2;                                                  \
-    _c3 |= r2 > _c2;                                            \
-    r3 = x3 - y3 - _c3;                                         \
-  } while (0)
-#endif
-
-#ifndef __FP_FRAC_ADDI_4
-/* I always wanted to be a lisp programmer :-> */
-#define __FP_FRAC_ADDI_4(x3,x2,x1,x0,i)                                 \
-  (x3 += ((x2 += ((x1 += ((x0 += i) < x0)) < x1) < x2)))
-#endif
-
-/* Convert FP values between word sizes. This appears to be more
- * complicated than I'd have expected it to be, so these might be
- * wrong... These macros are in any case somewhat bogus because they
- * use information about what various FRAC_n variables look like
- * internally [eg, that 2 word vars are X_f0 and x_f1]. But so do
- * the ones in op-2.h and op-1.h.
- */
-#define _FP_FRAC_CONV_1_4(dfs, sfs, D, S)                               \
-   do {                                                                 \
-     _FP_FRAC_SRS_4(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs),     \
-                        _FP_WFRACBITS_##sfs);                           \
-     D##_f = S##_f[0];                                                   \
-  } while (0)
-
-#define _FP_FRAC_CONV_2_4(dfs, sfs, D, S)                               \
-   do {                                                                 \
-     _FP_FRAC_SRS_4(S, (_FP_WFRACBITS_##sfs - _FP_WFRACBITS_##dfs),     \
-                        _FP_WFRACBITS_##sfs);                           \
-     D##_f0 = S##_f[0];                                                  \
-     D##_f1 = S##_f[1];                                                  \
-  } while (0)
-
-/* Assembly/disassembly for converting to/from integral types.
- * No shifting or overflow handled here.
- */
-/* Put the FP value X into r, which is an integer of size rsize. */
-#define _FP_FRAC_ASSEMBLE_4(r, X, rsize)                                \
-  do {                                                                  \
-    if (rsize <= _FP_W_TYPE_SIZE)                                       \
-      r = X##_f[0];                                                     \
-    else if (rsize <= 2*_FP_W_TYPE_SIZE)                                \
-    {                                                                   \
-      r = X##_f[1];                                                     \
-      r <<= _FP_W_TYPE_SIZE;                                            \
-      r += X##_f[0];                                                    \
-    }                                                                   \
-    else                                                                \
-    {                                                                   \
-      /* I'm feeling lazy so we deal with int == 3words (implausible)*/ \
-      /* and int == 4words as a single case.                         */ \
-      r = X##_f[3];                                                     \
-      r <<= _FP_W_TYPE_SIZE;                                            \
-      r += X##_f[2];                                                    \
-      r <<= _FP_W_TYPE_SIZE;                                            \
-      r += X##_f[1];                                                    \
-      r <<= _FP_W_TYPE_SIZE;                                            \
-      r += X##_f[0];                                                    \
-    }                                                                   \
-  } while (0)
-
-/* "No disassemble Number Five!" */
-/* move an integer of size rsize into X's fractional part. We rely on
- * the _f[] array consisting of words of size _FP_W_TYPE_SIZE to avoid
- * having to mask the values we store into it.
- */
-#define _FP_FRAC_DISASSEMBLE_4(X, r, rsize)                             \
-  do {                                                                  \
-    X##_f[0] = r;                                                       \
-    X##_f[1] = (rsize <= _FP_W_TYPE_SIZE ? 0 : r >> _FP_W_TYPE_SIZE);   \
-    X##_f[2] = (rsize <= 2*_FP_W_TYPE_SIZE ? 0 : r >> 2*_FP_W_TYPE_SIZE); \
-    X##_f[3] = (rsize <= 3*_FP_W_TYPE_SIZE ? 0 : r >> 3*_FP_W_TYPE_SIZE); \
-  } while (0)
-
-#define _FP_FRAC_CONV_4_1(dfs, sfs, D, S)                               \
-   do {                                                                 \
-     D##_f[0] = S##_f;                                                  \
-     D##_f[1] = D##_f[2] = D##_f[3] = 0;                                \
-     _FP_FRAC_SLL_4(D, (_FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs));    \
-   } while (0)
-
-#define _FP_FRAC_CONV_4_2(dfs, sfs, D, S)                               \
-   do {                                                                 \
-     D##_f[0] = S##_f0;                                                 \
-     D##_f[1] = S##_f1;                                                 \
-     D##_f[2] = D##_f[3] = 0;                                           \
-     _FP_FRAC_SLL_4(D, (_FP_WFRACBITS_##dfs - _FP_WFRACBITS_##sfs));    \
-   } while (0)
-
-/* FIXME! This has to be written */
-#define _FP_SQRT_MEAT_4(R, S, T, X, q)
diff --git a/arch/powerpc/math-emu/op-common.h b/arch/powerpc/math-emu/op-common.h
deleted file mode 100644
index afb82b6498ce..000000000000
--- a/arch/powerpc/math-emu/op-common.h
+++ /dev/null
@@ -1,688 +0,0 @@
-#define _FP_DECL(wc, X)                 \
-  _FP_I_TYPE X##_c, X##_s, X##_e;       \
-  _FP_FRAC_DECL_##wc(X)
-
-/*
- * Finish truely unpacking a native fp value by classifying the kind
- * of fp value and normalizing both the exponent and the fraction.
- */
-
-#define _FP_UNPACK_CANONICAL(fs, wc, X)                                 \
-do {                                                                    \
-  switch (X##_e)                                                        \
-  {                                                                     \
-  default:                                                              \
-    _FP_FRAC_HIGH_##wc(X) |= _FP_IMPLBIT_##fs;                          \
-    _FP_FRAC_SLL_##wc(X, _FP_WORKBITS);                                 \
-    X##_e -= _FP_EXPBIAS_##fs;                                          \
-    X##_c = FP_CLS_NORMAL;                                              \
-    break;                                                              \
-                                                                        \
-  case 0:                                                               \
-    if (_FP_FRAC_ZEROP_##wc(X))                                         \
-      X##_c = FP_CLS_ZERO;                                              \
-    else                                                                \
-      {                                                                 \
-        /* a denormalized number */                                     \
-        _FP_I_TYPE _shift;                                              \
-        _FP_FRAC_CLZ_##wc(_shift, X);                                   \
-        _shift -= _FP_FRACXBITS_##fs;                                   \
-        _FP_FRAC_SLL_##wc(X, (_shift+_FP_WORKBITS));                    \
-        X##_e -= _FP_EXPBIAS_##fs - 1 + _shift;                         \
-        X##_c = FP_CLS_NORMAL;                                          \
-      }                                                                 \
-    break;                                                              \
-                                                                        \
-  case _FP_EXPMAX_##fs:                                                 \
-    if (_FP_FRAC_ZEROP_##wc(X))                                         \
-      X##_c = FP_CLS_INF;                                               \
-    else                                                                \
-      /* we don't differentiate between signaling and quiet nans */     \
-      X##_c = FP_CLS_NAN;                                               \
-    break;                                                              \
-  }                                                                     \
-} while (0)
-
-
-/*
- * Before packing the bits back into the native fp result, take care
- * of such mundane things as rounding and overflow.  Also, for some
- * kinds of fp values, the original parts may not have been fully
- * extracted -- but that is ok, we can regenerate them now.
- */
-
-#define _FP_PACK_CANONICAL(fs, wc, X)                           \
-({int __ret = 0;                                                \
-  switch (X##_c)                                                \
-  {                                                             \
-  case FP_CLS_NORMAL:                                           \
-    X##_e += _FP_EXPBIAS_##fs;                                  \
-    if (X##_e > 0)                                              \
-      {                                                         \
-        __ret |= _FP_ROUND(wc, X);                              \
-        if (_FP_FRAC_OVERP_##wc(fs, X))                         \
-          {                                                     \
-            _FP_FRAC_SRL_##wc(X, (_FP_WORKBITS+1));             \
-            X##_e++;                                            \
-          }                                                     \
-        else                                                    \
-          _FP_FRAC_SRL_##wc(X, _FP_WORKBITS);                   \
-        if (X##_e >= _FP_EXPMAX_##fs)                           \
-          {                                                     \
-            /* overflow to infinity */                          \
-            X##_e = _FP_EXPMAX_##fs;                            \
-            _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);            \
-            __ret |= EFLAG_OVERFLOW;                            \
-          }                                                     \
-      }                                                         \
-    else                                                        \
-      {                                                         \
-        /* we've got a denormalized number */                   \
-        X##_e = -X##_e + 1;                                     \
-        if (X##_e <= _FP_WFRACBITS_##fs)                        \
-          {                                                     \
-            _FP_FRAC_SRS_##wc(X, X##_e, _FP_WFRACBITS_##fs);    \
-            _FP_FRAC_SLL_##wc(X, 1);                            \
-            if (_FP_FRAC_OVERP_##wc(fs, X))                     \
-              {                                                 \
-                X##_e = 1;                                      \
-                _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);        \
-              }                                                 \
-            else                                                \
-              {                                                 \
-                X##_e = 0;                                      \
-                _FP_FRAC_SRL_##wc(X, _FP_WORKBITS+1);           \
-                __ret |= EFLAG_UNDERFLOW;                       \
-              }                                                 \
-          }                                                     \
-        else                                                    \
-          {                                                     \
-            /* underflow to zero */                             \
-            X##_e = 0;                                          \
-            _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);            \
-            __ret |= EFLAG_UNDERFLOW;                           \
-          }                                                     \
-      }                                                         \
-    break;                                                      \
-                                                                \
-  case FP_CLS_ZERO:                                             \
-    X##_e = 0;                                                  \
-    _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);                    \
-    break;                                                      \
-                                                                \
-  case FP_CLS_INF:                                              \
-    X##_e = _FP_EXPMAX_##fs;                                    \
-    _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);                    \
-    break;                                                      \
-                                                                \
-  case FP_CLS_NAN:                                              \
-    X##_e = _FP_EXPMAX_##fs;                                    \
-    if (!_FP_KEEPNANFRACP)                                      \
-      {                                                         \
-        _FP_FRAC_SET_##wc(X, _FP_NANFRAC_##fs);                 \
-        X##_s = 0;                                              \
-      }                                                         \
-    else                                                        \
-      _FP_FRAC_HIGH_##wc(X) |= _FP_QNANBIT_##fs;                \
-    break;                                                      \
-  }                                                             \
-  __ret;                                                        \
-})
-
-
-/*
- * Main addition routine.  The input values should be cooked.
- */
-
-#define _FP_ADD(fs, wc, R, X, Y)                                             \
-do {                                                                         \
-  switch (_FP_CLS_COMBINE(X##_c, Y##_c))                                     \
-  {                                                                          \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):                         \
-    {                                                                        \
-      /* shift the smaller number so that its exponent matches the larger */ \
-      _FP_I_TYPE diff = X##_e - Y##_e;                                       \
-                                                                             \
-      if (diff < 0)                                                          \
-        {                                                                    \
-          diff = -diff;                                                      \
-          if (diff <= _FP_WFRACBITS_##fs)                                    \
-            _FP_FRAC_SRS_##wc(X, diff, _FP_WFRACBITS_##fs);                  \
-          else if (!_FP_FRAC_ZEROP_##wc(X))                                  \
-            _FP_FRAC_SET_##wc(X, _FP_MINFRAC_##wc);                          \
-          else                                                               \
-            _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);                         \
-          R##_e = Y##_e;                                                     \
-        }                                                                    \
-      else                                                                   \
-        {                                                                    \
-          if (diff > 0)                                                      \
-            {                                                                \
-              if (diff <= _FP_WFRACBITS_##fs)                                \
-                _FP_FRAC_SRS_##wc(Y, diff, _FP_WFRACBITS_##fs);              \
-              else if (!_FP_FRAC_ZEROP_##wc(Y))                              \
-                _FP_FRAC_SET_##wc(Y, _FP_MINFRAC_##wc);                      \
-              else                                                           \
-                _FP_FRAC_SET_##wc(Y, _FP_ZEROFRAC_##wc);                     \
-            }                                                                \
-          R##_e = X##_e;                                                     \
-        }                                                                    \
-                                                                             \
-      R##_c = FP_CLS_NORMAL;                                                 \
-                                                                             \
-      if (X##_s == Y##_s)                                                    \
-        {                                                                    \
-          R##_s = X##_s;                                                     \
-          _FP_FRAC_ADD_##wc(R, X, Y);                                        \
-          if (_FP_FRAC_OVERP_##wc(fs, R))                                    \
-            {                                                                \
-              _FP_FRAC_SRS_##wc(R, 1, _FP_WFRACBITS_##fs);                   \
-              R##_e++;                                                       \
-            }                                                                \
-        }                                                                    \
-      else                                                                   \
-        {                                                                    \
-          R##_s = X##_s;                                                     \
-          _FP_FRAC_SUB_##wc(R, X, Y);                                        \
-          if (_FP_FRAC_ZEROP_##wc(R))                                        \
-            {                                                                \
-              /* return an exact zero */                                     \
-              if (FP_ROUNDMODE == FP_RND_MINF)                               \
-                R##_s |= Y##_s;                                              \
-              else                                                           \
-                R##_s &= Y##_s;                                              \
-              R##_c = FP_CLS_ZERO;                                           \
-            }                                                                \
-          else                                                               \
-            {                                                                \
-              if (_FP_FRAC_NEGP_##wc(R))                                     \
-                {                                                            \
-                  _FP_FRAC_SUB_##wc(R, Y, X);                                \
-                  R##_s = Y##_s;                                             \
-                }                                                            \
-                                                                             \
-              /* renormalize after subtraction */                            \
-              _FP_FRAC_CLZ_##wc(diff, R);                                    \
-              diff -= _FP_WFRACXBITS_##fs;                                   \
-              if (diff)                                                      \
-                {                                                            \
-                  R##_e -= diff;                                             \
-                  _FP_FRAC_SLL_##wc(R, diff);                                \
-                }                                                            \
-            }                                                                \
-        }                                                                    \
-      break;                                                                 \
-    }                                                                        \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NAN):                               \
-    _FP_CHOOSENAN(fs, wc, R, X, Y);                                          \
-    break;                                                                   \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):                           \
-    R##_e = X##_e;                                                           \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):                            \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):                               \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):                              \
-    _FP_FRAC_COPY_##wc(R, X);                                                \
-    R##_s = X##_s;                                                           \
-    R##_c = X##_c;                                                           \
-    break;                                                                   \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):                           \
-    R##_e = Y##_e;                                                           \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):                            \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):                               \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):                              \
-    _FP_FRAC_COPY_##wc(R, Y);                                                \
-    R##_s = Y##_s;                                                           \
-    R##_c = Y##_c;                                                           \
-    break;                                                                   \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):                               \
-    if (X##_s != Y##_s)                                                      \
-      {                                                                      \
-        /* +INF + -INF => NAN */                                             \
-        _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);                              \
-        R##_s = X##_s ^ Y##_s;                                               \
-        R##_c = FP_CLS_NAN;                                                  \
-        break;                                                               \
-      }                                                                      \
-    /* FALLTHRU */                                                           \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):                            \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):                              \
-    R##_s = X##_s;                                                           \
-    R##_c = FP_CLS_INF;                                                      \
-    break;                                                                   \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):                            \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_INF):                              \
-    R##_s = Y##_s;                                                           \
-    R##_c = FP_CLS_INF;                                                      \
-    break;                                                                   \
-                                                                             \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO):                             \
-    /* make sure the sign is correct */                                      \
-    if (FP_ROUNDMODE == FP_RND_MINF)                                         \
-      R##_s = X##_s | Y##_s;                                                 \
-    else                                                                     \
-      R##_s = X##_s & Y##_s;                                                 \
-    R##_c = FP_CLS_ZERO;                                                     \
-    break;                                                                   \
-                                                                             \
-  default:                                                                   \
-    abort();                                                                 \
-  }                                                                          \
-} while (0)
-
-
-/*
- * Main negation routine.  FIXME -- when we care about setting exception
- * bits reliably, this will not do.  We should examine all of the fp classes.
- */
-
-#define _FP_NEG(fs, wc, R, X)           \
-  do {                                  \
-    _FP_FRAC_COPY_##wc(R, X);           \
-    R##_c = X##_c;                      \
-    R##_e = X##_e;                      \
-    R##_s = 1 ^ X##_s;                  \
-  } while (0)
-
-
-/*
- * Main multiplication routine.  The input values should be cooked.
- */
-
-#define _FP_MUL(fs, wc, R, X, Y)                        \
-do {                                                    \
-  R##_s = X##_s ^ Y##_s;                                \
-  switch (_FP_CLS_COMBINE(X##_c, Y##_c))                \
-  {                                                     \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):    \
-    R##_c = FP_CLS_NORMAL;                              \
-    R##_e = X##_e + Y##_e + 1;                          \
-                                                        \
-    _FP_MUL_MEAT_##fs(R,X,Y);                           \
-                                                        \
-    if (_FP_FRAC_OVERP_##wc(fs, R))                     \
-      _FP_FRAC_SRS_##wc(R, 1, _FP_WFRACBITS_##fs);      \
-    else                                                \
-      R##_e--;                                          \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NAN):          \
-    _FP_CHOOSENAN(fs, wc, R, X, Y);                     \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):       \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):          \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):         \
-    R##_s = X##_s;                                      \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):          \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):       \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):      \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO):        \
-    _FP_FRAC_COPY_##wc(R, X);                           \
-    R##_c = X##_c;                                      \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):       \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):          \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):         \
-    R##_s = Y##_s;                                      \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):       \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):      \
-    _FP_FRAC_COPY_##wc(R, Y);                           \
-    R##_c = Y##_c;                                      \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):         \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_INF):         \
-    R##_c = FP_CLS_NAN;                                 \
-    _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);             \
-    break;                                              \
-                                                        \
-  default:                                              \
-    abort();                                            \
-  }                                                     \
-} while (0)
-
-
-/*
- * Main division routine.  The input values should be cooked.
- */
-
-#define _FP_DIV(fs, wc, R, X, Y)                        \
-do {                                                    \
-  R##_s = X##_s ^ Y##_s;                                \
-  switch (_FP_CLS_COMBINE(X##_c, Y##_c))                \
-  {                                                     \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NORMAL):    \
-    R##_c = FP_CLS_NORMAL;                              \
-    R##_e = X##_e - Y##_e;                              \
-                                                        \
-    _FP_DIV_MEAT_##fs(R,X,Y);                           \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NAN):          \
-    _FP_CHOOSENAN(fs, wc, R, X, Y);                     \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_NORMAL):       \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_INF):          \
-  case _FP_CLS_COMBINE(FP_CLS_NAN,FP_CLS_ZERO):         \
-    R##_s = X##_s;                                      \
-    _FP_FRAC_COPY_##wc(R, X);                           \
-    R##_c = X##_c;                                      \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_NAN):       \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NAN):          \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NAN):         \
-    R##_s = Y##_s;                                      \
-    _FP_FRAC_COPY_##wc(R, Y);                           \
-    R##_c = Y##_c;                                      \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_INF):       \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_INF):         \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_NORMAL):      \
-    R##_c = FP_CLS_ZERO;                                \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_NORMAL,FP_CLS_ZERO):      \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_ZERO):         \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_NORMAL):       \
-    R##_c = FP_CLS_INF;                                 \
-    break;                                              \
-                                                        \
-  case _FP_CLS_COMBINE(FP_CLS_INF,FP_CLS_INF):          \
-  case _FP_CLS_COMBINE(FP_CLS_ZERO,FP_CLS_ZERO):        \
-    R##_c = FP_CLS_NAN;                                 \
-    _FP_FRAC_SET_##wc(R, _FP_NANFRAC_##fs);             \
-    break;                                              \
-                                                        \
-  default:                                              \
-    abort();                                            \
-  }                                                     \
-} while (0)
-
-
-/*
- * Main differential comparison routine.  The inputs should be raw not
- * cooked.  The return is -1,0,1 for normal values, 2 otherwise.
- */
-
-#define _FP_CMP(fs, wc, ret, X, Y, un)                                  \
-  do {                                                                  \
-    /* NANs are unordered */                                            \
-    if ((X##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(X))           \
-        || (Y##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(Y)))       \
-      {                                                                 \
-        ret = un;                                                       \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        int __x_zero = (!X##_e && _FP_FRAC_ZEROP_##wc(X)) ? 1 : 0;      \
-        int __y_zero = (!Y##_e && _FP_FRAC_ZEROP_##wc(Y)) ? 1 : 0;      \
-                                                                        \
-        if (__x_zero && __y_zero)                                       \
-          ret = 0;                                                      \
-        else if (__x_zero)                                              \
-          ret = Y##_s ? 1 : -1;                                         \
-        else if (__y_zero)                                              \
-          ret = X##_s ? -1 : 1;                                         \
-        else if (X##_s != Y##_s)                                        \
-          ret = X##_s ? -1 : 1;                                         \
-        else if (X##_e > Y##_e)                                         \
-          ret = X##_s ? -1 : 1;                                         \
-        else if (X##_e < Y##_e)                                         \
-          ret = X##_s ? 1 : -1;                                         \
-        else if (_FP_FRAC_GT_##wc(X, Y))                                \
-          ret = X##_s ? -1 : 1;                                         \
-        else if (_FP_FRAC_GT_##wc(Y, X))                                \
-          ret = X##_s ? 1 : -1;                                         \
-        else                                                            \
-          ret = 0;                                                      \
-      }                                                                 \
-  } while (0)
-
-
-/* Simplification for strict equality.  */
-
-#define _FP_CMP_EQ(fs, wc, ret, X, Y)                                     \
-  do {                                                                    \
-    /* NANs are unordered */                                              \
-    if ((X##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(X))             \
-        || (Y##_e == _FP_EXPMAX_##fs && !_FP_FRAC_ZEROP_##wc(Y)))         \
-      {                                                                   \
-        ret = 1;                                                          \
-      }                                                                   \
-    else                                                                  \
-      {                                                                   \
-        ret = !(X##_e == Y##_e                                            \
-                && _FP_FRAC_EQ_##wc(X, Y)                                 \
-                && (X##_s == Y##_s || !X##_e && _FP_FRAC_ZEROP_##wc(X))); \
-      }                                                                   \
-  } while (0)
-
-/*
- * Main square root routine.  The input value should be cooked.
- */
-
-#define _FP_SQRT(fs, wc, R, X)                                          \
-do {                                                                    \
-    _FP_FRAC_DECL_##wc(T); _FP_FRAC_DECL_##wc(S);                       \
-    _FP_W_TYPE q;                                                       \
-    switch (X##_c)                                                      \
-    {                                                                   \
-    case FP_CLS_NAN:                                                    \
-        R##_s = 0;                                                      \
-        R##_c = FP_CLS_NAN;                                             \
-        _FP_FRAC_SET_##wc(X, _FP_ZEROFRAC_##wc);                        \
-        break;                                                          \
-    case FP_CLS_INF:                                                    \
-        if (X##_s)                                                      \
-          {                                                             \
-            R##_s = 0;                                                  \
-            R##_c = FP_CLS_NAN; /* sNAN */                              \
-          }                                                             \
-        else                                                            \
-          {                                                             \
-            R##_s = 0;                                                  \
-            R##_c = FP_CLS_INF; /* sqrt(+inf) = +inf */                 \
-          }                                                             \
-        break;                                                          \
-    case FP_CLS_ZERO:                                                   \
-        R##_s = X##_s;                                                  \
-        R##_c = FP_CLS_ZERO; /* sqrt(+-0) = +-0 */                      \
-        break;                                                          \
-    case FP_CLS_NORMAL:                                                 \
-        R##_s = 0;                                                      \
-        if (X##_s)                                                      \
-          {                                                             \
-            R##_c = FP_CLS_NAN; /* sNAN */                              \
-            break;                                                      \
-          }                                                             \
-        R##_c = FP_CLS_NORMAL;                                          \
-        if (X##_e & 1)                                                  \
-          _FP_FRAC_SLL_##wc(X, 1);                                      \
-        R##_e = X##_e >> 1;                                             \
-        _FP_FRAC_SET_##wc(S, _FP_ZEROFRAC_##wc);                        \
-        _FP_FRAC_SET_##wc(R, _FP_ZEROFRAC_##wc);                        \
-        q = _FP_OVERFLOW_##fs;                                          \
-        _FP_FRAC_SLL_##wc(X, 1);                                        \
-        _FP_SQRT_MEAT_##wc(R, S, T, X, q);                              \
-        _FP_FRAC_SRL_##wc(R, 1);                                        \
-    }                                                                   \
-  } while (0)
-
-/*
- * Convert from FP to integer
- */
-
-/* "When a NaN, infinity, large positive argument >= 2147483648.0, or
- * large negative argument <= -2147483649.0 is converted to an integer,
- * the invalid_current bit...should be set and fp_exception_IEEE_754 should
- * be raised. If the floating point invalid trap is disabled, no trap occurs
- * and a numerical result is generated: if the sign bit of the operand
- * is 0, the result is 2147483647; if the sign bit of the operand is 1,
- * the result is -2147483648."
- * Similarly for conversion to extended ints, except that the boundaries
- * are >= 2^63, <= -(2^63 + 1), and the results are 2^63 + 1 for s=0 and
- * -2^63 for s=1.
- * -- SPARC Architecture Manual V9, Appendix B, which specifies how
- * SPARCs resolve implementation dependencies in the IEEE-754 spec.
- * I don't believe that the code below follows this. I'm not even sure
- * it's right!
- * It doesn't cope with needing to convert to an n bit integer when there
- * is no n bit integer type. Fortunately gcc provides long long so this
- * isn't a problem for sparc32.
- * I have, however, fixed its NaN handling to conform as above.
- *         -- PMM 02/1998
- * NB: rsigned is not 'is r declared signed?' but 'should the value stored
- * in r be signed or unsigned?'. r is always(?) declared unsigned.
- * Comments below are mine, BTW -- PMM
- */
-#define _FP_TO_INT(fs, wc, r, X, rsize, rsigned)                        \
-  do {                                                                  \
-    switch (X##_c)                                                      \
-      {                                                                 \
-      case FP_CLS_NORMAL:                                               \
-        if (X##_e < 0)                                                  \
-          {                                                             \
-          /* case FP_CLS_NAN: see above! */                             \
-          case FP_CLS_ZERO:                                             \
-            r = 0;                                                      \
-          }                                                             \
-        else if (X##_e >= rsize - (rsigned != 0))                       \
-          {     /* overflow */                                          \
-          case FP_CLS_NAN:                                              \
-          case FP_CLS_INF:                                              \
-            if (rsigned)                                                \
-              {                                                         \
-                r = 1;                                                  \
-                r <<= rsize - 1;                                        \
-                r -= 1 - X##_s;                                         \
-              }                                                         \
-            else                                                        \
-              {                                                         \
-                r = 0;                                                  \
-                if (!X##_s)                                             \
-                  r = ~r;                                               \
-              }                                                         \
-          }                                                             \
-        else                                                            \
-          {                                                             \
-            if (_FP_W_TYPE_SIZE*wc < rsize)                             \
-              {                                                         \
-                _FP_FRAC_ASSEMBLE_##wc(r, X, rsize);                    \
-                r <<= X##_e - _FP_WFRACBITS_##fs;                       \
-              }                                                         \
-            else                                                        \
-              {                                                         \
-                if (X##_e >= _FP_WFRACBITS_##fs)                        \
-                  _FP_FRAC_SLL_##wc(X, (X##_e - _FP_WFRACBITS_##fs + 1));\
-                else                                                    \
-                  _FP_FRAC_SRL_##wc(X, (_FP_WFRACBITS_##fs - X##_e - 1));\
-                _FP_FRAC_ASSEMBLE_##wc(r, X, rsize);                    \
-              }                                                         \
-            if (rsigned && X##_s)                                       \
-              r = -r;                                                   \
-          }                                                             \
-        break;                                                          \
-      }                                                                 \
-  } while (0)
-
-#define _FP_FROM_INT(fs, wc, X, r, rsize, rtype)                        \
-  do {                                                                  \
-    if (r)                                                              \
-      {                                                                 \
-        X##_c = FP_CLS_NORMAL;                                          \
-                                                                        \
-        if ((X##_s = (r < 0)))                                          \
-          r = -r;                                                       \
-        /* Note that `r' is now considered unsigned, so we don't have   \
-           to worry about the single signed overflow case.  */          \
-                                                                        \
-        if (rsize <= _FP_W_TYPE_SIZE)                                   \
-          __FP_CLZ(X##_e, r);                                           \
-        else                                                            \
-          __FP_CLZ_2(X##_e, (_FP_W_TYPE)(r >> _FP_W_TYPE_SIZE),         \
-                     (_FP_W_TYPE)r);                                    \
-        if (rsize < _FP_W_TYPE_SIZE)                                    \
-                X##_e -= (_FP_W_TYPE_SIZE - rsize);                     \
-        X##_e = rsize - X##_e - 1;                                      \
-                                                                        \
-        if (_FP_FRACBITS_##fs < rsize && _FP_WFRACBITS_##fs < X##_e)    \
-          __FP_FRAC_SRS_1(r, (X##_e - _FP_WFRACBITS_##fs), rsize);      \
-        r &= ~((_FP_W_TYPE)1 << X##_e);                                 \
-        _FP_FRAC_DISASSEMBLE_##wc(X, ((unsigned rtype)r), rsize);       \
-        _FP_FRAC_SLL_##wc(X, (_FP_WFRACBITS_##fs - X##_e - 1));         \
-      }                                                                 \
-    else                                                                \
-      {                                                                 \
-        X##_c = FP_CLS_ZERO, X##_s = 0;                                 \
-      }                                                                 \
-  } while (0)
-
-
-#define FP_CONV(dfs,sfs,dwc,swc,D,S)                    \
-  do {                                                  \
-    _FP_FRAC_CONV_##dwc##_##swc(dfs, sfs, D, S);        \
-    D##_e = S##_e;                                      \
-    D##_c = S##_c;                                      \
-    D##_s = S##_s;                                      \
-  } while (0)
-
-/*
- * Helper primitives.
- */
-
-/* Count leading zeros in a word.  */
-
-#ifndef __FP_CLZ
-#if _FP_W_TYPE_SIZE < 64
-/* this is just to shut the compiler up about shifts > word length -- PMM 02/1998 */
-#define __FP_CLZ(r, x)                          \
-  do {                                          \
-    _FP_W_TYPE _t = (x);                        \
-    r = _FP_W_TYPE_SIZE - 1;                    \
-    if (_t > 0xffff) r -= 16;                   \
-    if (_t > 0xffff) _t >>= 16;                 \
-    if (_t > 0xff) r -= 8;                      \
-    if (_t > 0xff) _t >>= 8;                    \
-    if (_t & 0xf0) r -= 4;                      \
-    if (_t & 0xf0) _t >>= 4;                    \
-    if (_t & 0xc) r -= 2;                       \
-    if (_t & 0xc) _t >>= 2;                     \
-    if (_t & 0x2) r -= 1;                       \
-  } while (0)
-#else /* not _FP_W_TYPE_SIZE < 64 */
-#define __FP_CLZ(r, x)                          \
-  do {                                          \
-    _FP_W_TYPE _t = (x);                        \
-    r = _FP_W_TYPE_SIZE - 1;                    \
-    if (_t > 0xffffffff) r -= 32;               \
-    if (_t > 0xffffffff) _t >>= 32;             \
-    if (_t > 0xffff) r -= 16;                   \
-    if (_t > 0xffff) _t >>= 16;                 \
-    if (_t > 0xff) r -= 8;                      \
-    if (_t > 0xff) _t >>= 8;                    \
-    if (_t & 0xf0) r -= 4;                      \
-    if (_t & 0xf0) _t >>= 4;                    \
-    if (_t & 0xc) r -= 2;                       \
-    if (_t & 0xc) _t >>= 2;                     \
-    if (_t & 0x2) r -= 1;                       \
-  } while (0)
-#endif /* not _FP_W_TYPE_SIZE < 64 */
-#endif /* ndef __FP_CLZ */
-
-#define _FP_DIV_HELP_imm(q, r, n, d)            \
-  do {                                          \
-    q = n / d, r = n % d;                       \
-  } while (0)
-
diff --git a/arch/powerpc/math-emu/single.h b/arch/powerpc/math-emu/single.h
deleted file mode 100644
index f19d99451815..000000000000
--- a/arch/powerpc/math-emu/single.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Definitions for IEEE Single Precision
- */
-
-#if _FP_W_TYPE_SIZE < 32
-#error "Here's a nickel kid.  Go buy yourself a real computer."
-#endif
-
-#define _FP_FRACBITS_S          24
-#define _FP_FRACXBITS_S         (_FP_W_TYPE_SIZE - _FP_FRACBITS_S)
-#define _FP_WFRACBITS_S         (_FP_WORKBITS + _FP_FRACBITS_S)
-#define _FP_WFRACXBITS_S        (_FP_W_TYPE_SIZE - _FP_WFRACBITS_S)
-#define _FP_EXPBITS_S           8
-#define _FP_EXPBIAS_S           127
-#define _FP_EXPMAX_S            255
-#define _FP_QNANBIT_S           ((_FP_W_TYPE)1 << (_FP_FRACBITS_S-2))
-#define _FP_IMPLBIT_S           ((_FP_W_TYPE)1 << (_FP_FRACBITS_S-1))
-#define _FP_OVERFLOW_S          ((_FP_W_TYPE)1 << (_FP_WFRACBITS_S))
-
-/* The implementation of _FP_MUL_MEAT_S and _FP_DIV_MEAT_S should be
-   chosen by the target machine.  */
-
-union _FP_UNION_S
-{
-  float flt;
-  struct {
-#if __BYTE_ORDER == __BIG_ENDIAN
-    unsigned sign : 1;
-    unsigned exp  : _FP_EXPBITS_S;
-    unsigned frac : _FP_FRACBITS_S - (_FP_IMPLBIT_S != 0);
-#else
-    unsigned frac : _FP_FRACBITS_S - (_FP_IMPLBIT_S != 0);
-    unsigned exp  : _FP_EXPBITS_S;
-    unsigned sign : 1;
-#endif
-  } bits __attribute__((packed));
-};
-
-#define FP_DECL_S(X)            _FP_DECL(1,X)
-#define FP_UNPACK_RAW_S(X,val)  _FP_UNPACK_RAW_1(S,X,val)
-#define FP_PACK_RAW_S(val,X)    _FP_PACK_RAW_1(S,val,X)
-
-#define FP_UNPACK_S(X,val)              \
-  do {                                  \
-    _FP_UNPACK_RAW_1(S,X,val);          \
-    _FP_UNPACK_CANONICAL(S,1,X);        \
-  } while (0)
-
-#define FP_PACK_S(val,X)                \
-  do {                                  \
-    _FP_PACK_CANONICAL(S,1,X);          \
-    _FP_PACK_RAW_1(S,val,X);            \
-  } while (0)
-
-#define FP_NEG_S(R,X)           _FP_NEG(S,1,R,X)
-#define FP_ADD_S(R,X,Y)         _FP_ADD(S,1,R,X,Y)
-#define FP_SUB_S(R,X,Y)         _FP_SUB(S,1,R,X,Y)
-#define FP_MUL_S(R,X,Y)         _FP_MUL(S,1,R,X,Y)
-#define FP_DIV_S(R,X,Y)         _FP_DIV(S,1,R,X,Y)
-#define FP_SQRT_S(R,X)          _FP_SQRT(S,1,R,X)
-
-#define FP_CMP_S(r,X,Y,un)      _FP_CMP(S,1,r,X,Y,un)
-#define FP_CMP_EQ_S(r,X,Y)      _FP_CMP_EQ(S,1,r,X,Y)
-
-#define FP_TO_INT_S(r,X,rsz,rsg)  _FP_TO_INT(S,1,r,X,rsz,rsg)
-#define FP_FROM_INT_S(X,r,rs,rt)  _FP_FROM_INT(S,1,X,r,rs,rt)
diff --git a/arch/powerpc/math-emu/soft-fp.h b/arch/powerpc/math-emu/soft-fp.h
deleted file mode 100644
index cca39598f873..000000000000
--- a/arch/powerpc/math-emu/soft-fp.h
+++ /dev/null
@@ -1,104 +0,0 @@
-#ifndef SOFT_FP_H
-#define SOFT_FP_H
-
-#include "sfp-machine.h"
-
-#define _FP_WORKBITS            3
-#define _FP_WORK_LSB            ((_FP_W_TYPE)1 << 3)
-#define _FP_WORK_ROUND          ((_FP_W_TYPE)1 << 2)
-#define _FP_WORK_GUARD          ((_FP_W_TYPE)1 << 1)
-#define _FP_WORK_STICKY         ((_FP_W_TYPE)1 << 0)
-
-#ifndef FP_RND_NEAREST
-# define FP_RND_NEAREST         0
-# define FP_RND_ZERO            1
-# define FP_RND_PINF            2
-# define FP_RND_MINF            3
-#ifndef FP_ROUNDMODE
-# define FP_ROUNDMODE           FP_RND_NEAREST
-#endif
-#endif
-
-#define _FP_ROUND_NEAREST(wc, X)                        \
-({  int __ret = 0;                                      \
-    int __frac = _FP_FRAC_LOW_##wc(X) & 15;             \
-    if (__frac & 7) {                                   \
-      __ret = EFLAG_INEXACT;                            \
-      if ((__frac & 7) != _FP_WORK_ROUND)               \
-        _FP_FRAC_ADDI_##wc(X, _FP_WORK_ROUND);          \
-      else if (__frac & _FP_WORK_LSB)                   \
-        _FP_FRAC_ADDI_##wc(X, _FP_WORK_ROUND);          \
-    }                                                   \
-    __ret;                                              \
-})
-
-#define _FP_ROUND_ZERO(wc, X)                           \
-({  int __ret = 0;                                      \
-    if (_FP_FRAC_LOW_##wc(X) & 7)                       \
-      __ret = EFLAG_INEXACT;                            \
-    __ret;                                              \
-})
-
-#define _FP_ROUND_PINF(wc, X)                           \
-({  int __ret = EFLAG_INEXACT;                          \
-    if (!X##_s && (_FP_FRAC_LOW_##wc(X) & 7))           \
-      _FP_FRAC_ADDI_##wc(X, _FP_WORK_LSB);              \
-    else __ret = 0;                                     \
-    __ret;                                              \
-})
-
-#define _FP_ROUND_MINF(wc, X)                           \
-({  int __ret = EFLAG_INEXACT;                          \
-    if (X##_s && (_FP_FRAC_LOW_##wc(X) & 7))            \
-      _FP_FRAC_ADDI_##wc(X, _FP_WORK_LSB);              \
-    else __ret = 0;                                     \
-    __ret;                                              \
-})
-
-#define _FP_ROUND(wc, X)                        \
-({      int __ret = 0;                          \
-        switch (FP_ROUNDMODE)                   \
-        {                                       \
-          case FP_RND_NEAREST:                  \
-            __ret |= _FP_ROUND_NEAREST(wc,X);   \
-            break;                              \
-          case FP_RND_ZERO:                     \
-            __ret |= _FP_ROUND_ZERO(wc,X);      \
-            break;                              \
-          case FP_RND_PINF:                     \
-            __ret |= _FP_ROUND_PINF(wc,X);      \
-            break;                              \
-          case FP_RND_MINF:                     \
-            __ret |= _FP_ROUND_MINF(wc,X);      \
-            break;                              \
-        };                                      \
-        __ret;                                  \
-})
-
-#define FP_CLS_NORMAL           0
-#define FP_CLS_ZERO             1
-#define FP_CLS_INF              2
-#define FP_CLS_NAN              3
-
-#define _FP_CLS_COMBINE(x,y)    (((x) << 2) | (y))
-
-#include "op-1.h"
-#include "op-2.h"
-#include "op-4.h"
-#include "op-common.h"
-
-/* Sigh.  Silly things longlong.h needs.  */
-#define UWtype          _FP_W_TYPE
-#define W_TYPE_SIZE     _FP_W_TYPE_SIZE
-
-typedef int SItype __attribute__((mode(SI)));
-typedef int DItype __attribute__((mode(DI)));
-typedef unsigned int USItype __attribute__((mode(SI)));
-typedef unsigned int UDItype __attribute__((mode(DI)));
-#if _FP_W_TYPE_SIZE == 32
-typedef unsigned int UHWtype __attribute__((mode(HI)));
-#elif _FP_W_TYPE_SIZE == 64
-typedef USItype UHWtype;
-#endif
-
-#endif
diff --git a/arch/powerpc/math-emu/stfs.c b/arch/powerpc/math-emu/stfs.c
index 8689aa48ef69..6122147356d1 100644
--- a/arch/powerpc/math-emu/stfs.c
+++ b/arch/powerpc/math-emu/stfs.c
@@ -2,23 +2,24 @@
 #include <linux/errno.h>
 #include <asm/uaccess.h>
 
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
+#include <asm/sfp-machine.h>
+#include <math-emu/soft-fp.h>
+#include <math-emu/double.h>
+#include <math-emu/single.h>
 
 int
 stfs(void *frS, void *ea)
 {
         FP_DECL_D(A);
         FP_DECL_S(R);
+        FP_DECL_EX;
         float f;
-        int err;
 
 #ifdef DEBUG
         printk("%s: S %p, ea %p\n", __func__, frS, ea);
 #endif
 
-        __FP_UNPACK_D(A, frS);
+        FP_UNPACK_DP(A, frS);
 
 #ifdef DEBUG
         printk("A: %ld %lu %lu %ld (%ld)\n", A_s, A_f1, A_f0, A_e, A_c);
@@ -30,12 +31,12 @@ stfs(void *frS, void *ea)
         printk("R: %ld %lu %ld (%ld)\n", R_s, R_f, R_e, R_c);
 #endif
 
-        err = _FP_PACK_CANONICAL(S, 1, R);
-        if (!err || !__FPU_TRAP_P(err)) {
-                __FP_PACK_RAW_1(S, &f, R);
+        _FP_PACK_CANONICAL(S, 1, R);
+        if (!FP_CUR_EXCEPTIONS || !__FPU_TRAP_P(FP_CUR_EXCEPTIONS)) {
+                _FP_PACK_RAW_1_P(S, &f, R);
                 if (copy_to_user(ea, &f, sizeof(float)))
                         return -EFAULT;
         }
 
-        return err;
+        return FP_CUR_EXCEPTIONS;
 }
diff --git a/arch/powerpc/math-emu/types.c b/arch/powerpc/math-emu/types.c
deleted file mode 100644
index e1ed15d829db..000000000000
--- a/arch/powerpc/math-emu/types.c
+++ /dev/null
@@ -1,51 +0,0 @@
-#include "soft-fp.h"
-#include "double.h"
-#include "single.h"
-
-void
-fp_unpack_d(long *_s, unsigned long *_f1, unsigned long *_f0,
-            long *_e, long *_c, void *val)
-{
-        FP_DECL_D(X);
-
-        __FP_UNPACK_RAW_2(D, X, val);
-
-        _FP_UNPACK_CANONICAL(D, 2, X);
-
-        *_s = X_s;
-        *_f1 = X_f1;
-        *_f0 = X_f0;
-        *_e = X_e;
-        *_c = X_c;
-}
-
-int
-fp_pack_d(void *val, long X_s, unsigned long X_f1,
-          unsigned long X_f0, long X_e, long X_c)
-{
-        int exc;
-
-        exc = _FP_PACK_CANONICAL(D, 2, X);
-        if (!exc || !__FPU_TRAP_P(exc))
-                __FP_PACK_RAW_2(D, val, X);
-        return exc;
-}
-
-int
-fp_pack_ds(void *val, long X_s, unsigned long X_f1,
-           unsigned long X_f0, long X_e, long X_c)
-{
-        FP_DECL_S(__X);
-        int exc;
-
-        FP_CONV(S, D, 1, 2, __X, X);
-        exc = _FP_PACK_CANONICAL(S, 1, __X);
-        if (!exc || !__FPU_TRAP_P(exc)) {
-                _FP_UNPACK_CANONICAL(S, 1, __X);
-                FP_CONV(D, S, 2, 1, X, __X);
-                exc |= _FP_PACK_CANONICAL(D, 2, X);
-                if (!exc || !__FPU_TRAP_P(exc))
-                        __FP_PACK_RAW_2(D, val, X);
-        }
-        return exc;
-}
diff --git a/arch/powerpc/math-emu/udivmodti4.c b/arch/powerpc/math-emu/udivmodti4.c
index 7e112dc1e2f2..6172044ab003 100644
--- a/arch/powerpc/math-emu/udivmodti4.c
+++ b/arch/powerpc/math-emu/udivmodti4.c
@@ -1,6 +1,6 @@
 /* This has so very few changes over libgcc2's __udivmoddi4 it isn't funny.  */
 
-#include "soft-fp.h"
+#include <math-emu/soft-fp.h>
 
 #undef count_leading_zeros
 #define count_leading_zeros  __FP_CLZ
diff --git a/arch/powerpc/mm/fsl_booke_mmu.c b/arch/powerpc/mm/fsl_booke_mmu.c
index ce10e2b1b902..23cee39534fd 100644
--- a/arch/powerpc/mm/fsl_booke_mmu.c
+++ b/arch/powerpc/mm/fsl_booke_mmu.c
@@ -202,7 +202,7 @@ adjust_total_lowmem(void)
                 cam_max_size = max_lowmem_size;
 
         /* adjust lowmem size to max_lowmem_size */
-        ram = min(max_lowmem_size, (phys_addr_t)total_lowmem);
+        ram = min(max_lowmem_size, total_lowmem);
 
         /* Calculate CAM values */
         __cam0 = 1UL << 2 * (__ilog2(ram) / 2);
@@ -225,7 +225,8 @@ adjust_total_lowmem(void)
         printk(KERN_INFO "Memory CAM mapping: CAM0=%ldMb, CAM1=%ldMb,"
                         " CAM2=%ldMb residual: %ldMb\n",
                         __cam0 >> 20, __cam1 >> 20, __cam2 >> 20,
-                        (total_lowmem - __cam0 - __cam1 - __cam2) >> 20);
+                        (long int)((total_lowmem - __cam0 - __cam1 - __cam2)
+                                   >> 20));
         __max_low_memory = __cam0 + __cam1 + __cam2;
         __initial_memory_limit_addr = memstart_addr + __max_low_memory;
 }
diff --git a/arch/powerpc/mm/gup.c b/arch/powerpc/mm/gup.c
index 9fdf4d6335e4..28a114db3ba0 100644
--- a/arch/powerpc/mm/gup.c
+++ b/arch/powerpc/mm/gup.c
@@ -41,7 +41,7 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr,
                 page = pte_page(pte);
                 if (!page_cache_get_speculative(page))
                         return 0;
-                if (unlikely(pte != *ptep)) {
+                if (unlikely(pte_val(pte) != pte_val(*ptep))) {
                         put_page(page);
                         return 0;
                 }
@@ -92,7 +92,7 @@ static noinline int gup_huge_pte(pte_t *ptep, struct hstate *hstate,
                 *nr -= refs;
                 return 0;
         }
-        if (unlikely(pte != *ptep)) {
+        if (unlikely(pte_val(pte) != pte_val(*ptep))) {
                 /* Could be optimized better */
                 while (*nr) {
                         put_page(page);
@@ -237,7 +237,8 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
                         pgd_t pgd = *pgdp;
 
                         VM_BUG_ON(shift != mmu_psize_defs[get_slice_psize(mm, addr)].shift);
-                        pr_debug("  %016lx: normal pgd %p\n", addr, (void *)pgd);
+                        pr_debug("  %016lx: normal pgd %p\n", addr,
+                                 (void *)pgd_val(pgd));
                         next = pgd_addr_end(addr, end);
                         if (pgd_none(pgd))
                                 goto slow;
diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S
index b9ba7d930801..7bffb70b9fe2 100644
--- a/arch/powerpc/mm/hash_low_32.S
+++ b/arch/powerpc/mm/hash_low_32.S
@@ -75,7 +75,7 @@ _GLOBAL(hash_page_sync)
  * Returns to the caller if the access is illegal or there is no
  * mapping for the address.  Otherwise it places an appropriate PTE
  * in the hash table and returns from the exception.
- * Uses r0, r3 - r8, ctr, lr.
+ * Uses r0, r3 - r8, r10, ctr, lr.
  */
         .text
 _GLOBAL(hash_page)
@@ -106,9 +106,15 @@ _GLOBAL(hash_page)
         addi    r5,r5,swapper_pg_dir@l  /* kernel page table */
         rlwimi  r3,r9,32-12,29,29       /* MSR_PR -> _PAGE_USER */
 112:    add     r5,r5,r7                /* convert to phys addr */
+#ifndef CONFIG_PTE_64BIT
         rlwimi  r5,r4,12,20,29          /* insert top 10 bits of address */
         lwz     r8,0(r5)                /* get pmd entry */
         rlwinm. r8,r8,0,0,19            /* extract address of pte page */
+#else
+        rlwinm  r8,r4,13,19,29          /* Compute pgdir/pmd offset */
+        lwzx    r8,r8,r5                /* Get L1 entry */
+        rlwinm. r8,r8,0,0,20            /* extract pt base address */
+#endif
 #ifdef CONFIG_SMP
         beq-    hash_page_out           /* return if no mapping */
 #else
@@ -118,7 +124,11 @@ _GLOBAL(hash_page)
            to the address following the rfi. */
         beqlr-
 #endif
+#ifndef CONFIG_PTE_64BIT
         rlwimi  r8,r4,22,20,29          /* insert next 10 bits of address */
+#else
+        rlwimi  r8,r4,23,20,28          /* compute pte address */
+#endif
         rlwinm  r0,r3,32-3,24,24        /* _PAGE_RW access -> _PAGE_DIRTY */
         ori     r0,r0,_PAGE_ACCESSED|_PAGE_HASHPTE
 
@@ -127,9 +137,15 @@ _GLOBAL(hash_page)
          * because almost always, there won't be a permission violation
          * and there won't already be an HPTE, and thus we will have
          * to update the PTE to set _PAGE_HASHPTE.  -- paulus.
+         *
+         * If PTE_64BIT is set, the low word is the flags word; use that
+         * word for locking since it contains all the interesting bits.
          */
+#if (PTE_FLAGS_OFFSET != 0)
+        addi    r8,r8,PTE_FLAGS_OFFSET
+#endif
 retry:
-        lwarx   r6,0,r8                 /* get linux-style pte */
+        lwarx   r6,0,r8                 /* get linux-style pte, flag word */
         andc.   r5,r3,r6                /* check access & ~permission */
 #ifdef CONFIG_SMP
         bne-    hash_page_out           /* return if access not permitted */
@@ -137,6 +153,15 @@ retry:
         bnelr-
 #endif
         or      r5,r0,r6                /* set accessed/dirty bits */
+#ifdef CONFIG_PTE_64BIT
+#ifdef CONFIG_SMP
+        subf    r10,r6,r8               /* create false data dependency */
+        subi    r10,r10,PTE_FLAGS_OFFSET
+        lwzx    r10,r6,r10              /* Get upper PTE word */
+#else
+        lwz     r10,-PTE_FLAGS_OFFSET(r8)
+#endif /* CONFIG_SMP */
+#endif /* CONFIG_PTE_64BIT */
         stwcx.  r5,0,r8                 /* attempt to update PTE */
         bne-    retry                   /* retry if someone got there first */
 
@@ -203,9 +228,9 @@ _GLOBAL(add_hash_page)
          * we can't take a hash table miss (assuming the code is
          * covered by a BAT).  -- paulus
          */
-        mfmsr   r10
+        mfmsr   r9
         SYNC
-        rlwinm  r0,r10,0,17,15          /* clear bit 16 (MSR_EE) */
+        rlwinm  r0,r9,0,17,15           /* clear bit 16 (MSR_EE) */
         rlwinm  r0,r0,0,28,26           /* clear MSR_DR */
         mtmsr   r0
         SYNC_601
@@ -214,14 +239,14 @@ _GLOBAL(add_hash_page)
         tophys(r7,0)
 
 #ifdef CONFIG_SMP
-        addis   r9,r7,mmu_hash_lock@ha
-        addi    r9,r9,mmu_hash_lock@l
-10:     lwarx   r0,0,r9                 /* take the mmu_hash_lock */
+        addis   r6,r7,mmu_hash_lock@ha
+        addi    r6,r6,mmu_hash_lock@l
+10:     lwarx   r0,0,r6                 /* take the mmu_hash_lock */
         cmpi    0,r0,0
         bne-    11f
-        stwcx.  r8,0,r9
+        stwcx.  r8,0,r6
         beq+    12f
-11:     lwz     r0,0(r9)
+11:     lwz     r0,0(r6)
         cmpi    0,r0,0
         beq     10b
         b       11b
@@ -234,10 +259,24 @@ _GLOBAL(add_hash_page)
          * HPTE, so we just unlock and return.
          */
         mr      r8,r5
+#ifndef CONFIG_PTE_64BIT
         rlwimi  r8,r4,22,20,29
+#else
+        rlwimi  r8,r4,23,20,28
+        addi    r8,r8,PTE_FLAGS_OFFSET
+#endif
 1:      lwarx   r6,0,r8
         andi.   r0,r6,_PAGE_HASHPTE
         bne     9f                      /* if HASHPTE already set, done */
+#ifdef CONFIG_PTE_64BIT
+#ifdef CONFIG_SMP
+        subf    r10,r6,r8               /* create false data dependency */
+        subi    r10,r10,PTE_FLAGS_OFFSET
+        lwzx    r10,r6,r10              /* Get upper PTE word */
+#else
+        lwz     r10,-PTE_FLAGS_OFFSET(r8)
+#endif /* CONFIG_SMP */
+#endif /* CONFIG_PTE_64BIT */
         ori     r5,r6,_PAGE_HASHPTE
         stwcx.  r5,0,r8
         bne-    1b
@@ -246,13 +285,15 @@ _GLOBAL(add_hash_page)
 
 9:
 #ifdef CONFIG_SMP
+        addis   r6,r7,mmu_hash_lock@ha
+        addi    r6,r6,mmu_hash_lock@l
         eieio
         li      r0,0
-        stw     r0,0(r9)                /* clear mmu_hash_lock */
+        stw     r0,0(r6)                /* clear mmu_hash_lock */
 #endif
 
         /* reenable interrupts and DR */
-        mtmsr   r10
+        mtmsr   r9
         SYNC_601
         isync
 
@@ -267,7 +308,8 @@ _GLOBAL(add_hash_page)
  * r5 contains the linux PTE, r6 contains the old value of the
  * linux PTE (before setting _PAGE_HASHPTE) and r7 contains the
  * offset to be added to addresses (0 if the MMU is on,
- * -KERNELBASE if it is off).
+ * -KERNELBASE if it is off).  r10 contains the upper half of
+ * the PTE if CONFIG_PTE_64BIT.
  * On SMP, the caller should have the mmu_hash_lock held.
  * We assume that the caller has (or will) set the _PAGE_HASHPTE
  * bit in the linux PTE in memory.  The value passed in r6 should
@@ -285,7 +327,7 @@ Hash_bits = 12				/* e.g. 256kB hash table */
 Hash_msk = (((1 << Hash_bits) - 1) * 64)
 
 /* defines for the PTE format for 32-bit PPCs */
-#define PTE_SIZE        8
+#define HPTE_SIZE       8
 #define PTEG_SIZE       64
 #define LG_PTEG_SIZE    6
 #define LDPTEu          lwzu
@@ -313,6 +355,11 @@ _GLOBAL(create_hpte)
 BEGIN_FTR_SECTION
         ori     r8,r8,_PAGE_COHERENT    /* set M (coherence required) */
 END_FTR_SECTION_IFSET(CPU_FTR_NEED_COHERENT)
+#ifdef CONFIG_PTE_64BIT
+        /* Put the XPN bits into the PTE */
+        rlwimi  r8,r10,8,20,22
+        rlwimi  r8,r10,2,29,29
+#endif
 
         /* Construct the high word of the PPC-style PTE (r5) */
         rlwinm  r5,r3,7,1,24            /* put VSID in 0x7fffff80 bits */
@@ -342,8 +389,8 @@ _GLOBAL(hash_page_patch_A)
 
         /* Search the primary PTEG for a PTE whose 1st (d)word matches r5 */
         mtctr   r0
-        addi    r4,r3,-PTE_SIZE
-1:      LDPTEu  r6,PTE_SIZE(r4)         /* get next PTE */
+        addi    r4,r3,-HPTE_SIZE
+1:      LDPTEu  r6,HPTE_SIZE(r4)        /* get next PTE */
         CMPPTE  0,r6,r5
         bdnzf   2,1b                    /* loop while ctr != 0 && !cr0.eq */
         beq+    found_slot
@@ -353,9 +400,9 @@ _GLOBAL(hash_page_patch_A)
 _GLOBAL(hash_page_patch_B)
         xoris   r4,r3,Hash_msk>>16      /* compute secondary hash */
         xori    r4,r4,(-PTEG_SIZE & 0xffff)
-        addi    r4,r4,-PTE_SIZE
+        addi    r4,r4,-HPTE_SIZE
         mtctr   r0
-2:      LDPTEu  r6,PTE_SIZE(r4)
+2:      LDPTEu  r6,HPTE_SIZE(r4)
         CMPPTE  0,r6,r5
         bdnzf   2,2b
         beq+    found_slot
@@ -363,8 +410,8 @@ _GLOBAL(hash_page_patch_B)
 
         /* Search the primary PTEG for an empty slot */
 10:     mtctr   r0
-        addi    r4,r3,-PTE_SIZE         /* search primary PTEG */
-1:      LDPTEu  r6,PTE_SIZE(r4)         /* get next PTE */
+        addi    r4,r3,-HPTE_SIZE        /* search primary PTEG */
+1:      LDPTEu  r6,HPTE_SIZE(r4)        /* get next PTE */
         TST_V(r6)                       /* test valid bit */
         bdnzf   2,1b                    /* loop while ctr != 0 && !cr0.eq */
         beq+    found_empty
@@ -380,9 +427,9 @@ _GLOBAL(hash_page_patch_B)
 _GLOBAL(hash_page_patch_C)
         xoris   r4,r3,Hash_msk>>16      /* compute secondary hash */
         xori    r4,r4,(-PTEG_SIZE & 0xffff)
-        addi    r4,r4,-PTE_SIZE
+        addi    r4,r4,-HPTE_SIZE
         mtctr   r0
-2:      LDPTEu  r6,PTE_SIZE(r4)
+2:      LDPTEu  r6,HPTE_SIZE(r4)
         TST_V(r6)
         bdnzf   2,2b
         beq+    found_empty
@@ -409,11 +456,11 @@ _GLOBAL(hash_page_patch_C)
 
 1:      addis   r4,r7,next_slot@ha              /* get next evict slot */
         lwz     r6,next_slot@l(r4)
-        addi    r6,r6,PTE_SIZE                  /* search for candidate */
-        andi.   r6,r6,7*PTE_SIZE
+        addi    r6,r6,HPTE_SIZE                 /* search for candidate */
+        andi.   r6,r6,7*HPTE_SIZE
         stw     r6,next_slot@l(r4)
         add     r4,r3,r6
-        LDPTE   r0,PTE_SIZE/2(r4)               /* get PTE second word */
+        LDPTE   r0,HPTE_SIZE/2(r4)              /* get PTE second word */
         clrrwi  r0,r0,12
         lis     r6,etext@h
         ori     r6,r6,etext@l                   /* get etext */
@@ -426,7 +473,7 @@ _GLOBAL(hash_page_patch_C)
 found_empty:
         STPTE   r5,0(r4)
 found_slot:
-        STPTE   r8,PTE_SIZE/2(r4)
+        STPTE   r8,HPTE_SIZE/2(r4)
 
 #else /* CONFIG_SMP */
 /*
@@ -452,7 +499,7 @@ found_slot:
         STPTE   r5,0(r4)
         sync
         TLBSYNC
-        STPTE   r8,PTE_SIZE/2(r4) /* put in correct RPN, WIMG, PP bits */
+        STPTE   r8,HPTE_SIZE/2(r4) /* put in correct RPN, WIMG, PP bits */
         sync
         SET_V(r5)
         STPTE   r5,0(r4)        /* finally set V bit in PTE */
@@ -499,14 +546,18 @@ _GLOBAL(flush_hash_pages)
         isync
 
         /* First find a PTE in the range that has _PAGE_HASHPTE set */
+#ifndef CONFIG_PTE_64BIT
         rlwimi  r5,r4,22,20,29
-1:      lwz     r0,0(r5)
+#else
+        rlwimi  r5,r4,23,20,28
+#endif
+1:      lwz     r0,PTE_FLAGS_OFFSET(r5)
         cmpwi   cr1,r6,1
         andi.   r0,r0,_PAGE_HASHPTE
         bne     2f
         ble     cr1,19f
         addi    r4,r4,0x1000
-        addi    r5,r5,4
+        addi    r5,r5,PTE_SIZE
         addi    r6,r6,-1
         b       1b
 
@@ -545,7 +596,10 @@ _GLOBAL(flush_hash_pages)
          * already clear, we're done (for this pte).  If not,
          * clear it (atomically) and proceed.  -- paulus.
          */
-33:     lwarx   r8,0,r5                 /* fetch the pte */
+#if (PTE_FLAGS_OFFSET != 0)
+        addi    r5,r5,PTE_FLAGS_OFFSET
+#endif
+33:     lwarx   r8,0,r5                 /* fetch the pte flags word */
         andi.   r0,r8,_PAGE_HASHPTE
         beq     8f                      /* done if HASHPTE is already clear */
         rlwinm  r8,r8,0,31,29           /* clear HASHPTE bit */
@@ -562,8 +616,8 @@ _GLOBAL(flush_hash_patch_A)
         /* Search the primary PTEG for a PTE whose 1st (d)word matches r5 */
         li      r0,8                    /* PTEs/group */
         mtctr   r0
-        addi    r12,r8,-PTE_SIZE
-1:      LDPTEu  r0,PTE_SIZE(r12)        /* get next PTE */
+        addi    r12,r8,-HPTE_SIZE
+1:      LDPTEu  r0,HPTE_SIZE(r12)       /* get next PTE */
         CMPPTE  0,r0,r11
         bdnzf   2,1b                    /* loop while ctr != 0 && !cr0.eq */
         beq+    3f
@@ -574,9 +628,9 @@ _GLOBAL(flush_hash_patch_A)
 _GLOBAL(flush_hash_patch_B)
         xoris   r12,r8,Hash_msk>>16     /* compute secondary hash */
         xori    r12,r12,(-PTEG_SIZE & 0xffff)
-        addi    r12,r12,-PTE_SIZE
+        addi    r12,r12,-HPTE_SIZE
         mtctr   r0
-2:      LDPTEu  r0,PTE_SIZE(r12)
+2:      LDPTEu  r0,HPTE_SIZE(r12)
         CMPPTE  0,r0,r11
         bdnzf   2,2b
         xori    r11,r11,PTE_H           /* clear H again */
@@ -590,7 +644,7 @@ _GLOBAL(flush_hash_patch_B)
 
 8:      ble     cr1,9f                  /* if all ptes checked */
 81:     addi    r6,r6,-1
-        addi    r5,r5,4                 /* advance to next pte */
+        addi    r5,r5,PTE_SIZE
         addi    r4,r4,0x1000
         lwz     r0,0(r5)                /* check next pte */
         cmpwi   cr1,r6,1
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 8920eea34528..5c64af174752 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -194,7 +194,7 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
                 unsigned long tprot = prot;
 
                 /* Make kernel text executable */
-                if (in_kernel_text(vaddr))
+                if (overlaps_kernel_text(vaddr, vaddr + step))
                         tprot &= ~HPTE_R_N;
 
                 hash = hpt_hash(va, shift, ssize);
@@ -348,6 +348,7 @@ static int __init htab_dt_scan_page_sizes(unsigned long node,
         return 0;
 }
 
+#ifdef CONFIG_HUGETLB_PAGE
 /* Scan for 16G memory blocks that have been set aside for huge pages
  * and reserve those blocks for 16G huge pages.
  */
@@ -385,6 +386,7 @@ static int __init htab_dt_scan_hugepage_blocks(unsigned long node,
         add_gpage(phys_addr, block_size, expected_pages);
         return 0;
 }
+#endif /* CONFIG_HUGETLB_PAGE */
 
 static void __init htab_init_page_sizes(void)
 {
@@ -539,7 +541,7 @@ static unsigned long __init htab_get_table_size(void)
 void create_section_mapping(unsigned long start, unsigned long end)
 {
         BUG_ON(htab_bolt_mapping(start, end, __pa(start),
-                                 PAGE_KERNEL, mmu_linear_psize,
+                                 pgprot_val(PAGE_KERNEL), mmu_linear_psize,
                                  mmu_kernel_ssize));
 }
 
@@ -647,7 +649,7 @@ void __init htab_initialize(void)
                 mtspr(SPRN_SDR1, _SDR1);
         }
 
-        prot = PAGE_KERNEL;
+        prot = pgprot_val(PAGE_KERNEL);
 
 #ifdef CONFIG_DEBUG_PAGEALLOC
         linear_map_hash_count = lmb_end_of_DRAM() >> PAGE_SHIFT;
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index f1c2d55b4377..a117024ab8cd 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -128,29 +128,37 @@ static int __hugepte_alloc(struct mm_struct *mm, hugepd_t *hpdp,
         return 0;
 }
 
-/* Base page size affects how we walk hugetlb page tables */
-#ifdef CONFIG_PPC_64K_PAGES
-#define hpmd_offset(pud, addr, h)       pmd_offset(pud, addr)
-#define hpmd_alloc(mm, pud, addr, h)    pmd_alloc(mm, pud, addr)
-#else
-static inline
-pmd_t *hpmd_offset(pud_t *pud, unsigned long addr, struct hstate *hstate)
+
+static pud_t *hpud_offset(pgd_t *pgd, unsigned long addr, struct hstate *hstate)
+{
+        if (huge_page_shift(hstate) < PUD_SHIFT)
+                return pud_offset(pgd, addr);
+        else
+                return (pud_t *) pgd;
+}
+static pud_t *hpud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long addr,
+                         struct hstate *hstate)
 {
-        if (huge_page_shift(hstate) == PAGE_SHIFT_64K)
+        if (huge_page_shift(hstate) < PUD_SHIFT)
+                return pud_alloc(mm, pgd, addr);
+        else
+                return (pud_t *) pgd;
+}
+static pmd_t *hpmd_offset(pud_t *pud, unsigned long addr, struct hstate *hstate)
+{
+        if (huge_page_shift(hstate) < PMD_SHIFT)
                 return pmd_offset(pud, addr);
         else
                 return (pmd_t *) pud;
 }
-static inline
-pmd_t *hpmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long addr,
-                  struct hstate *hstate)
+static pmd_t *hpmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long addr,
+                         struct hstate *hstate)
 {
-        if (huge_page_shift(hstate) == PAGE_SHIFT_64K)
+        if (huge_page_shift(hstate) < PMD_SHIFT)
                 return pmd_alloc(mm, pud, addr);
         else
                 return (pmd_t *) pud;
 }
-#endif
 
 /* Build list of addresses of gigantic pages.  This function is used in early
  * boot before the buddy or bootmem allocator is setup.
@@ -204,7 +212,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
 
         pg = pgd_offset(mm, addr);
         if (!pgd_none(*pg)) {
-                pu = pud_offset(pg, addr);
+                pu = hpud_offset(pg, addr, hstate);
                 if (!pud_none(*pu)) {
                         pm = hpmd_offset(pu, addr, hstate);
                         if (!pmd_none(*pm))
@@ -233,7 +241,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,
         addr &= hstate->mask;
 
         pg = pgd_offset(mm, addr);
-        pu = pud_alloc(mm, pg, addr);
+        pu = hpud_alloc(mm, pg, addr, hstate);
 
         if (pu) {
                 pm = hpmd_alloc(mm, pu, addr, hstate);
@@ -316,13 +324,7 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
         pud = pud_offset(pgd, addr);
         do {
                 next = pud_addr_end(addr, end);
-#ifdef CONFIG_PPC_64K_PAGES
-                if (pud_none_or_clear_bad(pud))
-                        continue;
-                hugetlb_free_pmd_range(tlb, pud, addr, next, floor, ceiling,
-                                       psize);
-#else
-                if (shift == PAGE_SHIFT_64K) {
+                if (shift < PMD_SHIFT) {
                         if (pud_none_or_clear_bad(pud))
                                 continue;
                         hugetlb_free_pmd_range(tlb, pud, addr, next, floor,
@@ -332,7 +334,6 @@ static void hugetlb_free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
                                 continue;
                         free_hugepte_range(tlb, (hugepd_t *)pud, psize);
                 }
-#endif
         } while (pud++, addr = next, addr != end);
 
         start &= PGDIR_MASK;
@@ -422,9 +423,15 @@ void hugetlb_free_pgd_range(struct mmu_gather *tlb,
                 psize = get_slice_psize(tlb->mm, addr);
                 BUG_ON(!mmu_huge_psizes[psize]);
                 next = pgd_addr_end(addr, end);
-                if (pgd_none_or_clear_bad(pgd))
-                        continue;
-                hugetlb_free_pud_range(tlb, pgd, addr, next, floor, ceiling);
+                if (mmu_psize_to_shift(psize) < PUD_SHIFT) {
+                        if (pgd_none_or_clear_bad(pgd))
+                                continue;
+                        hugetlb_free_pud_range(tlb, pgd, addr, next, floor, ceiling);
+                } else {
+                        if (pgd_none(*pgd))
+                                continue;
+                        free_hugepte_range(tlb, (hugepd_t *)pgd, psize);
+                }
         } while (pgd++, addr = next, addr != end);
 }
 
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index 036fe2f10c77..3e6a6543f53a 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -228,8 +228,8 @@ int __meminit vmemmap_populate(struct page *start_page,
                         start, p, __pa(p));
 
                 mapped = htab_bolt_mapping(start, start + page_size, __pa(p),
-                                           PAGE_KERNEL, mmu_vmemmap_psize,
-                                           mmu_kernel_ssize);
+                                           pgprot_val(PAGE_KERNEL),
+                                           mmu_vmemmap_psize, mmu_kernel_ssize);
                 BUG_ON(mapped < 0);
         }
 
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 1c93c255873b..98d7bf99533a 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -75,11 +75,10 @@ static inline pte_t *virt_to_kpte(unsigned long vaddr)
 
 int page_is_ram(unsigned long pfn)
 {
-        unsigned long paddr = (pfn << PAGE_SHIFT);
-
 #ifndef CONFIG_PPC64    /* XXX for now */
-        return paddr < __pa(high_memory);
+        return pfn < max_pfn;
 #else
+        unsigned long paddr = (pfn << PAGE_SHIFT);
         int i;
         for (i=0; i < lmb.memory.cnt; i++) {
                 unsigned long base;
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index d9a181351332..6cf5c71c431f 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -89,6 +89,46 @@ static int __cpuinit fake_numa_create_new_node(unsigned long end_pfn,
         return 0;
 }
 
+/*
+ * get_active_region_work_fn - A helper function for get_node_active_region
+ *      Returns datax set to the start_pfn and end_pfn if they contain
+ *      the initial value of datax->start_pfn between them
+ * @start_pfn: start page(inclusive) of region to check
+ * @end_pfn: end page(exclusive) of region to check
+ * @datax: comes in with ->start_pfn set to value to search for and
+ *      goes out with active range if it contains it
+ * Returns 1 if search value is in range else 0
+ */
+static int __init get_active_region_work_fn(unsigned long start_pfn,
+                                        unsigned long end_pfn, void *datax)
+{
+        struct node_active_region *data;
+        data = (struct node_active_region *)datax;
+
+        if (start_pfn <= data->start_pfn && end_pfn > data->start_pfn) {
+                data->start_pfn = start_pfn;
+                data->end_pfn = end_pfn;
+                return 1;
+        }
+        return 0;
+
+}
+
+/*
+ * get_node_active_region - Return active region containing start_pfn
+ * @start_pfn: The page to return the region for.
+ * @node_ar: Returned set to the active region containing start_pfn
+ */
+static void __init get_node_active_region(unsigned long start_pfn,
+                       struct node_active_region *node_ar)
+{
+        int nid = early_pfn_to_nid(start_pfn);
+
+        node_ar->nid = nid;
+        node_ar->start_pfn = start_pfn;
+        work_with_active_regions(nid, get_active_region_work_fn, node_ar);
+}
+
 static void __cpuinit map_cpu_to_node(int cpu, int node)
 {
         numa_cpu_lookup_table[cpu] = node;
@@ -150,6 +190,21 @@ static const int *of_get_associativity(struct device_node *dev)
         return of_get_property(dev, "ibm,associativity", NULL);
 }
 
+/*
+ * Returns the property linux,drconf-usable-memory if
+ * it exists (the property exists only in kexec/kdump kernels,
+ * added by kexec-tools)
+ */
+static const u32 *of_get_usable_memory(struct device_node *memory)
+{
+        const u32 *prop;
+        u32 len;
+        prop = of_get_property(memory, "linux,drconf-usable-memory", &len);
+        if (!prop || len < sizeof(unsigned int))
+                return 0;
+        return prop;
+}
+
 /* Returns nid in the range [0..MAX_NUMNODES-1], or -1 if no useful numa
  * info is found.
  */
@@ -487,14 +542,29 @@ static unsigned long __init numa_enforce_memory_limit(unsigned long start,
 }
 
 /*
+ * Reads the counter for a given entry in
+ * linux,drconf-usable-memory property
+ */
+static inline int __init read_usm_ranges(const u32 **usm)
+{
+        /*
+         * For each lmb in ibm,dynamic-memory a corresponding
+         * entry in linux,drconf-usable-memory property contains
+         * a counter followed by that many (base, size) duple.
+         * read the counter from linux,drconf-usable-memory
+         */
+        return read_n_cells(n_mem_size_cells, usm);
+}
+
+/*
  * Extract NUMA information from the ibm,dynamic-reconfiguration-memory
  * node.  This assumes n_mem_{addr,size}_cells have been set.
  */
 static void __init parse_drconf_memory(struct device_node *memory)
 {
-        const u32 *dm;
-        unsigned int n, rc;
-        unsigned long lmb_size, size;
+        const u32 *dm, *usm;
+        unsigned int n, rc, ranges, is_kexec_kdump = 0;
+        unsigned long lmb_size, base, size, sz;
         int nid;
         struct assoc_arrays aa;
 
@@ -510,6 +580,11 @@ static void __init parse_drconf_memory(struct device_node *memory)
         if (rc)
                 return;
 
+        /* check if this is a kexec/kdump kernel */
+        usm = of_get_usable_memory(memory);
+        if (usm != NULL)
+                is_kexec_kdump = 1;
+
         for (; n != 0; --n) {
                 struct of_drconf_cell drmem;
 
@@ -521,21 +596,31 @@ static void __init parse_drconf_memory(struct device_node *memory)
                     || !(drmem.flags & DRCONF_MEM_ASSIGNED))
                         continue;
 
-                nid = of_drconf_to_nid_single(&drmem, &aa);
+                base = drmem.base_addr;
+                size = lmb_size;
+                ranges = 1;
 
-                fake_numa_create_new_node(
-                                ((drmem.base_addr + lmb_size) >> PAGE_SHIFT),
+                if (is_kexec_kdump) {
+                        ranges = read_usm_ranges(&usm);
+                        if (!ranges) /* there are no (base, size) duple */
+                                continue;
+                }
+                do {
+                        if (is_kexec_kdump) {
+                                base = read_n_cells(n_mem_addr_cells, &usm);
+                                size = read_n_cells(n_mem_size_cells, &usm);
+                        }
+                        nid = of_drconf_to_nid_single(&drmem, &aa);
+                        fake_numa_create_new_node(
+                                ((base + size) >> PAGE_SHIFT),
                                            &nid);
-
-                node_set_online(nid);
-
-                size = numa_enforce_memory_limit(drmem.base_addr, lmb_size);
-                if (!size)
-                        continue;
-
-                add_active_range(nid, drmem.base_addr >> PAGE_SHIFT,
-                                 (drmem.base_addr >> PAGE_SHIFT)
-                                 + (size >> PAGE_SHIFT));
+                        node_set_online(nid);
+                        sz = numa_enforce_memory_limit(base, size);
+                        if (sz)
+                                add_active_range(nid, base >> PAGE_SHIFT,
+                                                 (base >> PAGE_SHIFT)
+                                                 + (sz >> PAGE_SHIFT));
+                } while (--ranges);
         }
 }
 
@@ -837,38 +922,50 @@ void __init do_init_bootmem(void)
                                   start_pfn, end_pfn);
 
                 free_bootmem_with_active_regions(nid, end_pfn);
+        }
 
-                /* Mark reserved regions on this node */
-                for (i = 0; i < lmb.reserved.cnt; i++) {
-                        unsigned long physbase = lmb.reserved.region[i].base;
-                        unsigned long size = lmb.reserved.region[i].size;
-                        unsigned long start_paddr = start_pfn << PAGE_SHIFT;
-                        unsigned long end_paddr = end_pfn << PAGE_SHIFT;
-
-                        if (early_pfn_to_nid(physbase >> PAGE_SHIFT) != nid &&
-                            early_pfn_to_nid((physbase+size-1) >> PAGE_SHIFT) != nid)
-                                continue;
-
-                        if (physbase < end_paddr &&
-                            (physbase+size) > start_paddr) {
-                                /* overlaps */
-                                if (physbase < start_paddr) {
-                                        size -= start_paddr - physbase;
-                                        physbase = start_paddr;
-                                }
-
-                                if (size > end_paddr - physbase)
-                                        size = end_paddr - physbase;
-
-                                dbg("reserve_bootmem %lx %lx\n", physbase,
-                                    size);
-                                reserve_bootmem_node(NODE_DATA(nid), physbase,
-                                                     size, BOOTMEM_DEFAULT);
-                        }
+        /* Mark reserved regions */
+        for (i = 0; i < lmb.reserved.cnt; i++) {
+                unsigned long physbase = lmb.reserved.region[i].base;
+                unsigned long size = lmb.reserved.region[i].size;
+                unsigned long start_pfn = physbase >> PAGE_SHIFT;
+                unsigned long end_pfn = ((physbase + size) >> PAGE_SHIFT);
+                struct node_active_region node_ar;
+
+                get_node_active_region(start_pfn, &node_ar);
+                while (start_pfn < end_pfn) {
+                        /*
+                         * if reserved region extends past active region
+                         * then trim size to active region
+                         */
+                        if (end_pfn > node_ar.end_pfn)
+                                size = (node_ar.end_pfn << PAGE_SHIFT)
+                                        - (start_pfn << PAGE_SHIFT);
+                        dbg("reserve_bootmem %lx %lx nid=%d\n", physbase, size,
+                                node_ar.nid);
+                        reserve_bootmem_node(NODE_DATA(node_ar.nid), physbase,
+                                                size, BOOTMEM_DEFAULT);
+                        /*
+                         * if reserved region is contained in the active region
+                         * then done.
+                         */
+                        if (end_pfn <= node_ar.end_pfn)
+                                break;
+
+                        /*
+                         * reserved region extends past the active region
+                         *   get next active region that contains this
+                         *   reserved region
+                         */
+                        start_pfn = node_ar.end_pfn;
+                        physbase = start_pfn << PAGE_SHIFT;
+                        get_node_active_region(start_pfn, &node_ar);
                 }
 
-                sparse_memory_present_with_active_regions(nid);
         }
+
+        for_each_online_node(nid)
+                sparse_memory_present_with_active_regions(nid);
 }
 
 void __init paging_init(void)
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c
index 2001abdb1912..c31d6d26f0b5 100644
--- a/arch/powerpc/mm/pgtable_32.c
+++ b/arch/powerpc/mm/pgtable_32.c
@@ -73,7 +73,7 @@ extern unsigned long p_mapped_by_tlbcam(unsigned long pa);
 #endif /* HAVE_TLBCAM */
 
 #ifdef CONFIG_PTE_64BIT
-/* 44x uses an 8kB pgdir because it has 8-byte Linux PTEs. */
+/* Some processors use an 8kB pgdir because they have 8-byte Linux PTEs. */
 #define PGDIR_ORDER     1
 #else
 #define PGDIR_ORDER     0
@@ -288,7 +288,7 @@ int map_page(unsigned long va, phys_addr_t pa, int flags)
 }
 
 /*
- * Map in all of physical memory starting at KERNELBASE.
+ * Map in a big chunk of physical memory starting at KERNELBASE.
  */
 void __init mapin_ram(void)
 {
diff --git a/arch/powerpc/mm/tlb_32.c b/arch/powerpc/mm/tlb_32.c
index eb4b512d65fa..f9a47fee3927 100644
--- a/arch/powerpc/mm/tlb_32.c
+++ b/arch/powerpc/mm/tlb_32.c
@@ -45,6 +45,7 @@ void flush_hash_entry(struct mm_struct *mm, pte_t *ptep, unsigned long addr)
                 flush_hash_pages(mm->context.id, addr, ptephys, 1);
         }
 }
+EXPORT_SYMBOL(flush_hash_entry);
 
 /*
  * Called by ptep_set_access_flags, must flush on CPUs for which the
diff --git a/arch/powerpc/oprofile/cell/vma_map.c b/arch/powerpc/oprofile/cell/vma_map.c
index fff66662d021..258fa4411e9e 100644
--- a/arch/powerpc/oprofile/cell/vma_map.c
+++ b/arch/powerpc/oprofile/cell/vma_map.c
@@ -229,7 +229,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu,
          */
         overlay_tbl_offset = vma_map_lookup(map, ovly_table_sym,
                                             aSpu, &grd_val);
-        if (overlay_tbl_offset < 0) {
+        if (overlay_tbl_offset > 0x10000000) {
                 printk(KERN_ERR "SPU_PROF: "
                        "%s, line %d: Error finding SPU overlay table\n",
                        __func__, __LINE__);
diff --git a/arch/powerpc/oprofile/op_model_power4.c b/arch/powerpc/oprofile/op_model_power4.c
index 446a8bbb847b..3e3d91f536e0 100644
--- a/arch/powerpc/oprofile/op_model_power4.c
+++ b/arch/powerpc/oprofile/op_model_power4.c
@@ -64,7 +64,7 @@ static int power4_reg_setup(struct op_counter_config *ctr,
         return 0;
 }
 
-extern void ppc64_enable_pmcs(void);
+extern void ppc_enable_pmcs(void);
 
 /*
  * Older CPUs require the MMCRA sample bit to be always set, but newer 
@@ -91,7 +91,7 @@ static int power4_cpu_setup(struct op_counter_config *ctr)
         unsigned int mmcr0 = mmcr0_val;
         unsigned long mmcra = mmcra_val;
 
-        ppc64_enable_pmcs();
+        ppc_enable_pmcs();
 
         /* set the freeze bit */
         mmcr0 |= MMCR0_FC;
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 249ba01c6674..79c1154f88d4 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -2,6 +2,7 @@ config BAMBOO
         bool "Bamboo"
         depends on 44x
         default n
+        select PPC44x_SIMPLE
         select 440EP
         select PCI
         help
@@ -30,6 +31,7 @@ config SEQUOIA
         bool "Sequoia"
         depends on 44x
         default n
+        select PPC44x_SIMPLE
         select 440EPX
         help
           This option enables support for the AMCC PPC440EPX evaluation board.
@@ -38,6 +40,7 @@ config TAISHAN
         bool "Taishan"
         depends on 44x
         default n
+        select PPC44x_SIMPLE
         select 440GX
         select PCI
         help
@@ -48,6 +51,7 @@ config KATMAI
         bool "Katmai"
         depends on 44x
         default n
+        select PPC44x_SIMPLE
         select 440SPe
         select PCI
         select PPC4xx_PCI_EXPRESS
@@ -58,6 +62,7 @@ config RAINIER
         bool "Rainier"
         depends on 44x
         default n
+        select PPC44x_SIMPLE
         select 440GRX
         select PCI
         help
@@ -76,20 +81,48 @@ config WARP
           See http://www.pikatechnologies.com/ and follow the "PIKA for Computer
           Telephony Developers" link for more information.
 
+config ARCHES
+        bool "Arches"
+        depends on 44x
+        default n
+        select PPC44x_SIMPLE
+        select 460EX # Odd since it uses 460GT but the effects are the same
+        select PCI
+        select PPC4xx_PCI_EXPRESS
+        help
+          This option enables support for the AMCC Dual PPC460GT evaluation board.
+
 config CANYONLANDS
         bool "Canyonlands"
         depends on 44x
         default n
+        select PPC44x_SIMPLE
         select 460EX
         select PCI
         select PPC4xx_PCI_EXPRESS
+        select IBM_NEW_EMAC_RGMII
+        select IBM_NEW_EMAC_ZMII
         help
           This option enables support for the AMCC PPC460EX evaluation board.
 
+config GLACIER
+        bool "Glacier"
+        depends on 44x
+        default n
+        select PPC44x_SIMPLE
+        select 460EX # Odd since it uses 460GT but the effects are the same
+        select PCI
+        select PPC4xx_PCI_EXPRESS
+        select IBM_NEW_EMAC_RGMII
+        select IBM_NEW_EMAC_ZMII
+        help
+          This option enables support for the AMCC PPC460GT evaluation board.
+
 config YOSEMITE
         bool "Yosemite"
         depends on 44x
         default n
+        select PPC44x_SIMPLE
         select 440EP
         select PCI
         help
@@ -127,6 +160,13 @@ config XILINX_VIRTEX440_GENERIC_BOARD
           Most Virtex 5 designs should use this unless it needs to do some
           special configuration at board probe time.
 
+config PPC44x_SIMPLE
+        bool "Simple PowerPC 44x board support"
+        depends on 44x
+        default n
+        help
+          This option enables the simple PowerPC 44x platform support.
+
 # 44x specific CPU modules, selected based on the board above.
 config 440EP
         bool
@@ -170,8 +210,6 @@ config 460EX
         bool
         select PPC_FPU
         select IBM_NEW_EMAC_EMAC4
-        select IBM_NEW_EMAC_RGMII
-        select IBM_NEW_EMAC_ZMII
         select IBM_NEW_EMAC_TAH
 
 # 44x errata/workaround config symbols, selected by the CPU models above
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index 8d0b1a192d62..698133180aee 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -1,13 +1,7 @@
 obj-$(CONFIG_44x)       := misc_44x.o idle.o
+obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o
 obj-$(CONFIG_EBONY)     += ebony.o
-obj-$(CONFIG_TAISHAN)   += taishan.o
-obj-$(CONFIG_BAMBOO)    += bamboo.o
-obj-$(CONFIG_YOSEMITE)  += bamboo.o
 obj-$(CONFIG_SAM440EP)  += sam440ep.o
-obj-$(CONFIG_SEQUOIA)   += sequoia.o
-obj-$(CONFIG_KATMAI)    += katmai.o
-obj-$(CONFIG_RAINIER)   += rainier.o
 obj-$(CONFIG_WARP)      += warp.o
 obj-$(CONFIG_WARP)      += warp-nand.o
-obj-$(CONFIG_CANYONLANDS) += canyonlands.o
 obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o
diff --git a/arch/powerpc/platforms/44x/bamboo.c b/arch/powerpc/platforms/44x/bamboo.c
deleted file mode 100644
index cef169e95156..000000000000
--- a/arch/powerpc/platforms/44x/bamboo.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Bamboo board specific routines
- *
- * Wade Farnsworth <wfarnsworth@mvista.com>
- * Copyright 2004 MontaVista Software Inc.
- *
- * Rewritten and ported to the merged powerpc tree:
- * Josh Boyer <jwboyer@linux.vnet.ibm.com>
- * Copyright 2007 IBM Corporation
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-#include <linux/init.h>
-#include <linux/of_platform.h>
-
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/udbg.h>
-#include <asm/time.h>
-#include <asm/uic.h>
-#include <asm/pci-bridge.h>
-#include <asm/ppc4xx.h>
-
-static __initdata struct of_device_id bamboo_of_bus[] = {
-        { .compatible = "ibm,plb4", },
-        { .compatible = "ibm,opb", },
-        { .compatible = "ibm,ebc", },
-        {},
-};
-
-static int __init bamboo_device_probe(void)
-{
-        of_platform_bus_probe(NULL, bamboo_of_bus, NULL);
-
-        return 0;
-}
-machine_device_initcall(bamboo, bamboo_device_probe);
-
-static int __init bamboo_probe(void)
-{
-        unsigned long root = of_get_flat_dt_root();
-
-        if (!of_flat_dt_is_compatible(root, "amcc,bamboo"))
-                return 0;
-
-        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
-
-        return 1;
-}
-
-define_machine(bamboo) {
-        .name                   = "Bamboo",
-        .probe                  = bamboo_probe,
-        .progress               = udbg_progress,
-        .init_IRQ               = uic_init_tree,
-        .get_irq                = uic_get_irq,
-        .restart                = ppc4xx_reset_system,
-        .calibrate_decr         = generic_calibrate_decr,
-};
diff --git a/arch/powerpc/platforms/44x/canyonlands.c b/arch/powerpc/platforms/44x/canyonlands.c
deleted file mode 100644
index 3949289f51df..000000000000
--- a/arch/powerpc/platforms/44x/canyonlands.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Canyonlands board specific routines
- *
- * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
- *
- * Based on the Katmai code by
- * Benjamin Herrenschmidt <benh@kernel.crashing.org>
- * Copyright 2007 IBM Corp.
- * Josh Boyer <jwboyer@linux.vnet.ibm.com>
- * Copyright 2007 IBM Corporation
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-#include <linux/init.h>
-#include <linux/of_platform.h>
-
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/udbg.h>
-#include <asm/time.h>
-#include <asm/uic.h>
-#include <asm/pci-bridge.h>
-#include <asm/ppc4xx.h>
-
-static __initdata struct of_device_id canyonlands_of_bus[] = {
-        { .compatible = "ibm,plb4", },
-        { .compatible = "ibm,opb", },
-        { .compatible = "ibm,ebc", },
-        {},
-};
-
-static int __init canyonlands_device_probe(void)
-{
-        of_platform_bus_probe(NULL, canyonlands_of_bus, NULL);
-
-        return 0;
-}
-machine_device_initcall(canyonlands, canyonlands_device_probe);
-
-static int __init canyonlands_probe(void)
-{
-        unsigned long root = of_get_flat_dt_root();
-
-        if (!of_flat_dt_is_compatible(root, "amcc,canyonlands"))
-                return 0;
-
-        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
-
-        return 1;
-}
-
-define_machine(canyonlands) {
-        .name                           = "Canyonlands",
-        .probe                          = canyonlands_probe,
-        .progress                       = udbg_progress,
-        .init_IRQ                       = uic_init_tree,
-        .get_irq                        = uic_get_irq,
-        .restart                        = ppc4xx_reset_system,
-        .calibrate_decr                 = generic_calibrate_decr,
-};
diff --git a/arch/powerpc/platforms/44x/katmai.c b/arch/powerpc/platforms/44x/katmai.c
deleted file mode 100644
index 44f4b3a00ced..000000000000
--- a/arch/powerpc/platforms/44x/katmai.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Katmai board specific routines
- *
- * Benjamin Herrenschmidt <benh@kernel.crashing.org>
- * Copyright 2007 IBM Corp.
- *
- * Based on the Bamboo code by
- * Josh Boyer <jwboyer@linux.vnet.ibm.com>
- * Copyright 2007 IBM Corporation
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-#include <linux/init.h>
-#include <linux/of_platform.h>
-
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/udbg.h>
-#include <asm/time.h>
-#include <asm/uic.h>
-#include <asm/pci-bridge.h>
-#include <asm/ppc4xx.h>
-
-static __initdata struct of_device_id katmai_of_bus[] = {
-        { .compatible = "ibm,plb4", },
-        { .compatible = "ibm,opb", },
-        { .compatible = "ibm,ebc", },
-        {},
-};
-
-static int __init katmai_device_probe(void)
-{
-        of_platform_bus_probe(NULL, katmai_of_bus, NULL);
-
-        return 0;
-}
-machine_device_initcall(katmai, katmai_device_probe);
-
-static int __init katmai_probe(void)
-{
-        unsigned long root = of_get_flat_dt_root();
-
-        if (!of_flat_dt_is_compatible(root, "amcc,katmai"))
-                return 0;
-
-        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
-
-        return 1;
-}
-
-define_machine(katmai) {
-        .name                           = "Katmai",
-        .probe                          = katmai_probe,
-        .progress                       = udbg_progress,
-        .init_IRQ                       = uic_init_tree,
-        .get_irq                        = uic_get_irq,
-        .restart                        = ppc4xx_reset_system,
-        .calibrate_decr                 = generic_calibrate_decr,
-};
diff --git a/arch/powerpc/platforms/44x/ppc44x_simple.c b/arch/powerpc/platforms/44x/ppc44x_simple.c
new file mode 100644
index 000000000000..29671262801f
--- /dev/null
+++ b/arch/powerpc/platforms/44x/ppc44x_simple.c
@@ -0,0 +1,88 @@
+/*
+ * Generic PowerPC 44x platform support
+ *
+ * Copyright 2008 IBM Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; version 2 of the License.
+ *
+ * This implements simple platform support for PowerPC 44x chips.  This is
+ * mostly used for eval boards or other simple and "generic" 44x boards.  If
+ * your board has custom functions or hardware, then you will likely want to
+ * implement your own board.c file to accommodate it.
+ */
+
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
+#include <asm/prom.h>
+#include <asm/time.h>
+#include <asm/udbg.h>
+#include <asm/uic.h>
+
+#include <linux/init.h>
+#include <linux/of_platform.h>
+
+static __initdata struct of_device_id ppc44x_of_bus[] = {
+        { .compatible = "ibm,plb4", },
+        { .compatible = "ibm,opb", },
+        { .compatible = "ibm,ebc", },
+        { .compatible = "simple-bus", },
+        {},
+};
+
+static int __init ppc44x_device_probe(void)
+{
+        of_platform_bus_probe(NULL, ppc44x_of_bus, NULL);
+
+        return 0;
+}
+machine_device_initcall(ppc44x_simple, ppc44x_device_probe);
+
+/* This is the list of boards that can be supported by this simple
+ * platform code.  This does _not_ mean the boards are compatible,
+ * as they most certainly are not from a device tree perspective.
+ * However, their differences are handled by the device tree and the
+ * drivers and therefore they don't need custom board support files.
+ *
+ * Again, if your board needs to do things differently then create a
+ * board.c file for it rather than adding it to this list.
+ */
+static char *board[] __initdata = {
+        "amcc,arches",
+        "amcc,bamboo",
+        "amcc,canyonlands",
+        "amcc,glacier",
+        "ibm,ebony",
+        "amcc,katmai",
+        "amcc,rainier",
+        "amcc,sequoia",
+        "amcc,taishan",
+        "amcc,yosemite"
+};
+
+static int __init ppc44x_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        int i = 0;
+
+        for (i = 0; i < ARRAY_SIZE(board); i++) {
+                if (of_flat_dt_is_compatible(root, board[i])) {
+                        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
+                        return 1;
+                }
+        }
+
+        return 0;
+}
+
+define_machine(ppc44x_simple) {
+        .name = "PowerPC 44x Platform",
+        .probe = ppc44x_probe,
+        .progress = udbg_progress,
+        .init_IRQ = uic_init_tree,
+        .get_irq = uic_get_irq,
+        .restart = ppc4xx_reset_system,
+        .calibrate_decr = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/44x/rainier.c b/arch/powerpc/platforms/44x/rainier.c
deleted file mode 100644
index 4f1ff84c4b63..000000000000
--- a/arch/powerpc/platforms/44x/rainier.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Rainier board specific routines
- *
- * Valentine Barshak <vbarshak@ru.mvista.com>
- * Copyright 2007 MontaVista Software Inc.
- *
- * Based on the Bamboo code by
- * Josh Boyer <jwboyer@linux.vnet.ibm.com>
- * Copyright 2007 IBM Corporation
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-#include <linux/init.h>
-#include <linux/of_platform.h>
-
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/udbg.h>
-#include <asm/time.h>
-#include <asm/uic.h>
-#include <asm/pci-bridge.h>
-#include <asm/ppc4xx.h>
-
-static __initdata struct of_device_id rainier_of_bus[] = {
-        { .compatible = "ibm,plb4", },
-        { .compatible = "ibm,opb", },
-        { .compatible = "ibm,ebc", },
-        {},
-};
-
-static int __init rainier_device_probe(void)
-{
-        of_platform_bus_probe(NULL, rainier_of_bus, NULL);
-
-        return 0;
-}
-machine_device_initcall(rainier, rainier_device_probe);
-
-static int __init rainier_probe(void)
-{
-        unsigned long root = of_get_flat_dt_root();
-
-        if (!of_flat_dt_is_compatible(root, "amcc,rainier"))
-                return 0;
-
-        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
-
-        return 1;
-}
-
-define_machine(rainier) {
-        .name                           = "Rainier",
-        .probe                          = rainier_probe,
-        .progress                       = udbg_progress,
-        .init_IRQ                       = uic_init_tree,
-        .get_irq                        = uic_get_irq,
-        .restart                        = ppc4xx_reset_system,
-        .calibrate_decr                 = generic_calibrate_decr,
-};
diff --git a/arch/powerpc/platforms/44x/sequoia.c b/arch/powerpc/platforms/44x/sequoia.c
deleted file mode 100644
index 49eb73daacdf..000000000000
--- a/arch/powerpc/platforms/44x/sequoia.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Sequoia board specific routines
- *
- * Valentine Barshak <vbarshak@ru.mvista.com>
- * Copyright 2007 MontaVista Software Inc.
- *
- * Based on the Bamboo code by
- * Josh Boyer <jwboyer@linux.vnet.ibm.com>
- * Copyright 2007 IBM Corporation
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-#include <linux/init.h>
-#include <linux/of_platform.h>
-
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/udbg.h>
-#include <asm/time.h>
-#include <asm/uic.h>
-#include <asm/pci-bridge.h>
-
-#include <asm/ppc4xx.h>
-
-static __initdata struct of_device_id sequoia_of_bus[] = {
-        { .compatible = "ibm,plb4", },
-        { .compatible = "ibm,opb", },
-        { .compatible = "ibm,ebc", },
-        {},
-};
-
-static int __init sequoia_device_probe(void)
-{
-        of_platform_bus_probe(NULL, sequoia_of_bus, NULL);
-
-        return 0;
-}
-machine_device_initcall(sequoia, sequoia_device_probe);
-
-static int __init sequoia_probe(void)
-{
-        unsigned long root = of_get_flat_dt_root();
-
-        if (!of_flat_dt_is_compatible(root, "amcc,sequoia"))
-                return 0;
-
-        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
-
-        return 1;
-}
-
-define_machine(sequoia) {
-        .name                           = "Sequoia",
-        .probe                          = sequoia_probe,
-        .progress                       = udbg_progress,
-        .init_IRQ                       = uic_init_tree,
-        .get_irq                        = uic_get_irq,
-        .restart                        = ppc4xx_reset_system,
-        .calibrate_decr                 = generic_calibrate_decr,
-};
diff --git a/arch/powerpc/platforms/44x/taishan.c b/arch/powerpc/platforms/44x/taishan.c
deleted file mode 100644
index 49c78b2098b4..000000000000
--- a/arch/powerpc/platforms/44x/taishan.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Taishan board specific routines based off ebony.c code
- * original copyrights below
- *
- * Matt Porter <mporter@kernel.crashing.org>
- * Copyright 2002-2005 MontaVista Software Inc.
- *
- * Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
- * Copyright (c) 2003-2005 Zultys Technologies
- *
- * Rewritten and ported to the merged powerpc tree:
- * Copyright 2007 David Gibson <dwg@au1.ibm.com>, IBM Corporation.
- *
- * Modified from ebony.c for taishan:
- * Copyright 2007 Hugh Blemings <hugh@au.ibm.com>, IBM Corporation.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-
-#include <linux/init.h>
-#include <linux/of_platform.h>
-
-#include <asm/machdep.h>
-#include <asm/prom.h>
-#include <asm/udbg.h>
-#include <asm/time.h>
-#include <asm/uic.h>
-#include <asm/pci-bridge.h>
-#include <asm/ppc4xx.h>
-
-static __initdata struct of_device_id taishan_of_bus[] = {
-        { .compatible = "ibm,plb4", },
-        { .compatible = "ibm,opb", },
-        { .compatible = "ibm,ebc", },
-        {},
-};
-
-static int __init taishan_device_probe(void)
-{
-        of_platform_bus_probe(NULL, taishan_of_bus, NULL);
-
-        return 0;
-}
-machine_device_initcall(taishan, taishan_device_probe);
-
-/*
- * Called very early, MMU is off, device-tree isn't unflattened
- */
-static int __init taishan_probe(void)
-{
-        unsigned long root = of_get_flat_dt_root();
-
-        if (!of_flat_dt_is_compatible(root, "amcc,taishan"))
-                return 0;
-
-        ppc_pci_flags = PPC_PCI_REASSIGN_ALL_RSRC;
-
-        return 1;
-}
-
-define_machine(taishan) {
-        .name                   = "Taishan",
-        .probe                  = taishan_probe,
-        .progress               = udbg_progress,
-        .init_IRQ               = uic_init_tree,
-        .get_irq                = uic_get_irq,
-        .restart                = ppc4xx_reset_system,
-        .calibrate_decr         = generic_calibrate_decr,
-};
diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig
index c62f893ede19..326852c78b8f 100644
--- a/arch/powerpc/platforms/512x/Kconfig
+++ b/arch/powerpc/platforms/512x/Kconfig
@@ -3,6 +3,8 @@ config PPC_MPC512x
         select FSL_SOC
         select IPIC
         select PPC_CLOCK
+        select PPC_PCI_CHOICE
+        select FSL_PCI if PCI
 
 config PPC_MPC5121
         bool
diff --git a/arch/powerpc/platforms/512x/mpc5121_ads.c b/arch/powerpc/platforms/512x/mpc5121_ads.c
index 5ebf6939a697..441abc488851 100644
--- a/arch/powerpc/platforms/512x/mpc5121_ads.c
+++ b/arch/powerpc/platforms/512x/mpc5121_ads.c
@@ -22,16 +22,26 @@
 #include <asm/prom.h>
 #include <asm/time.h>
 
+#include <sysdev/fsl_pci.h>
+
 #include "mpc512x.h"
 #include "mpc5121_ads.h"
 
 static void __init mpc5121_ads_setup_arch(void)
 {
+#ifdef CONFIG_PCI
+        struct device_node *np;
+#endif
         printk(KERN_INFO "MPC5121 ADS board from Freescale Semiconductor\n");
         /*
          * cpld regs are needed early
          */
         mpc5121_ads_cpld_map();
+
+#ifdef CONFIG_PCI
+        for_each_compatible_node(np, "pci", "fsl,mpc5121-pci")
+                mpc83xx_add_bridge(np);
+#endif
 }
 
 static void __init mpc5121_ads_init_IRQ(void)
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_common.c b/arch/powerpc/platforms/52xx/mpc52xx_common.c
index 4d5fd1dbd400..044b4e6e8743 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_common.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_common.c
@@ -90,7 +90,7 @@ mpc5200_setup_xlb_arbiter(void)
         of_node_put(np);
         if (!xlb) {
                 printk(KERN_ERR __FILE__ ": "
-                        "Error mapping XLB in mpc52xx_setup_cpu().  "
+                        "Error mapping XLB in mpc52xx_setup_cpu(). "
                         "Expect some abnormal behavior\n");
                 return;
         }
@@ -216,7 +216,8 @@ mpc52xx_restart(char *cmd)
                 out_be32(&mpc52xx_wdt->count, 0x000000ff);
                 out_be32(&mpc52xx_wdt->mode, 0x00009004);
         } else
-                printk("mpc52xx_restart: Can't access wdt. "
+                printk(KERN_ERR __FILE__ ": "
+                        "mpc52xx_restart: Can't access wdt. "
                         "Restart impossible, system halted.\n");
 
         while (1);
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index 5a382bb15f62..b49a18527661 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -265,8 +265,11 @@ mpc52xx_pci_setup(struct pci_controller *hose,
         /* Memory windows */
         res = &hose->mem_resources[0];
         if (res->flags) {
-                pr_debug("mem_resource[0] = {.start=%x, .end=%x, .flags=%lx}\n",
-                         res->start, res->end, res->flags);
+                pr_debug("mem_resource[0] = "
+                         "{.start=%llx, .end=%llx, .flags=%llx}\n",
+                         (unsigned long long)res->start,
+                         (unsigned long long)res->end,
+                         (unsigned long long)res->flags);
                 out_be32(&pci_regs->iw0btar,
                          MPC52xx_PCI_IWBTAR_TRANSLATION(res->start, res->start,
                                   res->end - res->start + 1));
@@ -297,9 +300,11 @@ mpc52xx_pci_setup(struct pci_controller *hose,
                 printk(KERN_ERR "%s: Didn't find IO resources\n", __FILE__);
                 return;
         }
-        pr_debug(".io_resource={.start=%x,.end=%x,.flags=%lx} "
+        pr_debug(".io_resource={.start=%llx,.end=%llx,.flags=%llx} "
                  ".io_base_phys=0x%p\n",
-                 res->start, res->end, res->flags, (void*)hose->io_base_phys);
+                 (unsigned long long)res->start,
+                 (unsigned long long)res->end,
+                 (unsigned long long)res->flags, (void*)hose->io_base_phys);
         out_be32(&pci_regs->iw2btar,
                  MPC52xx_PCI_IWBTAR_TRANSLATION(hose->io_base_phys,
                                                 res->start,
diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 75eb1ede5497..30f008b2f92e 100644
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -38,6 +38,14 @@ config EP8248E
           This board is also resold by Freescale as the QUICCStart
           MPC8248 Evaluation System and/or the CWH-PPC-8248N-VE.
 
+config MGCOGE
+        bool "Keymile MGCOGE"
+        select 8272
+        select 8260
+        select FSL_SOC
+        help
+          This enables support for the Keymile MGCOGE board.
+
 endif
 
 config PQ2ADS
diff --git a/arch/powerpc/platforms/82xx/Makefile b/arch/powerpc/platforms/82xx/Makefile
index 6cd5cd59bf2a..d982793f4dbd 100644
--- a/arch/powerpc/platforms/82xx/Makefile
+++ b/arch/powerpc/platforms/82xx/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_CPM2) += pq2.o
 obj-$(CONFIG_PQ2_ADS_PCI_PIC) += pq2ads-pci-pic.o
 obj-$(CONFIG_PQ2FADS) += pq2fads.o
 obj-$(CONFIG_EP8248E) += ep8248e.o
+obj-$(CONFIG_MGCOGE) += mgcoge.o
diff --git a/arch/powerpc/platforms/82xx/mgcoge.c b/arch/powerpc/platforms/82xx/mgcoge.c
new file mode 100644
index 000000000000..c2af169c1d1d
--- /dev/null
+++ b/arch/powerpc/platforms/82xx/mgcoge.c
@@ -0,0 +1,129 @@
+/*
+ * Keymile mgcoge support
+ * Copyright 2008 DENX Software Engineering GmbH
+ * Author: Heiko Schocher <hs@denx.de>
+ *
+ * based on code from:
+ * Copyright 2007 Freescale Semiconductor, Inc.
+ * Author: Scott Wood <scottwood@freescale.com>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/fsl_devices.h>
+#include <linux/of_platform.h>
+
+#include <asm/io.h>
+#include <asm/cpm2.h>
+#include <asm/udbg.h>
+#include <asm/machdep.h>
+#include <asm/time.h>
+#include <asm/mpc8260.h>
+#include <asm/prom.h>
+
+#include <sysdev/fsl_soc.h>
+#include <sysdev/cpm2_pic.h>
+
+#include "pq2.h"
+
+static void __init mgcoge_pic_init(void)
+{
+        struct device_node *np = of_find_compatible_node(NULL, NULL, "fsl,pq2-pic");
+        if (!np) {
+                printk(KERN_ERR "PIC init: can not find cpm-pic node\n");
+                return;
+        }
+
+        cpm2_pic_init(np);
+        of_node_put(np);
+}
+
+struct cpm_pin {
+        int port, pin, flags;
+};
+
+static __initdata struct cpm_pin mgcoge_pins[] = {
+
+        /* SMC2 */
+        {1, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {1, 9, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+
+        /* SCC4 */
+        {3, 25, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {3, 24, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {3,  9, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {3,  8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {4, 22, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {4, 21, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+};
+
+static void __init init_ioports(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(mgcoge_pins); i++) {
+                const struct cpm_pin *pin = &mgcoge_pins[i];
+                cpm2_set_pin(pin->port - 1, pin->pin, pin->flags);
+        }
+
+        cpm2_smc_clk_setup(CPM_CLK_SMC2, CPM_BRG8);
+        cpm2_clk_setup(CPM_CLK_SCC4, CPM_CLK7, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_SCC4, CPM_CLK8, CPM_CLK_TX);
+}
+
+static void __init mgcoge_setup_arch(void)
+{
+        if (ppc_md.progress)
+                ppc_md.progress("mgcoge_setup_arch()", 0);
+
+        cpm2_reset();
+
+        /* When this is set, snooping CPM DMA from RAM causes
+         * machine checks.  See erratum SIU18.
+         */
+        clrbits32(&cpm2_immr->im_siu_conf.siu_82xx.sc_bcr, MPC82XX_BCR_PLDP);
+
+        init_ioports();
+
+        if (ppc_md.progress)
+                ppc_md.progress("mgcoge_setup_arch(), finish", 0);
+}
+
+static  __initdata struct of_device_id of_bus_ids[] = {
+        { .compatible = "simple-bus", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+
+        return 0;
+}
+machine_device_initcall(mgcoge, declare_of_platform_devices);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init mgcoge_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        return of_flat_dt_is_compatible(root, "keymile,mgcoge");
+}
+
+define_machine(mgcoge)
+{
+        .name = "Keymile MGCOGE",
+        .probe = mgcoge_probe,
+        .setup_arch = mgcoge_setup_arch,
+        .init_IRQ = mgcoge_pic_init,
+        .get_irq = cpm2_get_irq,
+        .calibrate_decr = generic_calibrate_decr,
+        .restart = pq2_restart,
+        .progress = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index 6159c5d4e5f1..83c664afc897 100644
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -19,7 +19,6 @@ config MPC831x_RDB
 config MPC832x_MDS
         bool "Freescale MPC832x MDS"
         select DEFAULT_UIMAGE
-        select QUICC_ENGINE
         select PPC_MPC832x
         help
           This option enables support for the MPC832x MDS evaluation board.
@@ -27,7 +26,6 @@ config MPC832x_MDS
 config MPC832x_RDB
         bool "Freescale MPC832x RDB"
         select DEFAULT_UIMAGE
-        select QUICC_ENGINE
         select PPC_MPC832x
         help
           This option enables support for the MPC8323 RDB board.
@@ -57,15 +55,12 @@ config MPC834x_ITX
 config MPC836x_MDS
         bool "Freescale MPC836x MDS"
         select DEFAULT_UIMAGE
-        select QUICC_ENGINE
         help
           This option enables support for the MPC836x MDS Processor Board.
 
 config MPC836x_RDK
         bool "Freescale/Logic MPC836x RDK"
         select DEFAULT_UIMAGE
-        select QUICC_ENGINE
-        select QE_GPIO
         select FSL_GTM
         select FSL_LBC
         help
diff --git a/arch/powerpc/platforms/83xx/mpc837x_mds.c b/arch/powerpc/platforms/83xx/mpc837x_mds.c
index be62de23bead..8bb13c807142 100644
--- a/arch/powerpc/platforms/83xx/mpc837x_mds.c
+++ b/arch/powerpc/platforms/83xx/mpc837x_mds.c
@@ -85,8 +85,14 @@ static void __init mpc837x_mds_setup_arch(void)
                 ppc_md.progress("mpc837x_mds_setup_arch()", 0);
 
 #ifdef CONFIG_PCI
-        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci")
+        for_each_compatible_node(np, "pci", "fsl,mpc8349-pci") {
+                if (!of_device_is_available(np)) {
+                        pr_warning("%s: disabled by the firmware.\n",
+                                   np->full_name);
+                        continue;
+                }
                 mpc83xx_add_bridge(np);
+        }
 #endif
         mpc837xmds_usb_cfg();
 }
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 291675b0097a..b79dc710ed34 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -33,7 +33,6 @@ config MPC85xx_CDS
 config MPC85xx_MDS
         bool "Freescale MPC85xx MDS"
         select DEFAULT_UIMAGE
-        select QUICC_ENGINE
         select PHYLIB
         help
           This option enables support for the MPC85xx MDS board
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index d17807a6b89a..0293e3d3580f 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -213,7 +213,6 @@ static void mpc85xx_ads_show_cpuinfo(struct seq_file *m)
         svid = mfspr(SPRN_SVR);
 
         seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
-        seq_printf(m, "Machine\t\t: mpc85xx\n");
         seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
         seq_printf(m, "SVR\t\t: 0x%x\n", svid);
 
diff --git a/arch/powerpc/platforms/85xx/sbc8560.c b/arch/powerpc/platforms/85xx/sbc8560.c
index 6509ade71668..0c9a856f66b6 100644
--- a/arch/powerpc/platforms/85xx/sbc8560.c
+++ b/arch/powerpc/platforms/85xx/sbc8560.c
@@ -156,7 +156,7 @@ static void __init init_ioports(void)
         int i;
 
         for (i = 0; i < ARRAY_SIZE(sbc8560_pins); i++) {
-                struct cpm_pin *pin = &sbc8560_pins[i];
+                const struct cpm_pin *pin = &sbc8560_pins[i];
                 cpm2_set_pin(pin->port, pin->pin, pin->flags);
         }
 
@@ -200,7 +200,6 @@ static void sbc8560_show_cpuinfo(struct seq_file *m)
         svid = mfspr(SPRN_SVR);
 
         seq_printf(m, "Vendor\t\t: Wind River\n");
-        seq_printf(m, "Machine\t\t: SBC8560\n");
         seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
         seq_printf(m, "SVR\t\t: 0x%x\n", svid);
 
diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 9355a5269431..77dd797a2580 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -31,6 +31,13 @@ config MPC8610_HPCD
         help
           This option enables support for the MPC8610 HPCD board.
 
+config GEF_SBC610
+        bool "GE Fanuc SBC610"
+        select DEFAULT_UIMAGE
+        select HAS_RAPIDIO
+        help
+          This option enables support for GE Fanuc's SBC610.
+
 endif
 
 config MPC8641
@@ -39,7 +46,7 @@ config MPC8641
         select FSL_PCI if PCI
         select PPC_UDBG_16550
         select MPIC
-        default y if MPC8641_HPCN || SBC8641D
+        default y if MPC8641_HPCN || SBC8641D || GEF_SBC610
 
 config MPC8610
         bool
diff --git a/arch/powerpc/platforms/86xx/Makefile b/arch/powerpc/platforms/86xx/Makefile
index 8fee37dec795..4a56ff619afd 100644
--- a/arch/powerpc/platforms/86xx/Makefile
+++ b/arch/powerpc/platforms/86xx/Makefile
@@ -7,3 +7,4 @@ obj-$(CONFIG_SMP)		+= mpc86xx_smp.o
 obj-$(CONFIG_MPC8641_HPCN)      += mpc86xx_hpcn.o
 obj-$(CONFIG_SBC8641D)          += sbc8641d.o
 obj-$(CONFIG_MPC8610_HPCD)      += mpc8610_hpcd.o
+obj-$(CONFIG_GEF_SBC610)        += gef_sbc610.o gef_pic.o
diff --git a/arch/powerpc/platforms/86xx/gef_pic.c b/arch/powerpc/platforms/86xx/gef_pic.c
new file mode 100644
index 000000000000..50d0a2b63809
--- /dev/null
+++ b/arch/powerpc/platforms/86xx/gef_pic.c
@@ -0,0 +1,258 @@
+/*
+ * Interrupt handling for GE Fanuc's FPGA based PIC
+ *
+ * Author: Martyn Welch <martyn.welch@gefanuc.com>
+ *
+ * 2008 (c) GE Fanuc Intelligent Platforms Embedded Systems, Inc.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/interrupt.h>
+#include <linux/spinlock.h>
+
+#include <asm/byteorder.h>
+#include <asm/io.h>
+#include <asm/prom.h>
+#include <asm/irq.h>
+
+#include "gef_pic.h"
+
+#define DEBUG
+#undef DEBUG
+
+#ifdef DEBUG
+#define DBG(fmt...) do { printk(KERN_DEBUG "gef_pic: " fmt); } while (0)
+#else
+#define DBG(fmt...) do { } while (0)
+#endif
+
+#define GEF_PIC_NUM_IRQS        32
+
+/* Interrupt Controller Interface Registers */
+#define GEF_PIC_INTR_STATUS     0x0000
+
+#define GEF_PIC_INTR_MASK(cpu)  (0x0010 + (0x4 * cpu))
+#define GEF_PIC_CPU0_INTR_MASK  GEF_PIC_INTR_MASK(0)
+#define GEF_PIC_CPU1_INTR_MASK  GEF_PIC_INTR_MASK(1)
+
+#define GEF_PIC_MCP_MASK(cpu)   (0x0018 + (0x4 * cpu))
+#define GEF_PIC_CPU0_MCP_MASK   GEF_PIC_MCP_MASK(0)
+#define GEF_PIC_CPU1_MCP_MASK   GEF_PIC_MCP_MASK(1)
+
+#define gef_irq_to_hw(virq)    ((unsigned int)irq_map[virq].hwirq)
+
+
+static DEFINE_SPINLOCK(gef_pic_lock);
+
+static void __iomem *gef_pic_irq_reg_base;
+static struct irq_host *gef_pic_irq_host;
+static int gef_pic_cascade_irq;
+
+/*
+ * Interrupt Controller Handling
+ *
+ * The interrupt controller handles interrupts for most on board interrupts,
+ * apart from PCI interrupts. For example on SBC610:
+ *
+ * 17:31 RO Reserved
+ * 16    RO PCI Express Doorbell 3 Status
+ * 15    RO PCI Express Doorbell 2 Status
+ * 14    RO PCI Express Doorbell 1 Status
+ * 13    RO PCI Express Doorbell 0 Status
+ * 12    RO Real Time Clock Interrupt Status
+ * 11    RO Temperature Interrupt Status
+ * 10    RO Temperature Critical Interrupt Status
+ * 9     RO Ethernet PHY1 Interrupt Status
+ * 8     RO Ethernet PHY3 Interrupt Status
+ * 7     RO PEX8548 Interrupt Status
+ * 6     RO Reserved
+ * 5     RO Watchdog 0 Interrupt Status
+ * 4     RO Watchdog 1 Interrupt Status
+ * 3     RO AXIS Message FIFO A Interrupt Status
+ * 2     RO AXIS Message FIFO B Interrupt Status
+ * 1     RO AXIS Message FIFO C Interrupt Status
+ * 0     RO AXIS Message FIFO D Interrupt Status
+ *
+ * Interrupts can be forwarded to one of two output lines. Nothing
+ * clever is done, so if the masks are incorrectly set, a single input
+ * interrupt could generate interrupts on both output lines!
+ *
+ * The dual lines are there to allow the chained interrupts to be easily
+ * passed into two different cores. We currently do not use this functionality
+ * in this driver.
+ *
+ * Controller can also be configured to generate Machine checks (MCP), again on
+ * two lines, to be attached to two different cores. It is suggested that these
+ * should be masked out.
+ */
+
+void gef_pic_cascade(unsigned int irq, struct irq_desc *desc)
+{
+        unsigned int cascade_irq;
+
+        /*
+         * See if we actually have an interrupt, call generic handling code if
+         * we do.
+         */
+        cascade_irq = gef_pic_get_irq();
+
+        if (cascade_irq != NO_IRQ)
+                generic_handle_irq(cascade_irq);
+
+        desc->chip->eoi(irq);
+
+}
+
+static void gef_pic_mask(unsigned int virq)
+{
+        unsigned long flags;
+        unsigned int hwirq;
+        u32 mask;
+
+        hwirq = gef_irq_to_hw(virq);
+
+        spin_lock_irqsave(&gef_pic_lock, flags);
+        mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));
+        mask &= ~(1 << hwirq);
+        out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask);
+        spin_unlock_irqrestore(&gef_pic_lock, flags);
+}
+
+static void gef_pic_mask_ack(unsigned int virq)
+{
+        /* Don't think we actually have to do anything to ack an interrupt,
+         * we just need to clear down the devices interrupt and it will go away
+         */
+        gef_pic_mask(virq);
+}
+
+static void gef_pic_unmask(unsigned int virq)
+{
+        unsigned long flags;
+        unsigned int hwirq;
+        u32 mask;
+
+        hwirq = gef_irq_to_hw(virq);
+
+        spin_lock_irqsave(&gef_pic_lock, flags);
+        mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));
+        mask |= (1 << hwirq);
+        out_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0), mask);
+        spin_unlock_irqrestore(&gef_pic_lock, flags);
+}
+
+static struct irq_chip gef_pic_chip = {
+        .typename       = "gefp",
+        .mask           = gef_pic_mask,
+        .mask_ack       = gef_pic_mask_ack,
+        .unmask         = gef_pic_unmask,
+};
+
+
+/* When an interrupt is being configured, this call allows some flexibilty
+ * in deciding which irq_chip structure is used
+ */
+static int gef_pic_host_map(struct irq_host *h, unsigned int virq,
+                          irq_hw_number_t hwirq)
+{
+        /* All interrupts are LEVEL sensitive */
+        get_irq_desc(virq)->status |= IRQ_LEVEL;
+        set_irq_chip_and_handler(virq, &gef_pic_chip, handle_level_irq);
+
+        return 0;
+}
+
+static int gef_pic_host_xlate(struct irq_host *h, struct device_node *ct,
+                            u32 *intspec, unsigned int intsize,
+                            irq_hw_number_t *out_hwirq, unsigned int *out_flags)
+{
+
+        *out_hwirq = intspec[0];
+        if (intsize > 1)
+                *out_flags = intspec[1];
+        else
+                *out_flags = IRQ_TYPE_LEVEL_HIGH;
+
+        return 0;
+}
+
+static struct irq_host_ops gef_pic_host_ops = {
+        .map    = gef_pic_host_map,
+        .xlate  = gef_pic_host_xlate,
+};
+
+
+/*
+ * Initialisation of PIC, this should be called in BSP
+ */
+void __init gef_pic_init(struct device_node *np)
+{
+        unsigned long flags;
+
+        /* Map the devices registers into memory */
+        gef_pic_irq_reg_base = of_iomap(np, 0);
+
+        spin_lock_irqsave(&gef_pic_lock, flags);
+
+        /* Initialise everything as masked. */
+        out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_INTR_MASK, 0);
+        out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_INTR_MASK, 0);
+
+        out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU0_MCP_MASK, 0);
+        out_be32(gef_pic_irq_reg_base + GEF_PIC_CPU1_MCP_MASK, 0);
+
+        spin_unlock_irqrestore(&gef_pic_lock, flags);
+
+        /* Map controller */
+        gef_pic_cascade_irq = irq_of_parse_and_map(np, 0);
+        if (gef_pic_cascade_irq == NO_IRQ) {
+                printk(KERN_ERR "SBC610: failed to map cascade interrupt");
+                return;
+        }
+
+        /* Setup an irq_host structure */
+        gef_pic_irq_host = irq_alloc_host(np, IRQ_HOST_MAP_LINEAR,
+                                          GEF_PIC_NUM_IRQS,
+                                          &gef_pic_host_ops, NO_IRQ);
+        if (gef_pic_irq_host == NULL)
+                return;
+
+        /* Chain with parent controller */
+        set_irq_chained_handler(gef_pic_cascade_irq, gef_pic_cascade);
+}
+
+/*
+ * This is called when we receive an interrupt with apparently comes from this
+ * chip - check, returning the highest interrupt generated or return NO_IRQ
+ */
+unsigned int gef_pic_get_irq(void)
+{
+        u32 cause, mask, active;
+        unsigned int virq = NO_IRQ;
+        int hwirq;
+
+        cause = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_STATUS);
+
+        mask = in_be32(gef_pic_irq_reg_base + GEF_PIC_INTR_MASK(0));
+
+        active = cause & mask;
+
+        if (active) {
+                for (hwirq = GEF_PIC_NUM_IRQS - 1; hwirq > -1; hwirq--) {
+                        if (active & (0x1 << hwirq))
+                                break;
+                }
+                virq = irq_linear_revmap(gef_pic_irq_host,
+                        (irq_hw_number_t)hwirq);
+        }
+
+        return virq;
+}
+
diff --git a/arch/powerpc/platforms/86xx/gef_pic.h b/arch/powerpc/platforms/86xx/gef_pic.h
new file mode 100644
index 000000000000..6149916da3f4
--- /dev/null
+++ b/arch/powerpc/platforms/86xx/gef_pic.h
@@ -0,0 +1,11 @@
+#ifndef __GEF_PIC_H__
+#define __GEF_PIC_H__
+
+#include <linux/init.h>
+
+void gef_pic_cascade(unsigned int, struct irq_desc *);
+unsigned int gef_pic_get_irq(void);
+void gef_pic_init(struct device_node *);
+
+#endif /* __GEF_PIC_H__ */
+
diff --git a/arch/powerpc/platforms/86xx/gef_sbc610.c b/arch/powerpc/platforms/86xx/gef_sbc610.c
new file mode 100644
index 000000000000..821c45fac18b
--- /dev/null
+++ b/arch/powerpc/platforms/86xx/gef_sbc610.c
@@ -0,0 +1,221 @@
+/*
+ * GE Fanuc SBC610 board support
+ *
+ * Author: Martyn Welch <martyn.welch@gefanuc.com>
+ *
+ * Copyright 2008 GE Fanuc Intelligent Platforms Embedded Systems, 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.
+ *
+ * Based on: mpc86xx_hpcn.c (MPC86xx HPCN board specific routines)
+ * Copyright 2006 Freescale Semiconductor Inc.
+ *
+ * NEC fixup adapted from arch/mips/pci/fixup-lm2e.c
+ */
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/kdev_t.h>
+#include <linux/delay.h>
+#include <linux/seq_file.h>
+#include <linux/of_platform.h>
+
+#include <asm/system.h>
+#include <asm/time.h>
+#include <asm/machdep.h>
+#include <asm/pci-bridge.h>
+#include <asm/mpc86xx.h>
+#include <asm/prom.h>
+#include <mm/mmu_decl.h>
+#include <asm/udbg.h>
+
+#include <asm/mpic.h>
+
+#include <sysdev/fsl_pci.h>
+#include <sysdev/fsl_soc.h>
+
+#include "mpc86xx.h"
+#include "gef_pic.h"
+
+#undef DEBUG
+
+#ifdef DEBUG
+#define DBG (fmt...) do { printk(KERN_ERR "SBC610: " fmt); } while (0)
+#else
+#define DBG (fmt...) do { } while (0)
+#endif
+
+void __iomem *sbc610_regs;
+
+static void __init gef_sbc610_init_irq(void)
+{
+        struct device_node *cascade_node = NULL;
+
+        mpc86xx_init_irq();
+
+        /*
+         * There is a simple interrupt handler in the main FPGA, this needs
+         * to be cascaded into the MPIC
+         */
+        cascade_node = of_find_compatible_node(NULL, NULL, "gef,fpga-pic");
+        if (!cascade_node) {
+                printk(KERN_WARNING "SBC610: No FPGA PIC\n");
+                return;
+        }
+
+        gef_pic_init(cascade_node);
+        of_node_put(cascade_node);
+}
+
+static void __init gef_sbc610_setup_arch(void)
+{
+        struct device_node *regs;
+#ifdef CONFIG_PCI
+        struct device_node *np;
+
+        for_each_compatible_node(np, "pci", "fsl,mpc8641-pcie") {
+                fsl_add_bridge(np, 1);
+        }
+#endif
+
+        printk(KERN_INFO "GE Fanuc Intelligent Platforms SBC610 6U VPX SBC\n");
+
+#ifdef CONFIG_SMP
+        mpc86xx_smp_init();
+#endif
+
+        /* Remap basic board registers */
+        regs = of_find_compatible_node(NULL, NULL, "gef,fpga-regs");
+        if (regs) {
+                sbc610_regs = of_iomap(regs, 0);
+                if (sbc610_regs == NULL)
+                        printk(KERN_WARNING "Unable to map board registers\n");
+                of_node_put(regs);
+        }
+}
+
+/* Return the PCB revision */
+static unsigned int gef_sbc610_get_pcb_rev(void)
+{
+        unsigned int reg;
+
+        reg = ioread32(sbc610_regs);
+        return (reg >> 8) & 0xff;
+}
+
+/* Return the board (software) revision */
+static unsigned int gef_sbc610_get_board_rev(void)
+{
+        unsigned int reg;
+
+        reg = ioread32(sbc610_regs);
+        return (reg >> 16) & 0xff;
+}
+
+/* Return the FPGA revision */
+static unsigned int gef_sbc610_get_fpga_rev(void)
+{
+        unsigned int reg;
+
+        reg = ioread32(sbc610_regs);
+        return (reg >> 24) & 0xf;
+}
+
+static void gef_sbc610_show_cpuinfo(struct seq_file *m)
+{
+        uint memsize = total_memory;
+        uint svid = mfspr(SPRN_SVR);
+
+        seq_printf(m, "Vendor\t\t: GE Fanuc Intelligent Platforms\n");
+
+        seq_printf(m, "Revision\t: %u%c\n", gef_sbc610_get_pcb_rev(),
+                ('A' + gef_sbc610_get_board_rev() - 1));
+        seq_printf(m, "FPGA Revision\t: %u\n", gef_sbc610_get_fpga_rev());
+
+        seq_printf(m, "SVR\t\t: 0x%x\n", svid);
+        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
+}
+
+static void __init gef_sbc610_nec_fixup(struct pci_dev *pdev)
+{
+        unsigned int val;
+
+        printk(KERN_INFO "Running NEC uPD720101 Fixup\n");
+
+        /* Ensure ports 1, 2, 3, 4 & 5 are enabled */
+        pci_read_config_dword(pdev, 0xe0, &val);
+        pci_write_config_dword(pdev, 0xe0, (val & ~7) | 0x5);
+
+        /* System clock is 48-MHz Oscillator and EHCI Enabled. */
+        pci_write_config_dword(pdev, 0xe4, 1 << 5);
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_USB,
+        gef_sbc610_nec_fixup);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ *
+ * This function is called to determine whether the BSP is compatible with the
+ * supplied device-tree, which is assumed to be the correct one for the actual
+ * board. It is expected thati, in the future, a kernel may support multiple
+ * boards.
+ */
+static int __init gef_sbc610_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (of_flat_dt_is_compatible(root, "gef,sbc610"))
+                return 1;
+
+        return 0;
+}
+
+static long __init mpc86xx_time_init(void)
+{
+        unsigned int temp;
+
+        /* Set the time base to zero */
+        mtspr(SPRN_TBWL, 0);
+        mtspr(SPRN_TBWU, 0);
+
+        temp = mfspr(SPRN_HID0);
+        temp |= HID0_TBEN;
+        mtspr(SPRN_HID0, temp);
+        asm volatile("isync");
+
+        return 0;
+}
+
+static __initdata struct of_device_id of_bus_ids[] = {
+        { .compatible = "simple-bus", },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        printk(KERN_DEBUG "Probe platform devices\n");
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+
+        return 0;
+}
+machine_device_initcall(gef_sbc610, declare_of_platform_devices);
+
+define_machine(gef_sbc610) {
+        .name                   = "GE Fanuc SBC610",
+        .probe                  = gef_sbc610_probe,
+        .setup_arch             = gef_sbc610_setup_arch,
+        .init_IRQ               = gef_sbc610_init_irq,
+        .show_cpuinfo           = gef_sbc610_show_cpuinfo,
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .time_init              = mpc86xx_time_init,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+};
diff --git a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
index 5eedb710896e..e8d54ac5292c 100644
--- a/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
+++ b/arch/powerpc/platforms/86xx/mpc8610_hpcd.c
@@ -238,7 +238,6 @@ static void __init mpc86xx_hpcd_setup_arch(void)
         }
 #endif
 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
-        preallocate_diu_videomemory();
         diu_ops.get_pixel_format        = mpc8610hpcd_get_pixel_format;
         diu_ops.set_gamma_table         = mpc8610hpcd_set_gamma_table;
         diu_ops.set_monitor_port        = mpc8610hpcd_set_monitor_port;
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index f712d9c0991b..2672829a71dc 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -101,19 +101,11 @@ mpc86xx_hpcn_setup_arch(void)
 static void
 mpc86xx_hpcn_show_cpuinfo(struct seq_file *m)
 {
-        struct device_node *root;
         uint memsize = total_memory;
-        const char *model = "";
         uint svid = mfspr(SPRN_SVR);
 
         seq_printf(m, "Vendor\t\t: Freescale Semiconductor\n");
 
-        root = of_find_node_by_path("/");
-        if (root)
-                model = of_get_property(root, "model", NULL);
-        seq_printf(m, "Machine\t\t: %s\n", model);
-        of_node_put(root);
-
         seq_printf(m, "SVR\t\t: 0x%x\n", svid);
         seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
diff --git a/arch/powerpc/platforms/86xx/sbc8641d.c b/arch/powerpc/platforms/86xx/sbc8641d.c
index 00e6fad3b3ca..da677a74e2d1 100644
--- a/arch/powerpc/platforms/86xx/sbc8641d.c
+++ b/arch/powerpc/platforms/86xx/sbc8641d.c
@@ -63,19 +63,11 @@ sbc8641_setup_arch(void)
 static void
 sbc8641_show_cpuinfo(struct seq_file *m)
 {
-        struct device_node *root;
         uint memsize = total_memory;
-        const char *model = "";
         uint svid = mfspr(SPRN_SVR);
 
         seq_printf(m, "Vendor\t\t: Wind River Systems\n");
 
-        root = of_find_node_by_path("/");
-        if (root)
-                model = of_get_property(root, "model", NULL);
-        seq_printf(m, "Machine\t\t: %s\n", model);
-        of_node_put(root);
-
         seq_printf(m, "SVR\t\t: 0x%x\n", svid);
         seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
 }
diff --git a/arch/powerpc/platforms/8xx/Kconfig b/arch/powerpc/platforms/8xx/Kconfig
index 71d7562e190b..48a920a98e7b 100644
--- a/arch/powerpc/platforms/8xx/Kconfig
+++ b/arch/powerpc/platforms/8xx/Kconfig
@@ -49,6 +49,12 @@ config PPC_ADDER875
           This enables support for the Analogue & Micro Adder 875
           board.
 
+config PPC_MGSUVD
+        bool "MGSUVD"
+        select CPM1
+        help
+          This enables support for the Keymile MGSUVD board.
+
 endchoice
 
 menu "Freescale Ethernet driver platform-specific options"
diff --git a/arch/powerpc/platforms/8xx/Makefile b/arch/powerpc/platforms/8xx/Makefile
index 7b71d9c8fb45..bdbfd7496018 100644
--- a/arch/powerpc/platforms/8xx/Makefile
+++ b/arch/powerpc/platforms/8xx/Makefile
@@ -6,3 +6,4 @@ obj-$(CONFIG_MPC885ADS)   += mpc885ads_setup.o
 obj-$(CONFIG_MPC86XADS)   += mpc86xads_setup.o
 obj-$(CONFIG_PPC_EP88XC)  += ep88xc.o
 obj-$(CONFIG_PPC_ADDER875) += adder875.o
+obj-$(CONFIG_PPC_MGSUVD) += mgsuvd.o
diff --git a/arch/powerpc/platforms/8xx/mgsuvd.c b/arch/powerpc/platforms/8xx/mgsuvd.c
new file mode 100644
index 000000000000..ca3cb071772c
--- /dev/null
+++ b/arch/powerpc/platforms/8xx/mgsuvd.c
@@ -0,0 +1,92 @@
+/*
+ *
+ * Platform setup for the Keymile mgsuvd board
+ *
+ * Heiko Schocher <hs@denx.de>
+ *
+ * Copyright 2008 DENX Software Engineering GmbH
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/ioport.h>
+#include <linux/of_platform.h>
+
+#include <asm/io.h>
+#include <asm/machdep.h>
+#include <asm/processor.h>
+#include <asm/cpm1.h>
+#include <asm/prom.h>
+#include <asm/fs_pd.h>
+
+#include "mpc8xx.h"
+
+struct cpm_pin {
+        int port, pin, flags;
+};
+
+static __initdata struct cpm_pin mgsuvd_pins[] = {
+        /* SMC1 */
+        {CPM_PORTB, 24, CPM_PIN_INPUT}, /* RX */
+        {CPM_PORTB, 25, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* TX */
+
+        /* SCC3 */
+        {CPM_PORTA, 10, CPM_PIN_INPUT},
+        {CPM_PORTA, 11, CPM_PIN_INPUT},
+        {CPM_PORTA, 3, CPM_PIN_INPUT},
+        {CPM_PORTA, 2, CPM_PIN_INPUT},
+        {CPM_PORTC, 13, CPM_PIN_INPUT},
+};
+
+static void __init init_ioports(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(mgsuvd_pins); i++) {
+                struct cpm_pin *pin = &mgsuvd_pins[i];
+                cpm1_set_pin(pin->port, pin->pin, pin->flags);
+        }
+
+        setbits16(&mpc8xx_immr->im_ioport.iop_pcso, 0x300);
+        cpm1_clk_setup(CPM_CLK_SCC3, CPM_CLK5, CPM_CLK_RX);
+        cpm1_clk_setup(CPM_CLK_SCC3, CPM_CLK6, CPM_CLK_TX);
+        cpm1_clk_setup(CPM_CLK_SMC1, CPM_BRG1, CPM_CLK_RTX);
+}
+
+static void __init mgsuvd_setup_arch(void)
+{
+        cpm_reset();
+        init_ioports();
+}
+
+static __initdata struct of_device_id of_bus_ids[] = {
+        { .compatible = "simple-bus" },
+        {},
+};
+
+static int __init declare_of_platform_devices(void)
+{
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        return 0;
+}
+machine_device_initcall(mgsuvd, declare_of_platform_devices);
+
+static int __init mgsuvd_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        return of_flat_dt_is_compatible(root, "keymile,mgsuvd");
+}
+
+define_machine(mgsuvd) {
+        .name           = "MGSUVD",
+        .probe          = mgsuvd_probe,
+        .setup_arch     = mgsuvd_setup_arch,
+        .init_IRQ       = mpc8xx_pics_init,
+        .get_irq        = mpc8xx_get_irq,
+        .restart        = mpc8xx_restart,
+        .calibrate_decr = mpc8xx_calibrate_decr,
+        .set_rtc_time   = mpc8xx_set_rtc_time,
+        .get_rtc_time   = mpc8xx_get_rtc_time,
+};
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 4c900efa164e..47e956c871fe 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -239,7 +239,8 @@ config TAU_AVERAGE
           If in doubt, say N here.
 
 config QUICC_ENGINE
-        bool
+        bool "Freescale QUICC Engine (QE) Support"
+        depends on FSL_SOC
         select PPC_LIB_RHEAP
         select CRC32
         help
@@ -248,6 +249,15 @@ config QUICC_ENGINE
           Selecting this option means that you wish to build a kernel
           for a machine with a QE coprocessor.
 
+config QE_GPIO
+        bool "QE GPIO support"
+        depends on QUICC_ENGINE
+        select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
+        help
+          Say Y here if you're going to use hardware that connects to the
+          QE GPIOs.
+
 config CPM2
         bool "Enable support for the CPM2 (Communications Processor Module)"
         depends on MPC85xx || 8260
@@ -293,4 +303,13 @@ config OF_RTC
 
 source "arch/powerpc/sysdev/bestcomm/Kconfig"
 
+config MPC8xxx_GPIO
+        bool "MPC8xxx GPIO support"
+        depends on PPC_MPC831x || PPC_MPC834x || PPC_MPC837x || PPC_85xx || PPC_86xx
+        select GENERIC_GPIO
+        select ARCH_REQUIRE_GPIOLIB
+        help
+          Say Y here if you're going to use hardware that connects to the
+          MPC831x/834x/837x/8572/8610 GPIOs.
+
 endmenu
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 7f6512733862..439c5ba34ecf 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -50,6 +50,7 @@ config 44x
         select PPC_UDBG_16550
         select 4xx_SOC
         select PPC_PCI_CHOICE
+        select PHYS_64BIT
 
 config E200
         bool "Freescale e200"
@@ -128,18 +129,20 @@ config FSL_EMB_PERFMON
 
 config PTE_64BIT
         bool
-        depends on 44x || E500
-        default y if 44x
-        default y if E500 && PHYS_64BIT
+        depends on 44x || E500 || PPC_86xx
+        default y if PHYS_64BIT
 
 config PHYS_64BIT
-        bool 'Large physical address support' if E500
-        depends on 44x || E500
+        bool 'Large physical address support' if E500 || PPC_86xx
+        depends on (44x || E500 || PPC_86xx) && !PPC_83xx && !PPC_82xx
         select RESOURCES_64BIT
-        default y if 44x
         ---help---
           This option enables kernel support for larger than 32-bit physical
-          addresses.  This features is not be available on all e500 cores.
+          addresses.  This feature may not be available on all cores.
+
+          If you have more than 3.5GB of RAM or so, you also need to enable
+          SWIOTLB under Kernel Options for this to work.  The actual number
+          is platform-dependent.
 
           If in doubt, say N here.
 
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index e06420af5fe9..ef92e7146215 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -556,11 +556,11 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)
          * node's iommu. We -might- do something smarter later though it may
          * never be necessary
          */
-        iommu = cell_iommu_for_node(archdata->numa_node);
+        iommu = cell_iommu_for_node(dev_to_node(dev));
         if (iommu == NULL || list_empty(&iommu->windows)) {
                 printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n",
                        archdata->of_node ? archdata->of_node->full_name : "?",
-                       archdata->numa_node);
+                       dev_to_node(dev));
                 return NULL;
         }
         window = list_entry(iommu->windows.next, struct iommu_window, list);
@@ -577,7 +577,7 @@ static void *dma_fixed_alloc_coherent(struct device *dev, size_t size,
                 return iommu_alloc_coherent(dev, cell_get_iommu_table(dev),
                                             size, dma_handle,
                                             device_to_mask(dev), flag,
-                                            dev->archdata.numa_node);
+                                            dev_to_node(dev));
         else
                 return dma_direct_ops.alloc_coherent(dev, size, dma_handle,
                                                      flag);
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index 2c8b8091250f..cb85d237e492 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -298,8 +298,8 @@ spufs_mkdir(struct inode *dir, struct dentry *dentry, unsigned int flags,
 
         d_instantiate(dentry, inode);
         dget(dentry);
-        dir->i_nlink++;
-        dentry->d_inode->i_nlink++;
+        inc_nlink(dir);
+        inc_nlink(dentry->d_inode);
         goto out;
 
 out_free_ctx:
@@ -496,6 +496,8 @@ spufs_create_context(struct inode *inode, struct dentry *dentry,
         ret = spufs_context_open(dget(dentry), mntget(mnt));
         if (ret < 0) {
                 WARN_ON(spufs_rmdir(inode, dentry));
+                if (affinity)
+                        mutex_unlock(&gang->aff_mutex);
                 mutex_unlock(&inode->i_mutex);
                 spu_forget(SPUFS_I(dentry->d_inode)->i_ctx);
                 goto out;
@@ -538,8 +540,8 @@ spufs_mkgang(struct inode *dir, struct dentry *dentry, int mode)
         inode->i_fop = &simple_dir_operations;
 
         d_instantiate(dentry, inode);
-        dir->i_nlink++;
-        dentry->d_inode->i_nlink++;
+        inc_nlink(dir);
+        inc_nlink(dentry->d_inode);
         return ret;
 
 out_iput:
@@ -755,6 +757,7 @@ spufs_create_root(struct super_block *sb, void *data)
         inode->i_op = &simple_dir_inode_operations;
         inode->i_fop = &simple_dir_operations;
         SPUFS_I(inode)->i_ctx = NULL;
+        inc_nlink(inode);
 
         ret = -EINVAL;
         if (!spufs_parse_options(sb, data, inode))
diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index 768c262b9368..d3cde6b9d2df 100644
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -260,13 +260,13 @@ chrp_find_bridges(void)
                                 dev->full_name);
                         continue;
                 }
-                hose->first_busno = bus_range[0];
+                hose->first_busno = hose->self_busno = bus_range[0];
                 hose->last_busno = bus_range[1];
 
                 model = of_get_property(dev, "model", NULL);
                 if (model == NULL)
                         model = "<none>";
-                if (of_device_is_compatible(dev, "IBM,python")) {
+                if (strncmp(model, "IBM, Python", 11) == 0) {
                         setup_python(hose, dev);
                 } else if (is_mot
                            || strncmp(model, "Motorola, Grackle", 17) == 0) {
diff --git a/arch/powerpc/platforms/chrp/time.c b/arch/powerpc/platforms/chrp/time.c
index 96d1e4b3c493..054dfe5b8e77 100644
--- a/arch/powerpc/platforms/chrp/time.c
+++ b/arch/powerpc/platforms/chrp/time.c
@@ -94,12 +94,12 @@ int chrp_set_rtc_time(struct rtc_time *tmarg)
         chrp_cmos_clock_write((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
 
         if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
-                BIN_TO_BCD(tm.tm_sec);
-                BIN_TO_BCD(tm.tm_min);
-                BIN_TO_BCD(tm.tm_hour);
-                BIN_TO_BCD(tm.tm_mon);
-                BIN_TO_BCD(tm.tm_mday);
-                BIN_TO_BCD(tm.tm_year);
+                tm.tm_sec = bin2bcd(tm.tm_sec);
+                tm.tm_min = bin2bcd(tm.tm_min);
+                tm.tm_hour = bin2bcd(tm.tm_hour);
+                tm.tm_mon = bin2bcd(tm.tm_mon);
+                tm.tm_mday = bin2bcd(tm.tm_mday);
+                tm.tm_year = bin2bcd(tm.tm_year);
         }
         chrp_cmos_clock_write(tm.tm_sec,RTC_SECONDS);
         chrp_cmos_clock_write(tm.tm_min,RTC_MINUTES);
@@ -136,12 +136,12 @@ void chrp_get_rtc_time(struct rtc_time *tm)
         } while (sec != chrp_cmos_clock_read(RTC_SECONDS));
 
         if (!(chrp_cmos_clock_read(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
-                BCD_TO_BIN(sec);
-                BCD_TO_BIN(min);
-                BCD_TO_BIN(hour);
-                BCD_TO_BIN(day);
-                BCD_TO_BIN(mon);
-                BCD_TO_BIN(year);
+                sec = bcd2bin(sec);
+                min = bcd2bin(min);
+                hour = bcd2bin(hour);
+                day = bcd2bin(day);
+                mon = bcd2bin(mon);
+                year = bcd2bin(year);
         }
         if (year < 70)
                 year += 100;
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index 84e2d78b9a62..7a2ba39d7811 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -164,7 +164,6 @@ static void __init mpc7448_hpc2_init_IRQ(void)
 void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)
 {
         seq_printf(m, "vendor\t\t: Freescale Semiconductor\n");
-        seq_printf(m, "machine\t\t: MPC7448hpc2\n");
 }
 
 void mpc7448_hpc2_restart(char *cmd)
diff --git a/arch/powerpc/platforms/iseries/exception.S b/arch/powerpc/platforms/iseries/exception.S
index 8ff330d026ca..2f581521eb9b 100644
--- a/arch/powerpc/platforms/iseries/exception.S
+++ b/arch/powerpc/platforms/iseries/exception.S
@@ -38,12 +38,13 @@
 
         .globl system_reset_iSeries
 system_reset_iSeries:
+        bl      .relative_toc
         mfspr   r13,SPRN_SPRG3          /* Get alpaca address */
-        LOAD_REG_IMMEDIATE(r23, alpaca)
+        LOAD_REG_ADDR(r23, alpaca)
         li      r0,ALPACA_SIZE
         sub     r23,r13,r23
         divdu   r23,r23,r0              /* r23 has cpu number */
-        LOAD_REG_IMMEDIATE(r13, paca)
+        LOAD_REG_ADDR(r13, paca)
         mulli   r0,r23,PACA_SIZE
         add     r13,r13,r0
         mtspr   SPRN_SPRG3,r13          /* Save it away for the future */
@@ -60,14 +61,14 @@ system_reset_iSeries:
         mtspr   SPRN_CTRLT,r4
 
 /* Spin on __secondary_hold_spinloop until it is updated by the boot cpu. */
-/* In the UP case we'll yeild() later, and we will not access the paca anyway */
+/* In the UP case we'll yield() later, and we will not access the paca anyway */
 #ifdef CONFIG_SMP
 1:
         HMT_LOW
-        LOAD_REG_IMMEDIATE(r23, __secondary_hold_spinloop)
+        LOAD_REG_ADDR(r23, __secondary_hold_spinloop)
         ld      r23,0(r23)
         sync
-        LOAD_REG_IMMEDIATE(r3,current_set)
+        LOAD_REG_ADDR(r3,current_set)
         sldi    r28,r24,3               /* get current_set[cpu#] */
         ldx     r3,r3,r28
         addi    r1,r3,THREAD_SIZE
@@ -90,7 +91,7 @@ system_reset_iSeries:
         lbz     r23,PACAPROCSTART(r13)  /* Test if this processor
                                          * should start */
         sync
-        LOAD_REG_IMMEDIATE(r3,current_set)
+        LOAD_REG_ADDR(r3,current_set)
         sldi    r28,r24,3               /* get current_set[cpu#] */
         ldx     r3,r3,r28
         addi    r1,r3,THREAD_SIZE
@@ -255,8 +256,8 @@ hardware_interrupt_iSeries_masked:
 
 _INIT_STATIC(__start_initialization_iSeries)
         /* Clear out the BSS */
-        LOAD_REG_IMMEDIATE(r11,__bss_stop)
-        LOAD_REG_IMMEDIATE(r8,__bss_start)
+        LOAD_REG_ADDR(r11,__bss_stop)
+        LOAD_REG_ADDR(r8,__bss_start)
         sub     r11,r11,r8              /* bss size                     */
         addi    r11,r11,7               /* round up to an even double word */
         rldicl. r11,r11,61,3            /* shift right by 3             */
@@ -267,15 +268,11 @@ _INIT_STATIC(__start_initialization_iSeries)
 3:      stdu    r0,8(r8)
         bdnz    3b
 4:
-        LOAD_REG_IMMEDIATE(r1,init_thread_union)
+        LOAD_REG_ADDR(r1,init_thread_union)
         addi    r1,r1,THREAD_SIZE
         li      r0,0
         stdu    r0,-STACK_FRAME_OVERHEAD(r1)
 
-        LOAD_REG_IMMEDIATE(r2,__toc_start)
-        addi    r2,r2,0x4000
-        addi    r2,r2,0x4000
-
         bl      .iSeries_early_setup
         bl      .early_setup
 
diff --git a/arch/powerpc/platforms/iseries/mf.c b/arch/powerpc/platforms/iseries/mf.c
index 731d7b157749..3689c2413d24 100644
--- a/arch/powerpc/platforms/iseries/mf.c
+++ b/arch/powerpc/platforms/iseries/mf.c
@@ -722,13 +722,13 @@ static int mf_set_rtc(struct rtc_time *tm)
         day = tm->tm_mday;
         mon = tm->tm_mon + 1;
 
-        BIN_TO_BCD(sec);
-        BIN_TO_BCD(min);
-        BIN_TO_BCD(hour);
-        BIN_TO_BCD(mon);
-        BIN_TO_BCD(day);
-        BIN_TO_BCD(y1);
-        BIN_TO_BCD(y2);
+        sec = bin2bcd(sec);
+        min = bin2bcd(min);
+        hour = bin2bcd(hour);
+        mon = bin2bcd(mon);
+        day = bin2bcd(day);
+        y1 = bin2bcd(y1);
+        y2 = bin2bcd(y2);
 
         memset(ce_time, 0, sizeof(ce_time));
         ce_time[3] = 0x41;
@@ -777,12 +777,12 @@ static int rtc_set_tm(int rc, u8 *ce_msg, struct rtc_time *tm)
                 u8 day = ce_msg[10];
                 u8 mon = ce_msg[11];
 
-                BCD_TO_BIN(sec);
-                BCD_TO_BIN(min);
-                BCD_TO_BIN(hour);
-                BCD_TO_BIN(day);
-                BCD_TO_BIN(mon);
-                BCD_TO_BIN(year);
+                sec = bcd2bin(sec);
+                min = bcd2bin(min);
+                hour = bcd2bin(hour);
+                day = bcd2bin(day);
+                mon = bcd2bin(mon);
+                year = bcd2bin(year);
 
                 if (year <= 69)
                         year += 100;
diff --git a/arch/powerpc/platforms/maple/time.c b/arch/powerpc/platforms/maple/time.c
index 53bca132fb48..eac569dee27c 100644
--- a/arch/powerpc/platforms/maple/time.c
+++ b/arch/powerpc/platforms/maple/time.c
@@ -68,12 +68,12 @@ void maple_get_rtc_time(struct rtc_time *tm)
 
         if (!(maple_clock_read(RTC_CONTROL) & RTC_DM_BINARY)
             || RTC_ALWAYS_BCD) {
-                BCD_TO_BIN(tm->tm_sec);
-                BCD_TO_BIN(tm->tm_min);
-                BCD_TO_BIN(tm->tm_hour);
-                BCD_TO_BIN(tm->tm_mday);
-                BCD_TO_BIN(tm->tm_mon);
-                BCD_TO_BIN(tm->tm_year);
+                tm->tm_sec = bcd2bin(tm->tm_sec);
+                tm->tm_min = bcd2bin(tm->tm_min);
+                tm->tm_hour = bcd2bin(tm->tm_hour);
+                tm->tm_mday = bcd2bin(tm->tm_mday);
+                tm->tm_mon = bcd2bin(tm->tm_mon);
+                tm->tm_year = bcd2bin(tm->tm_year);
           }
         if ((tm->tm_year + 1900) < 1970)
                 tm->tm_year += 100;
@@ -104,12 +104,12 @@ int maple_set_rtc_time(struct rtc_time *tm)
         year = tm->tm_year;
 
         if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
-                BIN_TO_BCD(sec);
-                BIN_TO_BCD(min);
-                BIN_TO_BCD(hour);
-                BIN_TO_BCD(mon);
-                BIN_TO_BCD(mday);
-                BIN_TO_BCD(year);
+                sec = bin2bcd(sec);
+                min = bin2bcd(min);
+                hour = bin2bcd(hour);
+                mon = bin2bcd(mon);
+                mday = bin2bcd(mday);
+                year = bin2bcd(year);
         }
         maple_clock_write(sec, RTC_SECONDS);
         maple_clock_write(min, RTC_MINUTES);
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index 5169ecc37123..e6c0040ee797 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -2677,7 +2677,7 @@ static void __init probe_one_macio(const char *name, const char *compat, int typ
         macio_chips[i].of_node  = node;
         macio_chips[i].type     = type;
         macio_chips[i].base     = base;
-        macio_chips[i].flags    = MACIO_FLAG_SCCB_ON | MACIO_FLAG_SCCB_ON;
+        macio_chips[i].flags    = MACIO_FLAG_SCCA_ON | MACIO_FLAG_SCCB_ON;
         macio_chips[i].name     = macio_names[type];
         revp = of_get_property(node, "revision-id", NULL);
         if (revp)
diff --git a/arch/powerpc/platforms/powermac/smp.c b/arch/powerpc/platforms/powermac/smp.c
index 4ae3d00e0bdd..40f72c2a4699 100644
--- a/arch/powerpc/platforms/powermac/smp.c
+++ b/arch/powerpc/platforms/powermac/smp.c
@@ -787,7 +787,7 @@ static void __devinit smp_core99_kick_cpu(int nr)
 {
         unsigned int save_vector;
         unsigned long target, flags;
-        unsigned int *vector = (unsigned int *)(KERNELBASE+0x100);
+        unsigned int *vector = (unsigned int *)(PAGE_OFFSET+0x100);
 
         if (nr < 0 || nr > 3)
                 return;
@@ -801,7 +801,7 @@ static void __devinit smp_core99_kick_cpu(int nr)
         save_vector = *vector;
 
         /* Setup fake reset vector that does
-         *   b __secondary_start_pmac_0 + nr*8 - KERNELBASE
+         *   b __secondary_start_pmac_0 + nr*8
          */
         target = (unsigned long) __secondary_start_pmac_0 + nr * 8;
         patch_branch(vector, target, BRANCH_SET_LINK);
diff --git a/arch/powerpc/platforms/powermac/time.c b/arch/powerpc/platforms/powermac/time.c
index bbbefd64ab59..59eb840d8ce2 100644
--- a/arch/powerpc/platforms/powermac/time.c
+++ b/arch/powerpc/platforms/powermac/time.c
@@ -93,11 +93,14 @@ static void to_rtc_time(unsigned long now, struct rtc_time *tm)
 }
 #endif
 
+#if defined(CONFIG_ADB_CUDA) || defined(CONFIG_ADB_PMU) || \
+    defined(CONFIG_PMAC_SMU)
 static unsigned long from_rtc_time(struct rtc_time *tm)
 {
         return mktime(tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
                       tm->tm_hour, tm->tm_min, tm->tm_sec);
 }
+#endif
 
 #ifdef CONFIG_ADB_CUDA
 static unsigned long cuda_get_time(void)
diff --git a/arch/powerpc/platforms/ps3/system-bus.c b/arch/powerpc/platforms/ps3/system-bus.c
index 280ee88cb0b0..a789bf58ca8b 100644
--- a/arch/powerpc/platforms/ps3/system-bus.c
+++ b/arch/powerpc/platforms/ps3/system-bus.c
@@ -762,7 +762,7 @@ int ps3_system_bus_device_register(struct ps3_system_bus_device *dev)
         };
 
         dev->core.archdata.of_node = NULL;
-        dev->core.archdata.numa_node = 0;
+        set_dev_node(&dev->core, 0);
 
         pr_debug("%s:%d add %s\n", __func__, __LINE__, dev->core.bus_id);
 
diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c
index 38fe32a7cc70..5cd4d2761620 100644
--- a/arch/powerpc/platforms/pseries/cmm.c
+++ b/arch/powerpc/platforms/pseries/cmm.c
@@ -121,7 +121,7 @@ static long cmm_alloc_pages(long nr)
                         npa = (struct cmm_page_array *)__get_free_page(GFP_NOIO | __GFP_NOWARN |
                                                                        __GFP_NORETRY | __GFP_NOMEMALLOC);
                         if (!npa) {
-                                pr_info("%s: Can not allocate new page list\n", __FUNCTION__);
+                                pr_info("%s: Can not allocate new page list\n", __func__);
                                 free_page(addr);
                                 break;
                         }
@@ -138,7 +138,7 @@ static long cmm_alloc_pages(long nr)
                 }
 
                 if ((rc = plpar_page_set_loaned(__pa(addr)))) {
-                        pr_err("%s: Can not set page to loaned. rc=%ld\n", __FUNCTION__, rc);
+                        pr_err("%s: Can not set page to loaned. rc=%ld\n", __func__, rc);
                         spin_unlock(&cmm_lock);
                         free_page(addr);
                         break;
diff --git a/arch/powerpc/platforms/pseries/eeh_driver.c b/arch/powerpc/platforms/pseries/eeh_driver.c
index 8c1ca477c52c..0ad56ff7b4a0 100644
--- a/arch/powerpc/platforms/pseries/eeh_driver.c
+++ b/arch/powerpc/platforms/pseries/eeh_driver.c
@@ -41,7 +41,7 @@ static inline const char * pcid_name (struct pci_dev *pdev)
         return "";
 }
 
-#ifdef DEBUG
+#if 0
 static void print_device_node_tree(struct pci_dn *pdn, int dent)
 {
         int i;
diff --git a/arch/powerpc/platforms/pseries/hotplug-memory.c b/arch/powerpc/platforms/pseries/hotplug-memory.c
index a1a368dd2d99..140d02a5232a 100644
--- a/arch/powerpc/platforms/pseries/hotplug-memory.c
+++ b/arch/powerpc/platforms/pseries/hotplug-memory.c
@@ -21,7 +21,7 @@ static int pseries_remove_lmb(unsigned long base, unsigned int lmb_size)
         struct zone *zone;
         int ret;
 
-        start_pfn = base >> PFN_SECTION_SHIFT;
+        start_pfn = base >> PAGE_SHIFT;
         zone = page_zone(pfn_to_page(start_pfn));
 
         /*
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 7637bd38c795..c591a25b0b0d 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -466,11 +466,11 @@ static int do_update_property(char *buf, size_t bufsize)
                 else
                         action = PSERIES_DRCONF_MEM_REMOVE;
 
-                blocking_notifier_call_chain(&pSeries_reconfig_chain,
-                                             action, value);
+                rc = blocking_notifier_call_chain(&pSeries_reconfig_chain,
+                                                  action, value);
         }
 
-        return 0;
+        return rc;
 }
 
 /**
diff --git a/arch/powerpc/platforms/pseries/rtasd.c b/arch/powerpc/platforms/pseries/rtasd.c
index c9ffd8c225f1..f4e55be2eea9 100644
--- a/arch/powerpc/platforms/pseries/rtasd.c
+++ b/arch/powerpc/platforms/pseries/rtasd.c
@@ -295,19 +295,29 @@ static ssize_t rtas_log_read(struct file * file, char __user * buf,
         if (!tmp)
                 return -ENOMEM;
 
-
         spin_lock_irqsave(&rtasd_log_lock, s);
         /* if it's 0, then we know we got the last one (the one in NVRAM) */
-        if (rtas_log_size == 0 && logging_enabled)
-                nvram_clear_error_log();
-        spin_unlock_irqrestore(&rtasd_log_lock, s);
+        while (rtas_log_size == 0) {
+                if (file->f_flags & O_NONBLOCK) {
+                        spin_unlock_irqrestore(&rtasd_log_lock, s);
+                        error = -EAGAIN;
+                        goto out;
+                }
 
+                if (!logging_enabled) {
+                        spin_unlock_irqrestore(&rtasd_log_lock, s);
+                        error = -ENODATA;
+                        goto out;
+                }
+                nvram_clear_error_log();
 
-        error = wait_event_interruptible(rtas_log_wait, rtas_log_size);
-        if (error)
-                goto out;
+                spin_unlock_irqrestore(&rtasd_log_lock, s);
+                error = wait_event_interruptible(rtas_log_wait, rtas_log_size);
+                if (error)
+                        goto out;
+                spin_lock_irqsave(&rtasd_log_lock, s);
+        }
 
-        spin_lock_irqsave(&rtasd_log_lock, s);
         offset = rtas_error_log_buffer_max * (rtas_log_start & LOG_NUMBER_MASK);
         memcpy(tmp, &rtas_log_buf[offset], count);
 
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 9d8f8c84ab89..e00f96baa381 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -37,7 +37,6 @@
 #include <asm/paca.h>
 #include <asm/time.h>
 #include <asm/machdep.h>
-#include "xics.h"
 #include <asm/cputable.h>
 #include <asm/firmware.h>
 #include <asm/system.h>
@@ -49,6 +48,7 @@
 
 #include "plpar_wrappers.h"
 #include "pseries.h"
+#include "xics.h"
 
 
 /*
@@ -105,36 +105,6 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
 }
 
 #ifdef CONFIG_XICS
-static inline void smp_xics_do_message(int cpu, int msg)
-{
-        set_bit(msg, &xics_ipi_message[cpu].value);
-        mb();
-        xics_cause_IPI(cpu);
-}
-
-static void smp_xics_message_pass(int target, int msg)
-{
-        unsigned int i;
-
-        if (target < NR_CPUS) {
-                smp_xics_do_message(target, msg);
-        } else {
-                for_each_online_cpu(i) {
-                        if (target == MSG_ALL_BUT_SELF
-                            && i == smp_processor_id())
-                                continue;
-                        smp_xics_do_message(i, msg);
-                }
-        }
-}
-
-static int __init smp_xics_probe(void)
-{
-        xics_request_IPIs();
-
-        return cpus_weight(cpu_possible_map);
-}
-
 static void __devinit smp_xics_setup_cpu(int cpu)
 {
         if (cpu != boot_cpuid)
diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c
index 0fc830f576f5..e1904774a70f 100644
--- a/arch/powerpc/platforms/pseries/xics.c
+++ b/arch/powerpc/platforms/pseries/xics.c
@@ -9,32 +9,30 @@
  *  2 of the License, or (at your option) any later version.
  */
 
-
 #include <linux/types.h>
 #include <linux/threads.h>
 #include <linux/kernel.h>
 #include <linux/irq.h>
 #include <linux/smp.h>
 #include <linux/interrupt.h>
-#include <linux/signal.h>
 #include <linux/init.h>
-#include <linux/gfp.h>
 #include <linux/radix-tree.h>
 #include <linux/cpu.h>
+#include <linux/of.h>
 
 #include <asm/firmware.h>
-#include <asm/prom.h>
 #include <asm/io.h>
 #include <asm/pgtable.h>
 #include <asm/smp.h>
 #include <asm/rtas.h>
 #include <asm/hvcall.h>
 #include <asm/machdep.h>
-#include <asm/i8259.h>
 
 #include "xics.h"
 #include "plpar_wrappers.h"
 
+static struct irq_host *xics_host;
+
 #define XICS_IPI                2
 #define XICS_IRQ_SPURIOUS       0
 
@@ -47,6 +45,20 @@
  */
 #define IPI_PRIORITY            4
 
+static unsigned int default_server = 0xFF;
+static unsigned int default_distrib_server = 0;
+static unsigned int interrupt_server_size = 8;
+
+/* RTAS service tokens */
+static int ibm_get_xive;
+static int ibm_set_xive;
+static int ibm_int_on;
+static int ibm_int_off;
+
+
+/* Direct hardware low level accessors */
+
+/* The part of the interrupt presentation layer that we care about */
 struct xics_ipl {
         union {
                 u32 word;
@@ -65,27 +77,6 @@ struct xics_ipl {
 
 static struct xics_ipl __iomem *xics_per_cpu[NR_CPUS];
 
-static unsigned int default_server = 0xFF;
-static unsigned int default_distrib_server = 0;
-static unsigned int interrupt_server_size = 8;
-
-static struct irq_host *xics_host;
-
-/*
- * XICS only has a single IPI, so encode the messages per CPU
- */
-struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;
-
-/* RTAS service tokens */
-static int ibm_get_xive;
-static int ibm_set_xive;
-static int ibm_int_on;
-static int ibm_int_off;
-
-
-/* Direct HW low level accessors */
-
-
 static inline unsigned int direct_xirr_info_get(void)
 {
         int cpu = smp_processor_id();
@@ -93,7 +84,7 @@ static inline unsigned int direct_xirr_info_get(void)
         return in_be32(&xics_per_cpu[cpu]->xirr.word);
 }
 
-static inline void direct_xirr_info_set(int value)
+static inline void direct_xirr_info_set(unsigned int value)
 {
         int cpu = smp_processor_id();
 
@@ -115,7 +106,6 @@ static inline void direct_qirr_info(int n_cpu, u8 value)
 
 /* LPAR low level accessors */
 
-
 static inline unsigned int lpar_xirr_info_get(void)
 {
         unsigned long lpar_rc;
@@ -127,15 +117,14 @@ static inline unsigned int lpar_xirr_info_get(void)
         return (unsigned int)return_value;
 }
 
-static inline void lpar_xirr_info_set(int value)
+static inline void lpar_xirr_info_set(unsigned int value)
 {
         unsigned long lpar_rc;
-        unsigned long val64 = value & 0xffffffff;
 
-        lpar_rc = plpar_eoi(val64);
+        lpar_rc = plpar_eoi(value);
         if (lpar_rc != H_SUCCESS)
-                panic("bad return code EOI - rc = %ld, value=%lx\n", lpar_rc,
-                      val64);
+                panic("bad return code EOI - rc = %ld, value=%x\n", lpar_rc,
+                      value);
 }
 
 static inline void lpar_cppr_info(u8 value)
@@ -157,48 +146,7 @@ static inline void lpar_qirr_info(int n_cpu , u8 value)
 }
 
 
-/* High level handlers and init code */
-
-static void xics_update_irq_servers(void)
-{
-        int i, j;
-        struct device_node *np;
-        u32 ilen;
-        const u32 *ireg, *isize;
-        u32 hcpuid;
-
-        /* Find the server numbers for the boot cpu. */
-        np = of_get_cpu_node(boot_cpuid, NULL);
-        BUG_ON(!np);
-
-        ireg = of_get_property(np, "ibm,ppc-interrupt-gserver#s", &ilen);
-        if (!ireg) {
-                of_node_put(np);
-                return;
-        }
-
-        i = ilen / sizeof(int);
-        hcpuid = get_hard_smp_processor_id(boot_cpuid);
-
-        /* Global interrupt distribution server is specified in the last
-         * entry of "ibm,ppc-interrupt-gserver#s" property. Get the last
-         * entry fom this property for current boot cpu id and use it as
-         * default distribution server
-         */
-        for (j = 0; j < i; j += 2) {
-                if (ireg[j] == hcpuid) {
-                        default_server = hcpuid;
-                        default_distrib_server = ireg[j+1];
-
-                        isize = of_get_property(np,
-                                        "ibm,interrupt-server#-size", NULL);
-                        if (isize)
-                                interrupt_server_size = *isize;
-                }
-        }
-
-        of_node_put(np);
-}
+/* Interface to generic irq subsystem */
 
 #ifdef CONFIG_SMP
 static int get_irq_server(unsigned int virq, unsigned int strict_check)
@@ -208,9 +156,6 @@ static int get_irq_server(unsigned int virq, unsigned int strict_check)
         cpumask_t cpumask = irq_desc[virq].affinity;
         cpumask_t tmp = CPU_MASK_NONE;
 
-        if (! cpu_isset(default_server, cpu_online_map))
-                xics_update_irq_servers();
-
         if (!distribute_irqs)
                 return default_server;
 
@@ -238,7 +183,6 @@ static int get_irq_server(unsigned int virq, unsigned int strict_check)
 }
 #endif
 
-
 static void xics_unmask_irq(unsigned int virq)
 {
         unsigned int irq;
@@ -257,21 +201,28 @@ static void xics_unmask_irq(unsigned int virq)
         call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server,
                                 DEFAULT_PRIORITY);
         if (call_status != 0) {
-                printk(KERN_ERR "xics_enable_irq: irq=%u: ibm_set_xive "
-                       "returned %d\n", irq, call_status);
-                printk("set_xive %x, server %x\n", ibm_set_xive, server);
+                printk(KERN_ERR
+                        "%s: ibm_set_xive irq %u server %x returned %d\n",
+                        __func__, irq, server, call_status);
                 return;
         }
 
         /* Now unmask the interrupt (often a no-op) */
         call_status = rtas_call(ibm_int_on, 1, 1, NULL, irq);
         if (call_status != 0) {
-                printk(KERN_ERR "xics_enable_irq: irq=%u: ibm_int_on "
-                       "returned %d\n", irq, call_status);
+                printk(KERN_ERR "%s: ibm_int_on irq=%u returned %d\n",
+                        __func__, irq, call_status);
                 return;
         }
 }
 
+static unsigned int xics_startup(unsigned int virq)
+{
+        /* unmask it */
+        xics_unmask_irq(virq);
+        return 0;
+}
+
 static void xics_mask_real_irq(unsigned int irq)
 {
         int call_status;
@@ -281,8 +232,8 @@ static void xics_mask_real_irq(unsigned int irq)
 
         call_status = rtas_call(ibm_int_off, 1, 1, NULL, irq);
         if (call_status != 0) {
-                printk(KERN_ERR "xics_disable_real_irq: irq=%u: "
-                       "ibm_int_off returned %d\n", irq, call_status);
+                printk(KERN_ERR "%s: ibm_int_off irq=%u returned %d\n",
+                        __func__, irq, call_status);
                 return;
         }
 
@@ -290,8 +241,8 @@ static void xics_mask_real_irq(unsigned int irq)
         call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq,
                                 default_server, 0xff);
         if (call_status != 0) {
-                printk(KERN_ERR "xics_disable_irq: irq=%u: ibm_set_xive(0xff)"
-                       " returned %d\n", irq, call_status);
+                printk(KERN_ERR "%s: ibm_set_xive(0xff) irq=%u returned %d\n",
+                        __func__, irq, call_status);
                 return;
         }
 }
@@ -308,132 +259,77 @@ static void xics_mask_irq(unsigned int virq)
         xics_mask_real_irq(irq);
 }
 
-static unsigned int xics_startup(unsigned int virq)
-{
-        unsigned int irq;
-
-        /* force a reverse mapping of the interrupt so it gets in the cache */
-        irq = (unsigned int)irq_map[virq].hwirq;
-        irq_radix_revmap(xics_host, irq);
-
-        /* unmask it */
-        xics_unmask_irq(virq);
-        return 0;
-}
-
-static void xics_eoi_direct(unsigned int virq)
+static void xics_mask_unknown_vec(unsigned int vec)
 {
-        unsigned int irq = (unsigned int)irq_map[virq].hwirq;
-
-        iosync();
-        direct_xirr_info_set((0xff << 24) | irq);
+        printk(KERN_ERR "Interrupt %u (real) is invalid, disabling it.\n", vec);
+        xics_mask_real_irq(vec);
 }
 
-
-static void xics_eoi_lpar(unsigned int virq)
+static inline unsigned int xics_xirr_vector(unsigned int xirr)
 {
-        unsigned int irq = (unsigned int)irq_map[virq].hwirq;
-
-        iosync();
-        lpar_xirr_info_set((0xff << 24) | irq);
+        /*
+         * The top byte is the old cppr, to be restored on EOI.
+         * The remaining 24 bits are the vector.
+         */
+        return xirr & 0x00ffffff;
 }
 
-static inline unsigned int xics_remap_irq(unsigned int vec)
+static unsigned int xics_get_irq_direct(void)
 {
+        unsigned int xirr = direct_xirr_info_get();
+        unsigned int vec = xics_xirr_vector(xirr);
         unsigned int irq;
 
-        vec &= 0x00ffffff;
-
         if (vec == XICS_IRQ_SPURIOUS)
                 return NO_IRQ;
-        irq = irq_radix_revmap(xics_host, vec);
+
+        irq = irq_radix_revmap_lookup(xics_host, vec);
         if (likely(irq != NO_IRQ))
                 return irq;
 
-        printk(KERN_ERR "Interrupt %u (real) is invalid,"
-               " disabling it.\n", vec);
-        xics_mask_real_irq(vec);
-        return NO_IRQ;
-}
+        /* We don't have a linux mapping, so have rtas mask it. */
+        xics_mask_unknown_vec(vec);
 
-static unsigned int xics_get_irq_direct(void)
-{
-        return xics_remap_irq(direct_xirr_info_get());
+        /* We might learn about it later, so EOI it */
+        direct_xirr_info_set(xirr);
+        return NO_IRQ;
 }
 
 static unsigned int xics_get_irq_lpar(void)
 {
-        return xics_remap_irq(lpar_xirr_info_get());
-}
-
-#ifdef CONFIG_SMP
-
-static irqreturn_t xics_ipi_dispatch(int cpu)
-{
-        WARN_ON(cpu_is_offline(cpu));
+        unsigned int xirr = lpar_xirr_info_get();
+        unsigned int vec = xics_xirr_vector(xirr);
+        unsigned int irq;
 
-        while (xics_ipi_message[cpu].value) {
-                if (test_and_clear_bit(PPC_MSG_CALL_FUNCTION,
-                                       &xics_ipi_message[cpu].value)) {
-                        mb();
-                        smp_message_recv(PPC_MSG_CALL_FUNCTION);
-                }
-                if (test_and_clear_bit(PPC_MSG_RESCHEDULE,
-                                       &xics_ipi_message[cpu].value)) {
-                        mb();
-                        smp_message_recv(PPC_MSG_RESCHEDULE);
-                }
-                if (test_and_clear_bit(PPC_MSG_CALL_FUNC_SINGLE,
-                                       &xics_ipi_message[cpu].value)) {
-                        mb();
-                        smp_message_recv(PPC_MSG_CALL_FUNC_SINGLE);
-                }
-#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
-                if (test_and_clear_bit(PPC_MSG_DEBUGGER_BREAK,
-                                       &xics_ipi_message[cpu].value)) {
-                        mb();
-                        smp_message_recv(PPC_MSG_DEBUGGER_BREAK);
-                }
-#endif
-        }
-        return IRQ_HANDLED;
-}
+        if (vec == XICS_IRQ_SPURIOUS)
+                return NO_IRQ;
 
-static irqreturn_t xics_ipi_action_direct(int irq, void *dev_id)
-{
-        int cpu = smp_processor_id();
+        irq = irq_radix_revmap_lookup(xics_host, vec);
+        if (likely(irq != NO_IRQ))
+                return irq;
 
-        direct_qirr_info(cpu, 0xff);
+        /* We don't have a linux mapping, so have RTAS mask it. */
+        xics_mask_unknown_vec(vec);
 
-        return xics_ipi_dispatch(cpu);
+        /* We might learn about it later, so EOI it */
+        lpar_xirr_info_set(xirr);
+        return NO_IRQ;
 }
 
-static irqreturn_t xics_ipi_action_lpar(int irq, void *dev_id)
+static void xics_eoi_direct(unsigned int virq)
 {
-        int cpu = smp_processor_id();
-
-        lpar_qirr_info(cpu, 0xff);
+        unsigned int irq = (unsigned int)irq_map[virq].hwirq;
 
-        return xics_ipi_dispatch(cpu);
+        iosync();
+        direct_xirr_info_set((0xff << 24) | irq);
 }
 
-void xics_cause_IPI(int cpu)
+static void xics_eoi_lpar(unsigned int virq)
 {
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                lpar_qirr_info(cpu, IPI_PRIORITY);
-        else
-                direct_qirr_info(cpu, IPI_PRIORITY);
-}
-
-#endif /* CONFIG_SMP */
+        unsigned int irq = (unsigned int)irq_map[virq].hwirq;
 
-static void xics_set_cpu_priority(unsigned char cppr)
-{
-        if (firmware_has_feature(FW_FEATURE_LPAR))
-                lpar_cppr_info(cppr);
-        else
-                direct_cppr_info(cppr);
         iosync();
+        lpar_xirr_info_set((0xff << 24) | irq);
 }
 
 static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
@@ -450,8 +346,8 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
         status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq);
 
         if (status) {
-                printk(KERN_ERR "xics_set_affinity: irq=%u ibm,get-xive "
-                       "returns %d\n", irq, status);
+                printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n",
+                        __func__, irq, status);
                 return;
         }
 
@@ -463,8 +359,9 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
         if (irq_server == -1) {
                 char cpulist[128];
                 cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
-                printk(KERN_WARNING "xics_set_affinity: No online cpus in "
-                                "the mask %s for irq %d\n", cpulist, virq);
+                printk(KERN_WARNING
+                        "%s: No online cpus in the mask %s for irq %d\n",
+                        __func__, cpulist, virq);
                 return;
         }
 
@@ -472,28 +369,12 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
                                 irq, irq_server, xics_status[1]);
 
         if (status) {
-                printk(KERN_ERR "xics_set_affinity: irq=%u ibm,set-xive "
-                       "returns %d\n", irq, status);
+                printk(KERN_ERR "%s: ibm,set-xive irq=%u returns %d\n",
+                        __func__, irq, status);
                 return;
         }
 }
 
-void xics_setup_cpu(void)
-{
-        xics_set_cpu_priority(0xff);
-
-        /*
-         * Put the calling processor into the GIQ.  This is really only
-         * necessary from a secondary thread as the OF start-cpu interface
-         * performs this function for us on primary threads.
-         *
-         * XXX: undo of teardown on kexec needs this too, as may hotplug
-         */
-        rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE,
-                (1UL << interrupt_server_size) - 1 - default_distrib_server, 1);
-}
-
-
 static struct irq_chip xics_pic_direct = {
         .typename = " XICS     ",
         .startup = xics_startup,
@@ -503,7 +384,6 @@ static struct irq_chip xics_pic_direct = {
         .set_affinity = xics_set_affinity
 };
 
-
 static struct irq_chip xics_pic_lpar = {
         .typename = " XICS     ",
         .startup = xics_startup,
@@ -513,6 +393,9 @@ static struct irq_chip xics_pic_lpar = {
         .set_affinity = xics_set_affinity
 };
 
+
+/* Interface to arch irq controller subsystem layer */
+
 /* Points to the irq_chip we're actually using */
 static struct irq_chip *xics_irq_chip;
 
@@ -530,6 +413,9 @@ static int xics_host_map(struct irq_host *h, unsigned int virq,
 {
         pr_debug("xics: map virq %d, hwirq 0x%lx\n", virq, hw);
 
+        /* Insert the interrupt mapping into the radix tree for fast lookup */
+        irq_radix_revmap_insert(xics_host, virq, hw);
+
         get_irq_desc(virq)->status |= IRQ_LEVEL;
         set_irq_chip_and_handler(virq, xics_irq_chip, handle_fasteoi_irq);
         return 0;
@@ -569,10 +455,169 @@ static void __init xics_init_host(void)
         irq_set_default_host(xics_host);
 }
 
+
+/* Inter-processor interrupt support */
+
+#ifdef CONFIG_SMP
+/*
+ * XICS only has a single IPI, so encode the messages per CPU
+ */
+struct xics_ipi_struct {
+        unsigned long value;
+        } ____cacheline_aligned;
+
+static struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;
+
+static inline void smp_xics_do_message(int cpu, int msg)
+{
+        set_bit(msg, &xics_ipi_message[cpu].value);
+        mb();
+        if (firmware_has_feature(FW_FEATURE_LPAR))
+                lpar_qirr_info(cpu, IPI_PRIORITY);
+        else
+                direct_qirr_info(cpu, IPI_PRIORITY);
+}
+
+void smp_xics_message_pass(int target, int msg)
+{
+        unsigned int i;
+
+        if (target < NR_CPUS) {
+                smp_xics_do_message(target, msg);
+        } else {
+                for_each_online_cpu(i) {
+                        if (target == MSG_ALL_BUT_SELF
+                            && i == smp_processor_id())
+                                continue;
+                        smp_xics_do_message(i, msg);
+                }
+        }
+}
+
+static irqreturn_t xics_ipi_dispatch(int cpu)
+{
+        WARN_ON(cpu_is_offline(cpu));
+
+        mb();   /* order mmio clearing qirr */
+        while (xics_ipi_message[cpu].value) {
+                if (test_and_clear_bit(PPC_MSG_CALL_FUNCTION,
+                                       &xics_ipi_message[cpu].value)) {
+                        smp_message_recv(PPC_MSG_CALL_FUNCTION);
+                }
+                if (test_and_clear_bit(PPC_MSG_RESCHEDULE,
+                                       &xics_ipi_message[cpu].value)) {
+                        smp_message_recv(PPC_MSG_RESCHEDULE);
+                }
+                if (test_and_clear_bit(PPC_MSG_CALL_FUNC_SINGLE,
+                                       &xics_ipi_message[cpu].value)) {
+                        smp_message_recv(PPC_MSG_CALL_FUNC_SINGLE);
+                }
+#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
+                if (test_and_clear_bit(PPC_MSG_DEBUGGER_BREAK,
+                                       &xics_ipi_message[cpu].value)) {
+                        smp_message_recv(PPC_MSG_DEBUGGER_BREAK);
+                }
+#endif
+        }
+        return IRQ_HANDLED;
+}
+
+static irqreturn_t xics_ipi_action_direct(int irq, void *dev_id)
+{
+        int cpu = smp_processor_id();
+
+        direct_qirr_info(cpu, 0xff);
+
+        return xics_ipi_dispatch(cpu);
+}
+
+static irqreturn_t xics_ipi_action_lpar(int irq, void *dev_id)
+{
+        int cpu = smp_processor_id();
+
+        lpar_qirr_info(cpu, 0xff);
+
+        return xics_ipi_dispatch(cpu);
+}
+
+static void xics_request_ipi(void)
+{
+        unsigned int ipi;
+        int rc;
+
+        ipi = irq_create_mapping(xics_host, XICS_IPI);
+        BUG_ON(ipi == NO_IRQ);
+
+        /*
+         * IPIs are marked IRQF_DISABLED as they must run with irqs
+         * disabled
+         */
+        set_irq_handler(ipi, handle_percpu_irq);
+        if (firmware_has_feature(FW_FEATURE_LPAR))
+                rc = request_irq(ipi, xics_ipi_action_lpar,
+                                IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);
+        else
+                rc = request_irq(ipi, xics_ipi_action_direct,
+                                IRQF_DISABLED|IRQF_PERCPU, "IPI", NULL);
+        BUG_ON(rc);
+}
+
+int __init smp_xics_probe(void)
+{
+        xics_request_ipi();
+
+        return cpus_weight(cpu_possible_map);
+}
+
+#endif /* CONFIG_SMP */
+
+
+/* Initialization */
+
+static void xics_update_irq_servers(void)
+{
+        int i, j;
+        struct device_node *np;
+        u32 ilen;
+        const u32 *ireg, *isize;
+        u32 hcpuid;
+
+        /* Find the server numbers for the boot cpu. */
+        np = of_get_cpu_node(boot_cpuid, NULL);
+        BUG_ON(!np);
+
+        ireg = of_get_property(np, "ibm,ppc-interrupt-gserver#s", &ilen);
+        if (!ireg) {
+                of_node_put(np);
+                return;
+        }
+
+        i = ilen / sizeof(int);
+        hcpuid = get_hard_smp_processor_id(boot_cpuid);
+
+        /* Global interrupt distribution server is specified in the last
+         * entry of "ibm,ppc-interrupt-gserver#s" property. Get the last
+         * entry fom this property for current boot cpu id and use it as
+         * default distribution server
+         */
+        for (j = 0; j < i; j += 2) {
+                if (ireg[j] == hcpuid) {
+                        default_server = hcpuid;
+                        default_distrib_server = ireg[j+1];
+                }
+        }
+
+        /* get the bit size of server numbers */
+        isize = of_get_property(np, "ibm,interrupt-server#-size", NULL);
+        if (isize)
+                interrupt_server_size = *isize;
+
+        of_node_put(np);
+}
+
 static void __init xics_map_one_cpu(int hw_id, unsigned long addr,
                                      unsigned long size)
 {
-#ifdef CONFIG_SMP
         int i;
 
         /* This may look gross but it's good enough for now, we don't quite
@@ -586,11 +631,6 @@ static void __init xics_map_one_cpu(int hw_id, unsigned long addr,
                         return;
                 }
         }
-#else
-        if (hw_id != 0)
-                return;
-        xics_per_cpu[0] = ioremap(addr, size);
-#endif /* CONFIG_SMP */
 }
 
 static void __init xics_init_one_node(struct device_node *np,
@@ -652,15 +692,17 @@ void __init xics_init_IRQ(void)
 
         for_each_node_by_type(np, "PowerPC-External-Interrupt-Presentation") {
                 found = 1;
-                if (firmware_has_feature(FW_FEATURE_LPAR))
+                if (firmware_has_feature(FW_FEATURE_LPAR)) {
+                        of_node_put(np);
                         break;
+                        }
                 xics_init_one_node(np, &indx);
         }
         if (found == 0)
                 return;
 
-        xics_init_host();
         xics_update_irq_servers();
+        xics_init_host();
 
         if (firmware_has_feature(FW_FEATURE_LPAR))
                 ppc_md.get_irq = xics_get_irq_lpar;
@@ -672,30 +714,31 @@ void __init xics_init_IRQ(void)
         ppc64_boot_msg(0x21, "XICS Done");
 }
 
+/* Cpu startup, shutdown, and hotplug */
 
-#ifdef CONFIG_SMP
-void xics_request_IPIs(void)
+static void xics_set_cpu_priority(unsigned char cppr)
 {
-        unsigned int ipi;
-        int rc;
-
-        ipi = irq_create_mapping(xics_host, XICS_IPI);
-        BUG_ON(ipi == NO_IRQ);
-
-        /*
-         * IPIs are marked IRQF_DISABLED as they must run with irqs
-         * disabled
-         */
-        set_irq_handler(ipi, handle_percpu_irq);
         if (firmware_has_feature(FW_FEATURE_LPAR))
-                rc = request_irq(ipi, xics_ipi_action_lpar, IRQF_DISABLED,
-                                "IPI", NULL);
+                lpar_cppr_info(cppr);
         else
-                rc = request_irq(ipi, xics_ipi_action_direct, IRQF_DISABLED,
-                                "IPI", NULL);
-        BUG_ON(rc);
+                direct_cppr_info(cppr);
+        iosync();
+}
+
+/* Have the calling processor join or leave the specified global queue */
+static void xics_set_cpu_giq(unsigned int gserver, unsigned int join)
+{
+        int status = rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE,
+                (1UL << interrupt_server_size) - 1 - gserver, join);
+        WARN_ON(status < 0);
+}
+
+void xics_setup_cpu(void)
+{
+        xics_set_cpu_priority(0xff);
+
+        xics_set_cpu_giq(default_distrib_server, 1);
 }
-#endif /* CONFIG_SMP */
 
 void xics_teardown_cpu(void)
 {
@@ -703,9 +746,7 @@ void xics_teardown_cpu(void)
 
         xics_set_cpu_priority(0);
 
-        /*
-         * Clear IPI
-         */
+        /* Clear any pending IPI request */
         if (firmware_has_feature(FW_FEATURE_LPAR))
                 lpar_qirr_info(cpu, 0xff);
         else
@@ -714,34 +755,28 @@ void xics_teardown_cpu(void)
 
 void xics_kexec_teardown_cpu(int secondary)
 {
-        unsigned int ipi;
-        struct irq_desc *desc;
-
         xics_teardown_cpu();
 
         /*
-         * we need to EOI the IPI
+         * we take the ipi irq but and never return so we
+         * need to EOI the IPI, but want to leave our priority 0
          *
-         * probably need to check all the other interrupts too
+         * should we check all the other interrupts too?
          * should we be flagging idle loop instead?
          * or creating some task to be scheduled?
          */
 
-        ipi = irq_find_mapping(xics_host, XICS_IPI);
-        if (ipi == XICS_IRQ_SPURIOUS)
-                return;
-        desc = get_irq_desc(ipi);
-        if (desc->chip && desc->chip->eoi)
-                desc->chip->eoi(ipi);
+        if (firmware_has_feature(FW_FEATURE_LPAR))
+                lpar_xirr_info_set((0x00 << 24) | XICS_IPI);
+        else
+                direct_xirr_info_set((0x00 << 24) | XICS_IPI);
 
         /*
          * Some machines need to have at least one cpu in the GIQ,
          * so leave the master cpu in the group.
          */
         if (secondary)
-                rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE,
-                                   (1UL << interrupt_server_size) - 1 -
-                                   default_distrib_server, 0);
+                xics_set_cpu_giq(default_distrib_server, 0);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
@@ -749,17 +784,18 @@ void xics_kexec_teardown_cpu(int secondary)
 /* Interrupts are disabled. */
 void xics_migrate_irqs_away(void)
 {
-        int status;
         int cpu = smp_processor_id(), hw_cpu = hard_smp_processor_id();
         unsigned int irq, virq;
 
+        /* If we used to be the default server, move to the new "boot_cpuid" */
+        if (hw_cpu == default_server)
+                xics_update_irq_servers();
+
         /* Reject any interrupt that was queued to us... */
         xics_set_cpu_priority(0);
 
-        /* remove ourselves from the global interrupt queue */
-        status = rtas_set_indicator_fast(GLOBAL_INTERRUPT_QUEUE,
-                (1UL << interrupt_server_size) - 1 - default_distrib_server, 0);
-        WARN_ON(status < 0);
+        /* Remove ourselves from the global interrupt queue */
+        xics_set_cpu_giq(default_distrib_server, 0);
 
         /* Allow IPIs again... */
         xics_set_cpu_priority(DEFAULT_PRIORITY);
@@ -767,6 +803,7 @@ void xics_migrate_irqs_away(void)
         for_each_irq(virq) {
                 struct irq_desc *desc;
                 int xics_status[2];
+                int status;
                 unsigned long flags;
 
                 /* We cant set affinity on ISA interrupts */
@@ -790,9 +827,8 @@ void xics_migrate_irqs_away(void)
 
                 status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq);
                 if (status) {
-                        printk(KERN_ERR "migrate_irqs_away: irq=%u "
-                                        "ibm,get-xive returns %d\n",
-                                        virq, status);
+                        printk(KERN_ERR "%s: ibm,get-xive irq=%u returns %d\n",
+                                        __func__, irq, status);
                         goto unlock;
                 }
 
diff --git a/arch/powerpc/platforms/pseries/xics.h b/arch/powerpc/platforms/pseries/xics.h
index 1c5321ae8f2f..d1d5a83039ae 100644
--- a/arch/powerpc/platforms/pseries/xics.h
+++ b/arch/powerpc/platforms/pseries/xics.h
@@ -12,20 +12,12 @@
 #ifndef _POWERPC_KERNEL_XICS_H
 #define _POWERPC_KERNEL_XICS_H
 
-#include <linux/cache.h>
-
 extern void xics_init_IRQ(void);
 extern void xics_setup_cpu(void);
 extern void xics_teardown_cpu(void);
 extern void xics_kexec_teardown_cpu(int secondary);
-extern void xics_cause_IPI(int cpu);
-extern  void xics_request_IPIs(void);
 extern void xics_migrate_irqs_away(void);
-
-struct xics_ipi_struct {
-        volatile unsigned long value;
-} ____cacheline_aligned;
-
-extern struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;
+extern int smp_xics_probe(void);
+extern void smp_xics_message_pass(int target, int msg);
 
 #endif /* _POWERPC_KERNEL_XICS_H */
diff --git a/arch/powerpc/sysdev/Kconfig b/arch/powerpc/sysdev/Kconfig
index 72fb35b9ebca..396582835cb5 100644
--- a/arch/powerpc/sysdev/Kconfig
+++ b/arch/powerpc/sysdev/Kconfig
@@ -6,3 +6,9 @@ config PPC4xx_PCI_EXPRESS
         bool
         depends on PCI && 4xx
         default n
+
+config PPC_MSI_BITMAP
+        bool
+        depends on PCI_MSI
+        default y if MPIC
+        default y if FSL_PCI
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index a90054b56d5c..a44709a94f97 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -5,6 +5,7 @@ endif
 mpic-msi-obj-$(CONFIG_PCI_MSI)  += mpic_msi.o mpic_u3msi.o mpic_pasemi_msi.o
 obj-$(CONFIG_MPIC)              += mpic.o $(mpic-msi-obj-y)
 fsl-msi-obj-$(CONFIG_PCI_MSI)   += fsl_msi.o
+obj-$(CONFIG_PPC_MSI_BITMAP)    += msi_bitmap.o
 
 obj-$(CONFIG_PPC_MPC106)        += grackle.o
 obj-$(CONFIG_PPC_DCR_NATIVE)    += dcr-low.o
@@ -15,6 +16,7 @@ obj-$(CONFIG_FSL_SOC)		+= fsl_soc.o
 obj-$(CONFIG_FSL_PCI)           += fsl_pci.o $(fsl-msi-obj-y)
 obj-$(CONFIG_FSL_LBC)           += fsl_lbc.o
 obj-$(CONFIG_FSL_GTM)           += fsl_gtm.o
+obj-$(CONFIG_MPC8xxx_GPIO)      += mpc8xxx_gpio.o
 obj-$(CONFIG_RAPIDIO)           += fsl_rio.o
 obj-$(CONFIG_TSI108_BRIDGE)     += tsi108_pci.o tsi108_dev.o
 obj-$(CONFIG_QUICC_ENGINE)      += qe_lib/
@@ -36,15 +38,12 @@ ifeq ($(CONFIG_PCI),y)
 obj-$(CONFIG_4xx)               += ppc4xx_pci.o
 endif
 
-# Temporary hack until we have migrated to asm-powerpc
-ifeq ($(ARCH),powerpc)
 obj-$(CONFIG_CPM)               += cpm_common.o
 obj-$(CONFIG_CPM2)              += cpm2.o cpm2_pic.o
 obj-$(CONFIG_QUICC_ENGINE)      += cpm_common.o
 obj-$(CONFIG_PPC_DCR)           += dcr.o
 obj-$(CONFIG_8xx)               += mpc8xx_pic.o cpm1.o
 obj-$(CONFIG_UCODE_PATCH)       += micropatch.o
-endif
 
 ifeq ($(CONFIG_SUSPEND),y)
 obj-$(CONFIG_6xx)               += 6xx-suspend.o
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 4a04823e8423..490473ce8103 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -546,15 +546,11 @@ static int cpm1_gpio16_get(struct gpio_chip *gc, unsigned int gpio)
         return !!(in_be16(&iop->dat) & pin_mask);
 }
 
-static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)
+static void __cpm1_gpio16_set(struct of_mm_gpio_chip *mm_gc, u16 pin_mask,
+        int value)
 {
-        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
         struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);
         struct cpm_ioport16 __iomem *iop = mm_gc->regs;
-        unsigned long flags;
-        u16 pin_mask = 1 << (15 - gpio);
-
-        spin_lock_irqsave(&cpm1_gc->lock, flags);
 
         if (value)
                 cpm1_gc->cpdata |= pin_mask;
@@ -562,6 +558,18 @@ static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)
                 cpm1_gc->cpdata &= ~pin_mask;
 
         out_be16(&iop->dat, cpm1_gc->cpdata);
+}
+
+static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);
+        unsigned long flags;
+        u16 pin_mask = 1 << (15 - gpio);
+
+        spin_lock_irqsave(&cpm1_gc->lock, flags);
+
+        __cpm1_gpio16_set(mm_gc, pin_mask, value);
 
         spin_unlock_irqrestore(&cpm1_gc->lock, flags);
 }
@@ -569,14 +577,17 @@ static void cpm1_gpio16_set(struct gpio_chip *gc, unsigned int gpio, int value)
 static int cpm1_gpio16_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 {
         struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);
         struct cpm_ioport16 __iomem *iop = mm_gc->regs;
-        u16 pin_mask;
+        unsigned long flags;
+        u16 pin_mask = 1 << (15 - gpio);
 
-        pin_mask = 1 << (15 - gpio);
+        spin_lock_irqsave(&cpm1_gc->lock, flags);
 
         setbits16(&iop->dir, pin_mask);
+        __cpm1_gpio16_set(mm_gc, pin_mask, val);
 
-        cpm1_gpio16_set(gc, gpio, val);
+        spin_unlock_irqrestore(&cpm1_gc->lock, flags);
 
         return 0;
 }
@@ -584,13 +595,17 @@ static int cpm1_gpio16_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 static int cpm1_gpio16_dir_in(struct gpio_chip *gc, unsigned int gpio)
 {
         struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct cpm1_gpio16_chip *cpm1_gc = to_cpm1_gpio16_chip(mm_gc);
         struct cpm_ioport16 __iomem *iop = mm_gc->regs;
-        u16 pin_mask;
+        unsigned long flags;
+        u16 pin_mask = 1 << (15 - gpio);
 
-        pin_mask = 1 << (15 - gpio);
+        spin_lock_irqsave(&cpm1_gc->lock, flags);
 
         clrbits16(&iop->dir, pin_mask);
 
+        spin_unlock_irqrestore(&cpm1_gc->lock, flags);
+
         return 0;
 }
 
@@ -655,15 +670,11 @@ static int cpm1_gpio32_get(struct gpio_chip *gc, unsigned int gpio)
         return !!(in_be32(&iop->dat) & pin_mask);
 }
 
-static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)
+static void __cpm1_gpio32_set(struct of_mm_gpio_chip *mm_gc, u32 pin_mask,
+        int value)
 {
-        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
         struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);
         struct cpm_ioport32b __iomem *iop = mm_gc->regs;
-        unsigned long flags;
-        u32 pin_mask = 1 << (31 - gpio);
-
-        spin_lock_irqsave(&cpm1_gc->lock, flags);
 
         if (value)
                 cpm1_gc->cpdata |= pin_mask;
@@ -671,6 +682,18 @@ static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)
                 cpm1_gc->cpdata &= ~pin_mask;
 
         out_be32(&iop->dat, cpm1_gc->cpdata);
+}
+
+static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)
+{
+        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);
+        unsigned long flags;
+        u32 pin_mask = 1 << (31 - gpio);
+
+        spin_lock_irqsave(&cpm1_gc->lock, flags);
+
+        __cpm1_gpio32_set(mm_gc, pin_mask, value);
 
         spin_unlock_irqrestore(&cpm1_gc->lock, flags);
 }
@@ -678,14 +701,17 @@ static void cpm1_gpio32_set(struct gpio_chip *gc, unsigned int gpio, int value)
 static int cpm1_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 {
         struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);
         struct cpm_ioport32b __iomem *iop = mm_gc->regs;
-        u32 pin_mask;
+        unsigned long flags;
+        u32 pin_mask = 1 << (31 - gpio);
 
-        pin_mask = 1 << (31 - gpio);
+        spin_lock_irqsave(&cpm1_gc->lock, flags);
 
         setbits32(&iop->dir, pin_mask);
+        __cpm1_gpio32_set(mm_gc, pin_mask, val);
 
-        cpm1_gpio32_set(gc, gpio, val);
+        spin_unlock_irqrestore(&cpm1_gc->lock, flags);
 
         return 0;
 }
@@ -693,13 +719,17 @@ static int cpm1_gpio32_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 static int cpm1_gpio32_dir_in(struct gpio_chip *gc, unsigned int gpio)
 {
         struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
+        struct cpm1_gpio32_chip *cpm1_gc = to_cpm1_gpio32_chip(mm_gc);
         struct cpm_ioport32b __iomem *iop = mm_gc->regs;
-        u32 pin_mask;
+        unsigned long flags;
+        u32 pin_mask = 1 << (31 - gpio);
 
-        pin_mask = 1 << (31 - gpio);
+        spin_lock_irqsave(&cpm1_gc->lock, flags);
 
         clrbits32(&iop->dir, pin_mask);
 
+        spin_unlock_irqrestore(&cpm1_gc->lock, flags);
+
         return 0;
 }
 
diff --git a/arch/powerpc/sysdev/fsl_lbc.c b/arch/powerpc/sysdev/fsl_lbc.c
index 422c8faef593..0494ee55920f 100644
--- a/arch/powerpc/sysdev/fsl_lbc.c
+++ b/arch/powerpc/sysdev/fsl_lbc.c
@@ -11,14 +11,19 @@
  * (at your option) any later version.
  */
 
+#include <linux/init.h>
+#include <linux/module.h>
 #include <linux/kernel.h>
+#include <linux/compiler.h>
+#include <linux/spinlock.h>
+#include <linux/types.h>
+#include <linux/io.h>
 #include <linux/of.h>
+#include <asm/prom.h>
 #include <asm/fsl_lbc.h>
 
-spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock);
-
-struct fsl_lbc_regs __iomem *fsl_lbc_regs;
-EXPORT_SYMBOL(fsl_lbc_regs);
+static spinlock_t fsl_lbc_lock = __SPIN_LOCK_UNLOCKED(fsl_lbc_lock);
+static struct fsl_lbc_regs __iomem *fsl_lbc_regs;
 
 static char __initdata *compat_lbc[] = {
         "fsl,pq2-localbus",
@@ -127,3 +132,43 @@ int fsl_upm_find(phys_addr_t addr_base, struct fsl_upm *upm)
         return 0;
 }
 EXPORT_SYMBOL(fsl_upm_find);
+
+/**
+ * fsl_upm_run_pattern - actually run an UPM pattern
+ * @upm:        pointer to the fsl_upm structure obtained via fsl_upm_find
+ * @io_base:    remapped pointer to where memory access should happen
+ * @mar:        MAR register content during pattern execution
+ *
+ * This function triggers dummy write to the memory specified by the io_base,
+ * thus UPM pattern actually executed. Note that mar usage depends on the
+ * pre-programmed AMX bits in the UPM RAM.
+ */
+int fsl_upm_run_pattern(struct fsl_upm *upm, void __iomem *io_base, u32 mar)
+{
+        int ret = 0;
+        unsigned long flags;
+
+        spin_lock_irqsave(&fsl_lbc_lock, flags);
+
+        out_be32(&fsl_lbc_regs->mar, mar << (32 - upm->width));
+
+        switch (upm->width) {
+        case 8:
+                out_8(io_base, 0x0);
+                break;
+        case 16:
+                out_be16(io_base, 0x0);
+                break;
+        case 32:
+                out_be32(io_base, 0x0);
+                break;
+        default:
+                ret = -EINVAL;
+                break;
+        }
+
+        spin_unlock_irqrestore(&fsl_lbc_lock, flags);
+
+        return ret;
+}
+EXPORT_SYMBOL(fsl_upm_run_pattern);
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 2c5187cc8a24..f25ce818d40a 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -14,7 +14,6 @@
  */
 #include <linux/irq.h>
 #include <linux/bootmem.h>
-#include <linux/bitmap.h>
 #include <linux/msi.h>
 #include <linux/pci.h>
 #include <linux/of_platform.h>
@@ -67,95 +66,22 @@ static struct irq_host_ops fsl_msi_host_ops = {
         .map = fsl_msi_host_map,
 };
 
-static irq_hw_number_t fsl_msi_alloc_hwirqs(struct fsl_msi *msi, int num)
-{
-        unsigned long flags;
-        int order = get_count_order(num);
-        int offset;
-
-        spin_lock_irqsave(&msi->bitmap_lock, flags);
-
-        offset = bitmap_find_free_region(msi->fsl_msi_bitmap,
-                                        NR_MSI_IRQS, order);
-
-        spin_unlock_irqrestore(&msi->bitmap_lock, flags);
-
-        pr_debug("%s: allocated 0x%x (2^%d) at offset 0x%x\n",
-                __func__, num, order, offset);
-
-        return offset;
-}
-
-static void fsl_msi_free_hwirqs(struct fsl_msi *msi, int offset, int num)
-{
-        unsigned long flags;
-        int order = get_count_order(num);
-
-        pr_debug("%s: freeing 0x%x (2^%d) at offset 0x%x\n",
-                __func__, num, order, offset);
-
-        spin_lock_irqsave(&msi->bitmap_lock, flags);
-        bitmap_release_region(msi->fsl_msi_bitmap, offset, order);
-        spin_unlock_irqrestore(&msi->bitmap_lock, flags);
-}
-
-static int fsl_msi_free_dt_hwirqs(struct fsl_msi *msi)
-{
-        int i;
-        int len;
-        const u32 *p;
-
-        bitmap_allocate_region(msi->fsl_msi_bitmap, 0,
-                       get_count_order(NR_MSI_IRQS));
-
-        p = of_get_property(msi->of_node, "msi-available-ranges", &len);
-
-        if (!p) {
-                /* No msi-available-ranges property,
-                 * All the 256 MSI interrupts can be used
-                 */
-                fsl_msi_free_hwirqs(msi, 0, 0x100);
-                return 0;
-        }
-
-        if ((len % (2 * sizeof(u32))) != 0) {
-                printk(KERN_WARNING "fsl_msi: Malformed msi-available-ranges "
-                       "property on %s\n", msi->of_node->full_name);
-                return -EINVAL;
-        }
-
-        /* Format is: (<u32 start> <u32 count>)+ */
-        len /= 2 * sizeof(u32);
-        for (i = 0; i < len; i++, p += 2)
-                fsl_msi_free_hwirqs(msi, *p, *(p + 1));
-
-        return 0;
-}
-
 static int fsl_msi_init_allocator(struct fsl_msi *msi_data)
 {
         int rc;
-        int size = BITS_TO_LONGS(NR_MSI_IRQS) * sizeof(u32);
 
-        msi_data->fsl_msi_bitmap = kzalloc(size, GFP_KERNEL);
+        rc = msi_bitmap_alloc(&msi_data->bitmap, NR_MSI_IRQS,
+                              msi_data->irqhost->of_node);
+        if (rc)
+                return rc;
 
-        if (msi_data->fsl_msi_bitmap == NULL) {
-                pr_debug("%s: ENOMEM allocating allocator bitmap!\n",
-                                __func__);
-                return -ENOMEM;
+        rc = msi_bitmap_reserve_dt_hwirqs(&msi_data->bitmap);
+        if (rc < 0) {
+                msi_bitmap_free(&msi_data->bitmap);
+                return rc;
         }
 
-        rc = fsl_msi_free_dt_hwirqs(msi_data);
-        if (rc)
-                goto out_free;
-
         return 0;
-out_free:
-        kfree(msi_data->fsl_msi_bitmap);
-
-        msi_data->fsl_msi_bitmap = NULL;
-        return rc;
-
 }
 
 static int fsl_msi_check_device(struct pci_dev *pdev, int nvec, int type)
@@ -175,7 +101,8 @@ static void fsl_teardown_msi_irqs(struct pci_dev *pdev)
                 if (entry->irq == NO_IRQ)
                         continue;
                 set_irq_msi(entry->irq, NULL);
-                fsl_msi_free_hwirqs(msi_data, virq_to_hw(entry->irq), 1);
+                msi_bitmap_free_hwirqs(&msi_data->bitmap,
+                                       virq_to_hw(entry->irq), 1);
                 irq_dispose_mapping(entry->irq);
         }
 
@@ -197,15 +124,14 @@ static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq,
 
 static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 {
-        irq_hw_number_t hwirq;
-        int rc;
+        int rc, hwirq;
         unsigned int virq;
         struct msi_desc *entry;
         struct msi_msg msg;
         struct fsl_msi *msi_data = fsl_msi;
 
         list_for_each_entry(entry, &pdev->msi_list, list) {
-                hwirq = fsl_msi_alloc_hwirqs(msi_data, 1);
+                hwirq = msi_bitmap_alloc_hwirqs(&msi_data->bitmap, 1);
                 if (hwirq < 0) {
                         rc = hwirq;
                         pr_debug("%s: fail allocating msi interrupt\n",
@@ -216,9 +142,9 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                 virq = irq_create_mapping(msi_data->irqhost, hwirq);
 
                 if (virq == NO_IRQ) {
-                        pr_debug("%s: fail mapping hwirq 0x%lx\n",
+                        pr_debug("%s: fail mapping hwirq 0x%x\n",
                                         __func__, hwirq);
-                        fsl_msi_free_hwirqs(msi_data, hwirq, 1);
+                        msi_bitmap_free_hwirqs(&msi_data->bitmap, hwirq, 1);
                         rc = -ENOSPC;
                         goto out_free;
                 }
@@ -317,14 +243,11 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
                 goto error_out;
         }
 
-        msi->of_node = of_node_get(dev->node);
+        msi->irqhost = irq_alloc_host(dev->node, IRQ_HOST_MAP_LINEAR,
+                                      NR_MSI_IRQS, &fsl_msi_host_ops, 0);
 
-        msi->irqhost = irq_alloc_host(of_node_get(dev->node),
-                                IRQ_HOST_MAP_LINEAR,
-                                NR_MSI_IRQS, &fsl_msi_host_ops, 0);
         if (msi->irqhost == NULL) {
                 dev_err(&dev->dev, "No memory for MSI irqhost\n");
-                of_node_put(dev->node);
                 err = -ENOMEM;
                 goto error_out;
         }
diff --git a/arch/powerpc/sysdev/fsl_msi.h b/arch/powerpc/sysdev/fsl_msi.h
index a653468521fa..331c7e7025b7 100644
--- a/arch/powerpc/sysdev/fsl_msi.h
+++ b/arch/powerpc/sysdev/fsl_msi.h
@@ -13,6 +13,8 @@
 #ifndef _POWERPC_SYSDEV_FSL_MSI_H
 #define _POWERPC_SYSDEV_FSL_MSI_H
 
+#include <asm/msi_bitmap.h>
+
 #define NR_MSI_REG              8
 #define IRQS_PER_MSI_REG        32
 #define NR_MSI_IRQS     (NR_MSI_REG * IRQS_PER_MSI_REG)
@@ -22,9 +24,6 @@
 #define FSL_PIC_IP_IPIC 0x00000002
 
 struct fsl_msi {
-        /* Device node of the MSI interrupt*/
-        struct device_node *of_node;
-
         struct irq_host *irqhost;
 
         unsigned long cascade_irq;
@@ -34,8 +33,7 @@ struct fsl_msi {
         void __iomem *msi_regs;
         u32 feature;
 
-        unsigned long *fsl_msi_bitmap;
-        spinlock_t bitmap_lock;
+        struct msi_bitmap bitmap;
 };
 
 #endif /* _POWERPC_SYSDEV_FSL_MSI_H */
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 61e6d77efa4f..5b264eb4b1f7 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -1,7 +1,7 @@
 /*
- * MPC85xx/86xx PCI/PCIE support routing.
+ * MPC83xx/85xx/86xx PCI/PCIE support routing.
  *
- * Copyright 2007 Freescale Semiconductor, Inc
+ * Copyright 2007,2008 Freescale Semiconductor, Inc
  *
  * Initial author: Xianghua Xiao <x.xiao@freescale.com>
  * Recode: ZHANG WEI <wei.zhang@freescale.com>
@@ -251,20 +251,47 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);
 #endif /* CONFIG_PPC_85xx || CONFIG_PPC_86xx */
 
-#if defined(CONFIG_PPC_83xx)
+#if defined(CONFIG_PPC_83xx) || defined(CONFIG_PPC_MPC512x)
 int __init mpc83xx_add_bridge(struct device_node *dev)
 {
         int len;
         struct pci_controller *hose;
-        struct resource rsrc;
+        struct resource rsrc_reg;
+        struct resource rsrc_cfg;
         const int *bus_range;
-        int primary = 1, has_address = 0;
-        phys_addr_t immr = get_immrbase();
+        int primary;
 
         pr_debug("Adding PCI host bridge %s\n", dev->full_name);
 
         /* Fetch host bridge registers address */
-        has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
+        if (of_address_to_resource(dev, 0, &rsrc_reg)) {
+                printk(KERN_WARNING "Can't get pci register base!\n");
+                return -ENOMEM;
+        }
+
+        memset(&rsrc_cfg, 0, sizeof(rsrc_cfg));
+
+        if (of_address_to_resource(dev, 1, &rsrc_cfg)) {
+                printk(KERN_WARNING
+                        "No pci config register base in dev tree, "
+                        "using default\n");
+                /*
+                 * MPC83xx supports up to two host controllers
+                 *      one at 0x8500 has config space registers at 0x8300
+                 *      one at 0x8600 has config space registers at 0x8380
+                 */
+                if ((rsrc_reg.start & 0xfffff) == 0x8500)
+                        rsrc_cfg.start = (rsrc_reg.start & 0xfff00000) + 0x8300;
+                else if ((rsrc_reg.start & 0xfffff) == 0x8600)
+                        rsrc_cfg.start = (rsrc_reg.start & 0xfff00000) + 0x8380;
+        }
+        /*
+         * Controller at offset 0x8500 is primary
+         */
+        if ((rsrc_reg.start & 0xfffff) == 0x8500)
+                primary = 1;
+        else
+                primary = 0;
 
         /* Get bus range if any */
         bus_range = of_get_property(dev, "bus-range", &len);
@@ -281,22 +308,11 @@ int __init mpc83xx_add_bridge(struct device_node *dev)
         hose->first_busno = bus_range ? bus_range[0] : 0;
         hose->last_busno = bus_range ? bus_range[1] : 0xff;
 
-        /* MPC83xx supports up to two host controllers one at 0x8500 from immrbar
-         * the other at 0x8600, we consider the 0x8500 the primary controller
-         */
-        /* PCI 1 */
-        if ((rsrc.start & 0xfffff) == 0x8500) {
-                setup_indirect_pci(hose, immr + 0x8300, immr + 0x8304, 0);
-        }
-        /* PCI 2 */
-        if ((rsrc.start & 0xfffff) == 0x8600) {
-                setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384, 0);
-                primary = 0;
-        }
+        setup_indirect_pci(hose, rsrc_cfg.start, rsrc_cfg.start + 4, 0);
 
-        printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%016llx. "
+        printk(KERN_INFO "Found FSL PCI host bridge at 0x%016llx. "
                "Firmware bus number: %d->%d\n",
-               (unsigned long long)rsrc.start, hose->first_busno,
+               (unsigned long long)rsrc_reg.start, hose->first_busno,
                hose->last_busno);
 
         pr_debug(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 214388e11807..01b884b25696 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -412,53 +412,6 @@ err:
 
 arch_initcall(gfar_of_init);
 
-
-#ifdef CONFIG_PPC_83xx
-static int __init mpc83xx_wdt_init(void)
-{
-        struct resource r;
-        struct device_node *np;
-        struct platform_device *dev;
-        u32 freq = fsl_get_sys_freq();
-        int ret;
-
-        np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");
-
-        if (!np) {
-                ret = -ENODEV;
-                goto nodev;
-        }
-
-        memset(&r, 0, sizeof(r));
-
-        ret = of_address_to_resource(np, 0, &r);
-        if (ret)
-                goto err;
-
-        dev = platform_device_register_simple("mpc83xx_wdt", 0, &r, 1);
-        if (IS_ERR(dev)) {
-                ret = PTR_ERR(dev);
-                goto err;
-        }
-
-        ret = platform_device_add_data(dev, &freq, sizeof(freq));
-        if (ret)
-                goto unreg;
-
-        of_node_put(np);
-        return 0;
-
-unreg:
-        platform_device_unregister(dev);
-err:
-        of_node_put(np);
-nodev:
-        return ret;
-}
-
-arch_initcall(mpc83xx_wdt_init);
-#endif
-
 static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type)
 {
         if (!phy_type)
@@ -767,42 +720,6 @@ void fsl_rstcr_restart(char *cmd)
 #endif
 
 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
-struct platform_diu_data_ops diu_ops = {
-        .diu_size = 1280 * 1024 * 4,    /* default one 1280x1024 buffer */
-};
+struct platform_diu_data_ops diu_ops;
 EXPORT_SYMBOL(diu_ops);
-
-int __init preallocate_diu_videomemory(void)
-{
-        pr_debug("diu_size=%lu\n", diu_ops.diu_size);
-
-        diu_ops.diu_mem = __alloc_bootmem(diu_ops.diu_size, 8, 0);
-        if (!diu_ops.diu_mem) {
-                printk(KERN_ERR "fsl-diu: cannot allocate %lu bytes\n",
-                        diu_ops.diu_size);
-                return -ENOMEM;
-        }
-
-        pr_debug("diu_mem=%p\n", diu_ops.diu_mem);
-
-        rh_init(&diu_ops.diu_rh_info, 4096, ARRAY_SIZE(diu_ops.diu_rh_block),
-                diu_ops.diu_rh_block);
-        return rh_attach_region(&diu_ops.diu_rh_info,
-                                (unsigned long) diu_ops.diu_mem,
-                                diu_ops.diu_size);
-}
-
-static int __init early_parse_diufb(char *p)
-{
-        if (!p)
-                return 1;
-
-        diu_ops.diu_size = _ALIGN_UP(memparse(p, &p), 8);
-
-        pr_debug("diu_size=%lu\n", diu_ops.diu_size);
-
-        return 0;
-}
-early_param("diufb", early_parse_diufb);
-
 #endif
diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h
index 024299887352..60f7f227327c 100644
--- a/arch/powerpc/sysdev/fsl_soc.h
+++ b/arch/powerpc/sysdev/fsl_soc.h
@@ -20,14 +20,7 @@ extern int fsl_spi_init(struct spi_board_info *board_infos,
 extern void fsl_rstcr_restart(char *cmd);
 
 #if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
-#include <linux/bootmem.h>
-#include <asm/rheap.h>
 struct platform_diu_data_ops {
-        rh_block_t diu_rh_block[16];
-        rh_info_t diu_rh_info;
-        unsigned long diu_size;
-        void *diu_mem;
-
         unsigned int (*get_pixel_format) (unsigned int bits_per_pixel,
                 int monitor_port);
         void (*set_gamma_table) (int monitor_port, char *gamma_table_base);
@@ -38,7 +31,6 @@ struct platform_diu_data_ops {
 };
 
 extern struct platform_diu_data_ops diu_ops;
-int __init preallocate_diu_videomemory(void);
 #endif
 
 #endif
diff --git a/arch/powerpc/sysdev/mpc8xxx_gpio.c b/arch/powerpc/sysdev/mpc8xxx_gpio.c
new file mode 100644
index 000000000000..103eace36194
--- /dev/null
+++ b/arch/powerpc/sysdev/mpc8xxx_gpio.c
@@ -0,0 +1,171 @@
+/*
+ * GPIOs on MPC8349/8572/8610 and compatible
+ *
+ * Copyright (C) 2008 Peter Korsgaard <jacmet@sunsite.dk>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/gpio.h>
+
+#define MPC8XXX_GPIO_PINS       32
+
+#define GPIO_DIR                0x00
+#define GPIO_ODR                0x04
+#define GPIO_DAT                0x08
+#define GPIO_IER                0x0c
+#define GPIO_IMR                0x10
+#define GPIO_ICR                0x14
+
+struct mpc8xxx_gpio_chip {
+        struct of_mm_gpio_chip mm_gc;
+        spinlock_t lock;
+
+        /*
+         * shadowed data register to be able to clear/set output pins in
+         * open drain mode safely
+         */
+        u32 data;
+};
+
+static inline u32 mpc8xxx_gpio2mask(unsigned int gpio)
+{
+        return 1u << (MPC8XXX_GPIO_PINS - 1 - gpio);
+}
+
+static inline struct mpc8xxx_gpio_chip *
+to_mpc8xxx_gpio_chip(struct of_mm_gpio_chip *mm)
+{
+        return container_of(mm, struct mpc8xxx_gpio_chip, mm_gc);
+}
+
+static void mpc8xxx_gpio_save_regs(struct of_mm_gpio_chip *mm)
+{
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);
+
+        mpc8xxx_gc->data = in_be32(mm->regs + GPIO_DAT);
+}
+
+static int mpc8xxx_gpio_get(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
+
+        return in_be32(mm->regs + GPIO_DAT) & mpc8xxx_gpio2mask(gpio);
+}
+
+static void mpc8xxx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);
+        unsigned long flags;
+
+        spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+
+        if (val)
+                mpc8xxx_gc->data |= mpc8xxx_gpio2mask(gpio);
+        else
+                mpc8xxx_gc->data &= ~mpc8xxx_gpio2mask(gpio);
+
+        out_be32(mm->regs + GPIO_DAT, mpc8xxx_gc->data);
+
+        spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+}
+
+static int mpc8xxx_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
+{
+        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);
+        unsigned long flags;
+
+        spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+
+        clrbits32(mm->regs + GPIO_DIR, mpc8xxx_gpio2mask(gpio));
+
+        spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+
+        return 0;
+}
+
+static int mpc8xxx_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
+{
+        struct of_mm_gpio_chip *mm = to_of_mm_gpio_chip(gc);
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc = to_mpc8xxx_gpio_chip(mm);
+        unsigned long flags;
+
+        mpc8xxx_gpio_set(gc, gpio, val);
+
+        spin_lock_irqsave(&mpc8xxx_gc->lock, flags);
+
+        setbits32(mm->regs + GPIO_DIR, mpc8xxx_gpio2mask(gpio));
+
+        spin_unlock_irqrestore(&mpc8xxx_gc->lock, flags);
+
+        return 0;
+}
+
+static void __init mpc8xxx_add_controller(struct device_node *np)
+{
+        struct mpc8xxx_gpio_chip *mpc8xxx_gc;
+        struct of_mm_gpio_chip *mm_gc;
+        struct of_gpio_chip *of_gc;
+        struct gpio_chip *gc;
+        int ret;
+
+        mpc8xxx_gc = kzalloc(sizeof(*mpc8xxx_gc), GFP_KERNEL);
+        if (!mpc8xxx_gc) {
+                ret = -ENOMEM;
+                goto err;
+        }
+
+        spin_lock_init(&mpc8xxx_gc->lock);
+
+        mm_gc = &mpc8xxx_gc->mm_gc;
+        of_gc = &mm_gc->of_gc;
+        gc = &of_gc->gc;
+
+        mm_gc->save_regs = mpc8xxx_gpio_save_regs;
+        of_gc->gpio_cells = 2;
+        gc->ngpio = MPC8XXX_GPIO_PINS;
+        gc->direction_input = mpc8xxx_gpio_dir_in;
+        gc->direction_output = mpc8xxx_gpio_dir_out;
+        gc->get = mpc8xxx_gpio_get;
+        gc->set = mpc8xxx_gpio_set;
+
+        ret = of_mm_gpiochip_add(np, mm_gc);
+        if (ret)
+                goto err;
+
+        return;
+
+err:
+        pr_err("%s: registration failed with status %d\n",
+               np->full_name, ret);
+        kfree(mpc8xxx_gc);
+
+        return;
+}
+
+static int __init mpc8xxx_add_gpiochips(void)
+{
+        struct device_node *np;
+
+        for_each_compatible_node(np, NULL, "fsl,mpc8349-gpio")
+                mpc8xxx_add_controller(np);
+
+        for_each_compatible_node(np, NULL, "fsl,mpc8572-gpio")
+                mpc8xxx_add_controller(np);
+
+        for_each_compatible_node(np, NULL, "fsl,mpc8610-gpio")
+                mpc8xxx_add_controller(np);
+
+        return 0;
+}
+arch_initcall(mpc8xxx_add_gpiochips);
diff --git a/arch/powerpc/sysdev/mpic.h b/arch/powerpc/sysdev/mpic.h
index fbf8a266941c..6209c62a426d 100644
--- a/arch/powerpc/sysdev/mpic.h
+++ b/arch/powerpc/sysdev/mpic.h
@@ -14,8 +14,6 @@
 #ifdef CONFIG_PCI_MSI
 extern void mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq);
 extern int mpic_msi_init_allocator(struct mpic *mpic);
-extern irq_hw_number_t mpic_msi_alloc_hwirqs(struct mpic *mpic, int num);
-extern void mpic_msi_free_hwirqs(struct mpic *mpic, int offset, int num);
 extern int mpic_u3msi_init(struct mpic *mpic);
 extern int mpic_pasemi_msi_init(struct mpic *mpic);
 #else
diff --git a/arch/powerpc/sysdev/mpic_msi.c b/arch/powerpc/sysdev/mpic_msi.c
index de3e5e8bc324..1d44eee80fa1 100644
--- a/arch/powerpc/sysdev/mpic_msi.c
+++ b/arch/powerpc/sysdev/mpic_msi.c
@@ -15,59 +15,17 @@
 #include <asm/prom.h>
 #include <asm/hw_irq.h>
 #include <asm/ppc-pci.h>
+#include <asm/msi_bitmap.h>
 
 #include <sysdev/mpic.h>
 
-static void __mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq)
-{
-        pr_debug("mpic: reserving hwirq 0x%lx\n", hwirq);
-        bitmap_allocate_region(mpic->hwirq_bitmap, hwirq, 0);
-}
-
 void mpic_msi_reserve_hwirq(struct mpic *mpic, irq_hw_number_t hwirq)
 {
-        unsigned long flags;
-
         /* The mpic calls this even when there is no allocator setup */
-        if (!mpic->hwirq_bitmap)
+        if (!mpic->msi_bitmap.bitmap)
                 return;
 
-        spin_lock_irqsave(&mpic->bitmap_lock, flags);
-        __mpic_msi_reserve_hwirq(mpic, hwirq);
-        spin_unlock_irqrestore(&mpic->bitmap_lock, flags);
-}
-
-irq_hw_number_t mpic_msi_alloc_hwirqs(struct mpic *mpic, int num)
-{
-        unsigned long flags;
-        int offset, order = get_count_order(num);
-
-        spin_lock_irqsave(&mpic->bitmap_lock, flags);
-        /*
-         * This is fast, but stricter than we need. We might want to add
-         * a fallback routine which does a linear search with no alignment.
-         */
-        offset = bitmap_find_free_region(mpic->hwirq_bitmap, mpic->irq_count,
-                                         order);
-        spin_unlock_irqrestore(&mpic->bitmap_lock, flags);
-
-        pr_debug("mpic: allocated 0x%x (2^%d) at offset 0x%x\n",
-                 num, order, offset);
-
-        return offset;
-}
-
-void mpic_msi_free_hwirqs(struct mpic *mpic, int offset, int num)
-{
-        unsigned long flags;
-        int order = get_count_order(num);
-
-        pr_debug("mpic: freeing 0x%x (2^%d) at offset 0x%x\n",
-                 num, order, offset);
-
-        spin_lock_irqsave(&mpic->bitmap_lock, flags);
-        bitmap_release_region(mpic->hwirq_bitmap, offset, order);
-        spin_unlock_irqrestore(&mpic->bitmap_lock, flags);
+        msi_bitmap_reserve_hwirq(&mpic->msi_bitmap, hwirq);
 }
 
 #ifdef CONFIG_MPIC_U3_HT_IRQS
@@ -83,13 +41,13 @@ static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)
 
         /* Reserve source numbers we know are reserved in the HW */
         for (i = 0;   i < 8;   i++)
-                __mpic_msi_reserve_hwirq(mpic, i);
+                msi_bitmap_reserve_hwirq(&mpic->msi_bitmap, i);
 
         for (i = 42;  i < 46;  i++)
-                __mpic_msi_reserve_hwirq(mpic, i);
+                msi_bitmap_reserve_hwirq(&mpic->msi_bitmap, i);
 
         for (i = 100; i < 105; i++)
-                __mpic_msi_reserve_hwirq(mpic, i);
+                msi_bitmap_reserve_hwirq(&mpic->msi_bitmap, i);
 
         np = NULL;
         while ((np = of_find_all_nodes(np))) {
@@ -99,7 +57,7 @@ static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)
                 while (of_irq_map_one(np, index++, &oirq) == 0) {
                         ops->xlate(mpic->irqhost, NULL, oirq.specifier,
                                                 oirq.size, &hwirq, &flags);
-                        __mpic_msi_reserve_hwirq(mpic, hwirq);
+                        msi_bitmap_reserve_hwirq(&mpic->msi_bitmap, hwirq);
                 }
         }
 
@@ -112,70 +70,25 @@ static int mpic_msi_reserve_u3_hwirqs(struct mpic *mpic)
 }
 #endif
 
-static int mpic_msi_reserve_dt_hwirqs(struct mpic *mpic)
-{
-        int i, len;
-        const u32 *p;
-
-        p = of_get_property(mpic->irqhost->of_node,
-                            "msi-available-ranges", &len);
-        if (!p) {
-                pr_debug("mpic: no msi-available-ranges property found on %s\n",
-                          mpic->irqhost->of_node->full_name);
-                return -ENODEV;
-        }
-
-        if (len % 8 != 0) {
-                printk(KERN_WARNING "mpic: Malformed msi-available-ranges "
-                       "property on %s\n", mpic->irqhost->of_node->full_name);
-                return -EINVAL;
-        }
-
-        bitmap_allocate_region(mpic->hwirq_bitmap, 0,
-                               get_count_order(mpic->irq_count));
-
-        /* Format is: (<u32 start> <u32 count>)+ */
-        len /= sizeof(u32);
-        for (i = 0; i < len / 2; i++, p += 2)
-                mpic_msi_free_hwirqs(mpic, *p, *(p + 1));
-
-        return 0;
-}
-
 int mpic_msi_init_allocator(struct mpic *mpic)
 {
-        int rc, size;
-
-        BUG_ON(mpic->hwirq_bitmap);
-        spin_lock_init(&mpic->bitmap_lock);
+        int rc;
 
-        size = BITS_TO_LONGS(mpic->irq_count) * sizeof(long);
-        pr_debug("mpic: allocator bitmap size is 0x%x bytes\n", size);
+        rc = msi_bitmap_alloc(&mpic->msi_bitmap, mpic->irq_count,
+                              mpic->irqhost->of_node);
+        if (rc)
+                return rc;
 
-        mpic->hwirq_bitmap = alloc_maybe_bootmem(size, GFP_KERNEL);
-
-        if (!mpic->hwirq_bitmap) {
-                pr_debug("mpic: ENOMEM allocating allocator bitmap!\n");
-                return -ENOMEM;
-        }
-
-        memset(mpic->hwirq_bitmap, 0, size);
-
-        rc = mpic_msi_reserve_dt_hwirqs(mpic);
-        if (rc) {
+        rc = msi_bitmap_reserve_dt_hwirqs(&mpic->msi_bitmap);
+        if (rc > 0) {
                 if (mpic->flags & MPIC_U3_HT_IRQS)
                         rc = mpic_msi_reserve_u3_hwirqs(mpic);
 
-                if (rc)
-                        goto out_free;
+                if (rc) {
+                        msi_bitmap_free(&mpic->msi_bitmap);
+                        return rc;
+                }
         }
 
         return 0;
-
- out_free:
-        if (mem_init_done)
-                kfree(mpic->hwirq_bitmap);
-
-        mpic->hwirq_bitmap = NULL;
-        return rc;
 }
diff --git a/arch/powerpc/sysdev/mpic_pasemi_msi.c b/arch/powerpc/sysdev/mpic_pasemi_msi.c
index 68aff6076675..656cb772b691 100644
--- a/arch/powerpc/sysdev/mpic_pasemi_msi.c
+++ b/arch/powerpc/sysdev/mpic_pasemi_msi.c
@@ -22,6 +22,7 @@
 #include <asm/prom.h>
 #include <asm/hw_irq.h>
 #include <asm/ppc-pci.h>
+#include <asm/msi_bitmap.h>
 
 #include "mpic.h"
 
@@ -81,8 +82,8 @@ static void pasemi_msi_teardown_msi_irqs(struct pci_dev *pdev)
                         continue;
 
                 set_irq_msi(entry->irq, NULL);
-                mpic_msi_free_hwirqs(msi_mpic, virq_to_hw(entry->irq),
-                                     ALLOC_CHUNK);
+                msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap,
+                                       virq_to_hw(entry->irq), ALLOC_CHUNK);
                 irq_dispose_mapping(entry->irq);
         }
 
@@ -91,11 +92,10 @@ static void pasemi_msi_teardown_msi_irqs(struct pci_dev *pdev)
 
 static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 {
-        irq_hw_number_t hwirq;
         unsigned int virq;
         struct msi_desc *entry;
         struct msi_msg msg;
-        int ret;
+        int hwirq;
 
         pr_debug("pasemi_msi_setup_msi_irqs, pdev %p nvec %d type %d\n",
                  pdev, nvec, type);
@@ -109,17 +109,19 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                  * few MSIs for someone, but restrictions will apply to how the
                  * sources can be changed independently.
                  */
-                ret = mpic_msi_alloc_hwirqs(msi_mpic, ALLOC_CHUNK);
-                hwirq = ret;
-                if (ret < 0) {
+                hwirq = msi_bitmap_alloc_hwirqs(&msi_mpic->msi_bitmap,
+                                                ALLOC_CHUNK);
+                if (hwirq < 0) {
                         pr_debug("pasemi_msi: failed allocating hwirq\n");
                         return hwirq;
                 }
 
                 virq = irq_create_mapping(msi_mpic->irqhost, hwirq);
                 if (virq == NO_IRQ) {
-                        pr_debug("pasemi_msi: failed mapping hwirq 0x%lx\n", hwirq);
-                        mpic_msi_free_hwirqs(msi_mpic, hwirq, ALLOC_CHUNK);
+                        pr_debug("pasemi_msi: failed mapping hwirq 0x%x\n",
+                                  hwirq);
+                        msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap, hwirq,
+                                               ALLOC_CHUNK);
                         return -ENOSPC;
                 }
 
@@ -133,8 +135,8 @@ static int pasemi_msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                 set_irq_chip(virq, &mpic_pasemi_msi_chip);
                 set_irq_type(virq, IRQ_TYPE_EDGE_RISING);
 
-                pr_debug("pasemi_msi: allocated virq 0x%x (hw 0x%lx) addr 0x%x\n",
-                          virq, hwirq, msg.address_lo);
+                pr_debug("pasemi_msi: allocated virq 0x%x (hw 0x%x) " \
+                         "addr 0x%x\n", virq, hwirq, msg.address_lo);
 
                 /* Likewise, the device writes [0...511] into the target
                  * register to generate MSI [512...1023]
diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c
index 6e2f8686fdfc..0a8f5a9e87c9 100644
--- a/arch/powerpc/sysdev/mpic_u3msi.c
+++ b/arch/powerpc/sysdev/mpic_u3msi.c
@@ -16,6 +16,7 @@
 #include <asm/prom.h>
 #include <asm/hw_irq.h>
 #include <asm/ppc-pci.h>
+#include <asm/msi_bitmap.h>
 
 #include "mpic.h"
 
@@ -101,7 +102,8 @@ static void u3msi_teardown_msi_irqs(struct pci_dev *pdev)
                         continue;
 
                 set_irq_msi(entry->irq, NULL);
-                mpic_msi_free_hwirqs(msi_mpic, virq_to_hw(entry->irq), 1);
+                msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap,
+                                       virq_to_hw(entry->irq), 1);
                 irq_dispose_mapping(entry->irq);
         }
 
@@ -110,29 +112,27 @@ static void u3msi_teardown_msi_irqs(struct pci_dev *pdev)
 
 static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 {
-        irq_hw_number_t hwirq;
         unsigned int virq;
         struct msi_desc *entry;
         struct msi_msg msg;
         u64 addr;
-        int ret;
+        int hwirq;
 
         addr = find_ht_magic_addr(pdev);
         msg.address_lo = addr & 0xFFFFFFFF;
         msg.address_hi = addr >> 32;
 
         list_for_each_entry(entry, &pdev->msi_list, list) {
-                ret = mpic_msi_alloc_hwirqs(msi_mpic, 1);
-                if (ret < 0) {
+                hwirq = msi_bitmap_alloc_hwirqs(&msi_mpic->msi_bitmap, 1);
+                if (hwirq < 0) {
                         pr_debug("u3msi: failed allocating hwirq\n");
-                        return ret;
+                        return hwirq;
                 }
-                hwirq = ret;
 
                 virq = irq_create_mapping(msi_mpic->irqhost, hwirq);
                 if (virq == NO_IRQ) {
-                        pr_debug("u3msi: failed mapping hwirq 0x%lx\n", hwirq);
-                        mpic_msi_free_hwirqs(msi_mpic, hwirq, 1);
+                        pr_debug("u3msi: failed mapping hwirq 0x%x\n", hwirq);
+                        msi_bitmap_free_hwirqs(&msi_mpic->msi_bitmap, hwirq, 1);
                         return -ENOSPC;
                 }
 
@@ -140,8 +140,8 @@ static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
                 set_irq_chip(virq, &mpic_u3msi_chip);
                 set_irq_type(virq, IRQ_TYPE_EDGE_RISING);
 
-                pr_debug("u3msi: allocated virq 0x%x (hw 0x%lx) addr 0x%lx\n",
-                          virq, hwirq, addr);
+                pr_debug("u3msi: allocated virq 0x%x (hw 0x%x) addr 0x%lx\n",
+                          virq, hwirq, (unsigned long)addr);
 
                 msg.data = hwirq;
                 write_msi_msg(virq, &msg);
diff --git a/arch/powerpc/sysdev/msi_bitmap.c b/arch/powerpc/sysdev/msi_bitmap.c
new file mode 100644
index 000000000000..f84217b8863a
--- /dev/null
+++ b/arch/powerpc/sysdev/msi_bitmap.c
@@ -0,0 +1,247 @@
+/*
+ * Copyright 2006-2008, Michael Ellerman, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2 of the
+ * License.
+ *
+ */
+
+#include <linux/kernel.h>
+#include <linux/bitmap.h>
+#include <asm/msi_bitmap.h>
+
+int msi_bitmap_alloc_hwirqs(struct msi_bitmap *bmp, int num)
+{
+        unsigned long flags;
+        int offset, order = get_count_order(num);
+
+        spin_lock_irqsave(&bmp->lock, flags);
+        /*
+         * This is fast, but stricter than we need. We might want to add
+         * a fallback routine which does a linear search with no alignment.
+         */
+        offset = bitmap_find_free_region(bmp->bitmap, bmp->irq_count, order);
+        spin_unlock_irqrestore(&bmp->lock, flags);
+
+        pr_debug("msi_bitmap: allocated 0x%x (2^%d) at offset 0x%x\n",
+                 num, order, offset);
+
+        return offset;
+}
+
+void msi_bitmap_free_hwirqs(struct msi_bitmap *bmp, unsigned int offset,
+                            unsigned int num)
+{
+        unsigned long flags;
+        int order = get_count_order(num);
+
+        pr_debug("msi_bitmap: freeing 0x%x (2^%d) at offset 0x%x\n",
+                 num, order, offset);
+
+        spin_lock_irqsave(&bmp->lock, flags);
+        bitmap_release_region(bmp->bitmap, offset, order);
+        spin_unlock_irqrestore(&bmp->lock, flags);
+}
+
+void msi_bitmap_reserve_hwirq(struct msi_bitmap *bmp, unsigned int hwirq)
+{
+        unsigned long flags;
+
+        pr_debug("msi_bitmap: reserving hwirq 0x%x\n", hwirq);
+
+        spin_lock_irqsave(&bmp->lock, flags);
+        bitmap_allocate_region(bmp->bitmap, hwirq, 0);
+        spin_unlock_irqrestore(&bmp->lock, flags);
+}
+
+/**
+ * msi_bitmap_reserve_dt_hwirqs - Reserve irqs specified in the device tree.
+ * @bmp: pointer to the MSI bitmap.
+ *
+ * Looks in the device tree to see if there is a property specifying which
+ * irqs can be used for MSI. If found those irqs reserved in the device tree
+ * are reserved in the bitmap.
+ *
+ * Returns 0 for success, < 0 if there was an error, and > 0 if no property
+ * was found in the device tree.
+ **/
+int msi_bitmap_reserve_dt_hwirqs(struct msi_bitmap *bmp)
+{
+        int i, j, len;
+        const u32 *p;
+
+        if (!bmp->of_node)
+                return 1;
+
+        p = of_get_property(bmp->of_node, "msi-available-ranges", &len);
+        if (!p) {
+                pr_debug("msi_bitmap: no msi-available-ranges property " \
+                         "found on %s\n", bmp->of_node->full_name);
+                return 1;
+        }
+
+        if (len % (2 * sizeof(u32)) != 0) {
+                printk(KERN_WARNING "msi_bitmap: Malformed msi-available-ranges"
+                       " property on %s\n", bmp->of_node->full_name);
+                return -EINVAL;
+        }
+
+        bitmap_allocate_region(bmp->bitmap, 0, get_count_order(bmp->irq_count));
+
+        spin_lock(&bmp->lock);
+
+        /* Format is: (<u32 start> <u32 count>)+ */
+        len /= 2 * sizeof(u32);
+        for (i = 0; i < len; i++, p += 2) {
+                for (j = 0; j < *(p + 1); j++)
+                        bitmap_release_region(bmp->bitmap, *p + j, 0);
+        }
+
+        spin_unlock(&bmp->lock);
+
+        return 0;
+}
+
+int msi_bitmap_alloc(struct msi_bitmap *bmp, unsigned int irq_count,
+                     struct device_node *of_node)
+{
+        int size;
+
+        if (!irq_count)
+                return -EINVAL;
+
+        size = BITS_TO_LONGS(irq_count) * sizeof(long);
+        pr_debug("msi_bitmap: allocator bitmap size is 0x%x bytes\n", size);
+
+        bmp->bitmap = zalloc_maybe_bootmem(size, GFP_KERNEL);
+        if (!bmp->bitmap) {
+                pr_debug("msi_bitmap: ENOMEM allocating allocator bitmap!\n");
+                return -ENOMEM;
+        }
+
+        /* We zalloc'ed the bitmap, so all irqs are free by default */
+        spin_lock_init(&bmp->lock);
+        bmp->of_node = of_node_get(of_node);
+        bmp->irq_count = irq_count;
+
+        return 0;
+}
+
+void msi_bitmap_free(struct msi_bitmap *bmp)
+{
+        /* we can't free the bitmap we don't know if it's bootmem etc. */
+        of_node_put(bmp->of_node);
+        bmp->bitmap = NULL;
+}
+
+#ifdef CONFIG_MSI_BITMAP_SELFTEST
+
+#define check(x)        \
+        if (!(x)) printk("msi_bitmap: test failed at line %d\n", __LINE__);
+
+void test_basics(void)
+{
+        struct msi_bitmap bmp;
+        int i, size = 512;
+
+        /* Can't allocate a bitmap of 0 irqs */
+        check(msi_bitmap_alloc(&bmp, 0, NULL) != 0);
+
+        /* of_node may be NULL */
+        check(0 == msi_bitmap_alloc(&bmp, size, NULL));
+
+        /* Should all be free by default */
+        check(0 == bitmap_find_free_region(bmp.bitmap, size,
+                                           get_count_order(size)));
+        bitmap_release_region(bmp.bitmap, 0, get_count_order(size));
+
+        /* With no node, there's no msi-available-ranges, so expect > 0 */
+        check(msi_bitmap_reserve_dt_hwirqs(&bmp) > 0);
+
+        /* Should all still be free */
+        check(0 == bitmap_find_free_region(bmp.bitmap, size,
+                                           get_count_order(size)));
+        bitmap_release_region(bmp.bitmap, 0, get_count_order(size));
+
+        /* Check we can fill it up and then no more */
+        for (i = 0; i < size; i++)
+                check(msi_bitmap_alloc_hwirqs(&bmp, 1) >= 0);
+
+        check(msi_bitmap_alloc_hwirqs(&bmp, 1) < 0);
+
+        /* Should all be allocated */
+        check(bitmap_find_free_region(bmp.bitmap, size, 0) < 0);
+
+        /* And if we free one we can then allocate another */
+        msi_bitmap_free_hwirqs(&bmp, size / 2, 1);
+        check(msi_bitmap_alloc_hwirqs(&bmp, 1) == size / 2);
+
+        msi_bitmap_free(&bmp);
+
+        /* Clients may check bitmap == NULL for "not-allocated" */
+        check(bmp.bitmap == NULL);
+
+        kfree(bmp.bitmap);
+}
+
+void test_of_node(void)
+{
+        u32 prop_data[] = { 10, 10, 25, 3, 40, 1, 100, 100, 200, 20 };
+        const char *expected_str = "0-9,20-24,28-39,41-99,220-255";
+        char *prop_name = "msi-available-ranges";
+        char *node_name = "/fakenode";
+        struct device_node of_node;
+        struct property prop;
+        struct msi_bitmap bmp;
+        int size = 256;
+        DECLARE_BITMAP(expected, size);
+
+        /* There should really be a struct device_node allocator */
+        memset(&of_node, 0, sizeof(of_node));
+        kref_init(&of_node.kref);
+        of_node.full_name = node_name;
+
+        check(0 == msi_bitmap_alloc(&bmp, size, &of_node));
+
+        /* No msi-available-ranges, so expect > 0 */
+        check(msi_bitmap_reserve_dt_hwirqs(&bmp) > 0);
+
+        /* Should all still be free */
+        check(0 == bitmap_find_free_region(bmp.bitmap, size,
+                                           get_count_order(size)));
+        bitmap_release_region(bmp.bitmap, 0, get_count_order(size));
+
+        /* Now create a fake msi-available-ranges property */
+
+        /* There should really .. oh whatever */
+        memset(&prop, 0, sizeof(prop));
+        prop.name = prop_name;
+        prop.value = &prop_data;
+        prop.length = sizeof(prop_data);
+
+        of_node.properties = &prop;
+
+        /* msi-available-ranges, so expect == 0 */
+        check(msi_bitmap_reserve_dt_hwirqs(&bmp) == 0);
+
+        /* Check we got the expected result */
+        check(0 == bitmap_parselist(expected_str, expected, size));
+        check(bitmap_equal(expected, bmp.bitmap, size));
+
+        msi_bitmap_free(&bmp);
+        kfree(bmp.bitmap);
+}
+
+int msi_bitmap_selftest(void)
+{
+        printk(KERN_DEBUG "Running MSI bitmap self-tests ...\n");
+
+        test_basics();
+        test_of_node();
+
+        return 0;
+}
+late_initcall(msi_bitmap_selftest);
+#endif /* CONFIG_MSI_BITMAP_SELFTEST */
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c
index fb368dfde5d4..9f6f73d584d6 100644
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -30,14 +30,12 @@
 #include <asm/machdep.h>
 #include <asm/dcr.h>
 #include <asm/dcr-regs.h>
+#include <mm/mmu_decl.h>
 
 #include "ppc4xx_pci.h"
 
 static int dma_offset_set;
 
-/* Move that to a useable header */
-extern unsigned long total_memory;
-
 #define U64_TO_U32_LOW(val)     ((u32)((val) & 0x00000000ffffffffULL))
 #define U64_TO_U32_HIGH(val)    ((u32)((val) >> 32))
 
@@ -105,7 +103,8 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose,
 
         /* Default */
         res->start = 0;
-        res->end = size = 0x80000000;
+        size = 0x80000000;
+        res->end = size - 1;
         res->flags = IORESOURCE_MEM | IORESOURCE_PREFETCH;
 
         /* Get dma-ranges property */
@@ -167,13 +166,13 @@ static int __init ppc4xx_parse_dma_ranges(struct pci_controller *hose,
          */
         if (size < total_memory) {
                 printk(KERN_ERR "%s: dma-ranges too small "
-                       "(size=%llx total_memory=%lx)\n",
-                       hose->dn->full_name, size, total_memory);
+                       "(size=%llx total_memory=%llx)\n",
+                       hose->dn->full_name, size, (u64)total_memory);
                 return -ENXIO;
         }
 
         /* Check we are a power of 2 size and that base is a multiple of size*/
-        if (!is_power_of_2(size) ||
+        if ((size & (size - 1)) != 0  ||
             (res->start & (size - 1)) != 0) {
                 printk(KERN_ERR "%s: dma-ranges unaligned\n",
                        hose->dn->full_name);
@@ -277,9 +276,16 @@ static void __init ppc4xx_probe_pci_bridge(struct device_node *np)
         const int *bus_range;
         int primary = 0;
 
+        /* Check if device is enabled */
+        if (!of_device_is_available(np)) {
+                printk(KERN_INFO "%s: Port disabled via device-tree\n",
+                       np->full_name);
+                return;
+        }
+
         /* Fetch config space registers address */
         if (of_address_to_resource(np, 0, &rsrc_cfg)) {
-                printk(KERN_ERR "%s:Can't get PCI config register base !",
+                printk(KERN_ERR "%s: Can't get PCI config register base !",
                        np->full_name);
                 return;
         }
@@ -810,7 +816,7 @@ static int ppc460ex_pciex_init_port_hw(struct ppc4xx_pciex_port *port)
         switch (port->index) {
         case 0:
                 mtdcri(SDR0, PESDR0_460EX_L0CDRCTL, 0x00003230);
-                mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000136);
+                mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000130);
                 mtdcri(SDR0, PESDR0_460EX_L0CLK, 0x00000006);
 
                 mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST,0x10000000);
@@ -821,10 +827,10 @@ static int ppc460ex_pciex_init_port_hw(struct ppc4xx_pciex_port *port)
                 mtdcri(SDR0, PESDR1_460EX_L1CDRCTL, 0x00003230);
                 mtdcri(SDR0, PESDR1_460EX_L2CDRCTL, 0x00003230);
                 mtdcri(SDR0, PESDR1_460EX_L3CDRCTL, 0x00003230);
-                mtdcri(SDR0, PESDR1_460EX_L0DRV, 0x00000136);
-                mtdcri(SDR0, PESDR1_460EX_L1DRV, 0x00000136);
-                mtdcri(SDR0, PESDR1_460EX_L2DRV, 0x00000136);
-                mtdcri(SDR0, PESDR1_460EX_L3DRV, 0x00000136);
+                mtdcri(SDR0, PESDR1_460EX_L0DRV, 0x00000130);
+                mtdcri(SDR0, PESDR1_460EX_L1DRV, 0x00000130);
+                mtdcri(SDR0, PESDR1_460EX_L2DRV, 0x00000130);
+                mtdcri(SDR0, PESDR1_460EX_L3DRV, 0x00000130);
                 mtdcri(SDR0, PESDR1_460EX_L0CLK, 0x00000006);
                 mtdcri(SDR0, PESDR1_460EX_L1CLK, 0x00000006);
                 mtdcri(SDR0, PESDR1_460EX_L2CLK, 0x00000006);
diff --git a/arch/powerpc/sysdev/qe_lib/Kconfig b/arch/powerpc/sysdev/qe_lib/Kconfig
index 1ce546462be5..76ffbc48d4b9 100644
--- a/arch/powerpc/sysdev/qe_lib/Kconfig
+++ b/arch/powerpc/sysdev/qe_lib/Kconfig
@@ -24,12 +24,3 @@ config QE_USB
         bool
         help
           QE USB Host Controller support
-
-config QE_GPIO
-        bool "QE GPIO support"
-        depends on QUICC_ENGINE
-        select GENERIC_GPIO
-        select ARCH_REQUIRE_GPIOLIB
-        help
-          Say Y here if you're going to use hardware that connects to the
-          QE GPIOs.