233 files changed, 6757 insertions, 864 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index dafd001bf833..4f82c856667f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -930,6 +930,8 @@ and is between 256 and 4096 characters. It is defined in the file
        l2cr=           [PPC]
+        l3cr=           [PPC]
        lapic           [X86-32,APIC] Enable the local APIC even if BIOS
                        disabled it.
diff --git a/Documentation/powerpc/booting-without-of.txt b/Documentation/powerpc/booting-without-of.txt
index 7b4e8a70882c..1df9d4cfc0e6 100644
--- a/Documentation/powerpc/booting-without-of.txt
+++ b/Documentation/powerpc/booting-without-of.txt
@@ -1269,10 +1269,6 @@ platforms are moved over to use the flattened-device-tree model.
  Recommended properties:
-    - linux,network-index : This is the intended "index" of this
-      network device.  This is used by the bootwrapper to interpret
-      MAC addresses passed by the firmware when no information other
-      than indices is available to associate an address with a device.
    - phy-connection-type : a string naming the controller/PHY interface type,
      i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii",
      "tbi", or "rtbi".  This property is only really needed if the connection
@@ -1667,10 +1663,6 @@ platforms are moved over to use the flattened-device-tree model.
   - phy-handle : The phandle for the PHY connected to this controller.
   Recommended properties:
-   - linux,network-index : This is the intended "index" of this
-     network device.  This is used by the bootwrapper to interpret
-     MAC addresses passed by the firmware when no information other
-     than indices is available to associate an address with a device.
   - phy-connection-type : a string naming the controller/PHY interface type,
     i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id" (Internal
     Delay), "rgmii-txid" (delay on TX only), "rgmii-rxid" (delay on RX only),
@@ -1995,7 +1987,6 @@ platforms are moved over to use the flattened-device-tree model.
                interrupts = <20 8>;
                interrupt-parent = <&PIC>;
                phy-handle = <&PHY0>;
-                linux,network-index = <0>;
                fsl,cpm-command = <12000300>;
        };
@@ -2217,12 +2208,6 @@ platforms are moved over to use the flattened-device-tree model.
                          EMAC, that is the content of the current (bogus) "phy-port"
                          property.
-    Recommended properties:
-    - linux,network-index : This is the intended "index" of this
-      network device.  This is used by the bootwrapper to interpret
-      MAC addresses passed by the firmware when no information other
-      than indices is available to associate an address with a device.
    Optional properties:
    - phy-address       : 1 cell, optional, MDIO address of the PHY. If absent,
                          a search is performed.
@@ -2246,7 +2231,6 @@ platforms are moved over to use the flattened-device-tree model.
    Example:
        EMAC0: ethernet@40000800 {
-                linux,network-index = <0>;
                device_type = "network";
                compatible = "ibm,emac-440gp", "ibm,emac";
                interrupt-parent = <&UIC1>;
diff --git a/Documentation/powerpc/phyp-assisted-dump.txt b/Documentation/powerpc/phyp-assisted-dump.txt
new file mode 100644
index 000000000000..c4682b982a2e
--- /dev/null
+++ b/Documentation/powerpc/phyp-assisted-dump.txt
@@ -0,0 +1,127 @@
+                   Hypervisor-Assisted Dump
+                   ------------------------
+                       November 2007
+The goal of hypervisor-assisted dump is to enable the dump of
+a crashed system, and to do so from a fully-reset system, and
+to minimize the total elapsed time until the system is back
+in production use.
+As compared to kdump or other strategies, hypervisor-assisted
+dump offers several strong, practical advantages:
+-- Unlike kdump, the system has been reset, and loaded
+   with a fresh copy of the kernel.  In particular,
+   PCI and I/O devices have been reinitialized and are
+   in a clean, consistent state.
+-- As the dump is performed, the dumped memory becomes
+   immediately available to the system for normal use.
+-- After the dump is completed, no further reboots are
+   required; the system will be fully usable, and running
+   in it's normal, production mode on it normal kernel.
+The above can only be accomplished by coordination with,
+and assistance from the hypervisor. The procedure is
+as follows:
+-- When a system crashes, the hypervisor will save
+   the low 256MB of RAM to a previously registered
+   save region. It will also save system state, system
+   registers, and hardware PTE's.
+-- After the low 256MB area has been saved, the
+   hypervisor will reset PCI and other hardware state.
+   It will *not* clear RAM. It will then launch the
+   bootloader, as normal.
+-- The freshly booted kernel will notice that there
+   is a new node (ibm,dump-kernel) in the device tree,
+   indicating that there is crash data available from
+   a previous boot. It will boot into only 256MB of RAM,
+   reserving the rest of system memory.
+-- Userspace tools will parse /sys/kernel/release_region
+   and read /proc/vmcore to obtain the contents of memory,
+   which holds the previous crashed kernel. The userspace
+   tools may copy this info to disk, or network, nas, san,
+   iscsi, etc. as desired.
+   For Example: the values in /sys/kernel/release-region
+   would look something like this (address-range pairs).
+   CPU:0x177fee000-0x10000: HPTE:0x177ffe020-0x1000: /
+   DUMP:0x177fff020-0x10000000, 0x10000000-0x16F1D370A
+-- As the userspace tools complete saving a portion of
+   dump, they echo an offset and size to
+   /sys/kernel/release_region to release the reserved
+   memory back to general use.
+   An example of this is:
+     "echo 0x40000000 0x10000000 > /sys/kernel/release_region"
+   which will release 256MB at the 1GB boundary.
+Please note that the hypervisor-assisted dump feature
+is only available on Power6-based systems with recent
+firmware versions.
+Implementation details:
+----------------------
+During boot, a check is made to see if firmware supports
+this feature on this particular machine. If it does, then
+we check to see if a active dump is waiting for us. If yes
+then everything but 256 MB of RAM is reserved during early
+boot. This area is released once we collect a dump from user
+land scripts that are run. If there is dump data, then
+the /sys/kernel/release_region file is created, and
+the reserved memory is held.
+If there is no waiting dump data, then only the highest
+256MB of the ram is reserved as a scratch area. This area
+is *not* released: this region will be kept permanently
+reserved, so that it can act as a receptacle for a copy
+of the low 256MB in the case a crash does occur. See,
+however, "open issues" below, as to whether
+such a reserved region is really needed.
+Currently the dump will be copied from /proc/vmcore to a
+a new file upon user intervention. The starting address
+to be read and the range for each data point in provided
+in /sys/kernel/release_region.
+The tools to examine the dump will be same as the ones
+used for kdump.
+General notes:
+--------------
+Security: please note that there are potential security issues
+with any sort of dump mechanism. In particular, plaintext
+(unencrypted) data, and possibly passwords, may be present in
+the dump data. Userspace tools must take adequate precautions to
+preserve security.
+Open issues/ToDo:
+------------
+ o The various code paths that tell the hypervisor that a crash
+   occurred, vs. it simply being a normal reboot, should be
+   reviewed, and possibly clarified/fixed.
+ o Instead of using /sys/kernel, should there be a /sys/dump
+   instead? There is a dump_subsys being created by the s390 code,
+   perhaps the pseries code should use a similar layout as well.
+ o Is reserving a 256MB region really required? The goal of
+   reserving a 256MB scratch area is to make sure that no
+   important crash data is clobbered when the hypervisor
+   save low mem to the scratch area. But, if one could assure
+   that nothing important is located in some 256MB area, then
+   it would not need to be reserved. Something that can be
+   improved in subsequent versions.
+ o Still working the kdump team to integrate this with kdump,
+   some work remains but this would not affect the current
+   patches.
+ o Still need to write a shell script, to copy the dump away.
+   Currently I am parsing it manually.
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 1189d8d6170d..625342e1a733 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -91,6 +91,7 @@ config PPC
        select HAVE_OPROFILE
        select HAVE_KPROBES
        select HAVE_KRETPROBES
+        select HAVE_LMB
 config EARLY_PRINTK
        bool
@@ -210,14 +211,25 @@ source kernel/Kconfig.hz
 source kernel/Kconfig.preempt
 source "fs/Kconfig.binfmt"
-# We optimistically allocate largepages from the VM, so make the limit
-# large enough (16MB). This badly named config option is actually
-# max order + 1
 config FORCE_MAX_ZONEORDER
-        int
+        int "Maximum zone order"
-        depends on PPC64
        default "9" if PPC_64K_PAGES
-        default "13"
+        default "13" if PPC64
+        default "11"
+        help
+          The kernel memory allocator divides physically contiguous memory
+          blocks into "zones", where each zone is a power of two number of
+          pages.  This option selects the largest power of two that the kernel
+          keeps in the memory allocator.  If you need to allocate very large
+          blocks of physically contiguous memory, then you may need to
+          increase this value.
+          This config option is actually maximum order plus one. For example,
+          a value of 11 means that the largest free memory block is 2^10 pages.
+          The page size is not necessarily 4KB.  For example, on 64-bit
+          systems, 64KB pages can be enabled via CONFIG_PPC_64K_PAGES.  Keep
+          this in mind when choosing a value for this option.
 config HUGETLB_PAGE_SIZE_VARIABLE
        bool
@@ -307,6 +319,16 @@ config CRASH_DUMP
          Don't change this unless you know what you are doing.
+config PHYP_DUMP
+        bool "Hypervisor-assisted dump (EXPERIMENTAL)"
+        depends on PPC_PSERIES && EXPERIMENTAL
+        help
+          Hypervisor-assisted dump is meant to be a kdump replacement
+          offering robustness and speed not possible without system
+          hypervisor assistence.
+          If unsure, say "N"
 config PPCBUG_NVRAM
        bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC
        default y if PPC_PREP
@@ -490,6 +512,9 @@ config FSL_PCI
        bool
        select PPC_INDIRECT_PCI
+config 4xx_SOC
+        bool
 # Yes MCA RS/6000s exist but Linux-PPC does not currently support any
 config MCA
        bool
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index ab5cfe8ef988..dd8082522da3 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -164,7 +164,7 @@ boot := arch/$(ARCH)/boot
 $(BOOT_TARGETS): vmlinux
        $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
-bootwrapper_install:
+bootwrapper_install %.dtb:
        $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
 define archhelp
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 1aded8f759d0..7dcd9e953a98 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -40,6 +40,7 @@ $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
 $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
 $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
 $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
+$(obj)/virtex405-head.o: BOOTCFLAGS += -mcpu=405
 zlib       := inffast.c inflate.c inftrees.c
@@ -64,7 +65,8 @@ src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c
                cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
                fixed-head.S ep88xc.c ep405.c \
                cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
-                cuboot-warp.c cuboot-85xx-cpm2.c
+                cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
+                virtex405-head.S
 src-boot := $(src-wlib) $(src-plat) empty.c
 src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -216,6 +218,7 @@ image-$(CONFIG_RAINIER)			+= cuImage.rainier
 image-$(CONFIG_TAISHAN)                 += cuImage.taishan
 image-$(CONFIG_KATMAI)                  += cuImage.katmai
 image-$(CONFIG_WARP)                    += cuImage.warp
+image-$(CONFIG_YOSEMITE)                += cuImage.yosemite
 # Board ports in arch/powerpc/platform/8xx/Kconfig
 image-$(CONFIG_PPC_MPC86XADS)           += cuImage.mpc866ads
@@ -255,6 +258,7 @@ image-$(CONFIG_TQM8555)			+= cuImage.tqm8555
 image-$(CONFIG_TQM8560)                 += cuImage.tqm8560
 image-$(CONFIG_SBC8548)                 += cuImage.sbc8548
 image-$(CONFIG_SBC8560)                 += cuImage.sbc8560
+image-$(CONFIG_KSI8560)                 += cuImage.ksi8560
 # Board ports in arch/powerpc/platform/embedded6xx/Kconfig
 image-$(CONFIG_STORCENTER)              += cuImage.storcenter
@@ -285,11 +289,11 @@ $(obj)/zImage.%: vmlinux $(wrapperbits)
        $(call if_changed,wrap,$*)
 # dtbImage% - a dtbImage is a zImage with an embedded device tree blob
-$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(dtstree)/%.dts
+$(obj)/dtbImage.initrd.%: vmlinux $(wrapperbits) $(obj)/%.dtb
-        $(call if_changed,wrap,$*,$(dtstree)/$*.dts,,$(obj)/ramdisk.image.gz)
+        $(call if_changed,wrap,$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
-$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(dtstree)/%.dts
+$(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb
-        $(call if_changed,wrap,$*,$(dtstree)/$*.dts)
+        $(call if_changed,wrap,$*,,$(obj)/$*.dtb)
 # This cannot be in the root of $(src) as the zImage rule always adds a $(obj)
 # prefix
@@ -302,14 +306,24 @@ $(obj)/zImage.iseries: vmlinux
 $(obj)/uImage: vmlinux $(wrapperbits)
        $(call if_changed,wrap,uboot)
-$(obj)/cuImage.%: vmlinux $(dtstree)/%.dts $(wrapperbits)
+$(obj)/cuImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-        $(call if_changed,wrap,cuboot-$*,$(dtstree)/$*.dts)
+        $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb)
-$(obj)/treeImage.initrd.%: vmlinux $(dtstree)/%.dts $(wrapperbits)
+$(obj)/simpleImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-        $(call if_changed,wrap,treeboot-$*,$(dtstree)/$*.dts,,$(obj)/ramdisk.image.gz)
+        $(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
-$(obj)/treeImage.%: vmlinux $(dtstree)/%.dts $(wrapperbits)
+$(obj)/simpleImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-        $(call if_changed,wrap,treeboot-$*,$(dtstree)/$*.dts)
+        $(call if_changed,wrap,simpleboot-$*,,$(obj)/$*.dtb)
+$(obj)/treeImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+        $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
+$(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
+        $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)
+# Rule to build device tree blobs
+$(obj)/%.dtb: $(dtstree)/%.dts $(obj)/dtc
+        $(obj)/dtc -O dtb -o $(obj)/$*.dtb -b 0 $(DTS_FLAGS) $(dtstree)/$*.dts
 # If there isn't a platform selected then just strip the vmlinux.
 ifeq (,$(image-y))
@@ -326,7 +340,7 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
 # anything not in $(targets)
 clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* treeImage.* \
-        otheros.bld
+        otheros.bld *.dtb
 # clean up files cached by wrapper
 clean-kernel := vmlinux.strip vmlinux.bin
diff --git a/arch/powerpc/boot/bamboo.c b/arch/powerpc/boot/bamboo.c
index 54b33f1500e2..b82cacbc60db 100644
--- a/arch/powerpc/boot/bamboo.c
+++ b/arch/powerpc/boot/bamboo.c
@@ -33,7 +33,8 @@ static void bamboo_fixups(void)
        ibm440ep_fixup_clocks(sysclk, 11059200, 25000000);
        ibm4xx_sdram_fixup_memsize();
        ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
-        dt_fixup_mac_addresses(bamboo_mac0, bamboo_mac1);
+        dt_fixup_mac_address_by_alias("ethernet0", bamboo_mac0);
+        dt_fixup_mac_address_by_alias("ethernet1", bamboo_mac1);
 }
 void bamboo_init(void *mac0, void *mac1)
diff --git a/arch/powerpc/boot/cuboot-rainier.c b/arch/powerpc/boot/cuboot-rainier.c
index cf452b66dce8..0a3fddee54df 100644
--- a/arch/powerpc/boot/cuboot-rainier.c
+++ b/arch/powerpc/boot/cuboot-rainier.c
@@ -42,7 +42,8 @@ static void rainier_fixups(void)
        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ibm4xx_denali_fixup_memsize();
-        dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
+        dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
+        dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
 }
 void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
diff --git a/arch/powerpc/boot/cuboot-sequoia.c b/arch/powerpc/boot/cuboot-sequoia.c
index f555575a44de..caf8f2e842ea 100644
--- a/arch/powerpc/boot/cuboot-sequoia.c
+++ b/arch/powerpc/boot/cuboot-sequoia.c
@@ -42,7 +42,8 @@ static void sequoia_fixups(void)
        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ibm4xx_denali_fixup_memsize();
-        dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);
+        dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
+        dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
 }
 void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
diff --git a/arch/powerpc/boot/cuboot-taishan.c b/arch/powerpc/boot/cuboot-taishan.c
index b55b80467eed..9bc906a754dd 100644
--- a/arch/powerpc/boot/cuboot-taishan.c
+++ b/arch/powerpc/boot/cuboot-taishan.c
@@ -40,7 +40,8 @@ static void taishan_fixups(void)
        ibm4xx_sdram_fixup_memsize();
-        dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr);
+        dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
+        dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
 }
diff --git a/arch/powerpc/boot/cuboot-warp.c b/arch/powerpc/boot/cuboot-warp.c
index 3db93e85e9ea..eb108a877492 100644
--- a/arch/powerpc/boot/cuboot-warp.c
+++ b/arch/powerpc/boot/cuboot-warp.c
@@ -24,7 +24,7 @@ static void warp_fixups(void)
        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
        ibm4xx_sdram_fixup_memsize();
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
-        dt_fixup_mac_addresses(&bd.bi_enetaddr);
+        dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
 }
diff --git a/arch/powerpc/boot/cuboot-yosemite.c b/arch/powerpc/boot/cuboot-yosemite.c
new file mode 100644
index 000000000000..cc6e338c5d0d
--- /dev/null
+++ b/arch/powerpc/boot/cuboot-yosemite.c
@@ -0,0 +1,44 @@
+/*
+ * Old U-boot compatibility for Yosemite
+ *
+ * Author: Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * 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 version 2 as published
+ * by the Free Software Foundation.
+ */
+#include "ops.h"
+#include "stdio.h"
+#include "4xx.h"
+#include "44x.h"
+#include "cuboot.h"
+#define TARGET_4xx
+#define TARGET_44x
+#include "ppcboot.h"
+static bd_t bd;
+static void yosemite_fixups(void)
+{
+        unsigned long sysclk = 66666666;
+        ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);
+        ibm4xx_sdram_fixup_memsize();
+        ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);
+        dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
+        dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
+}
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                unsigned long r6, unsigned long r7)
+{
+        CUBOOT_INIT();
+        platform_ops.fixups = yosemite_fixups;
+        platform_ops.exit = ibm44x_dbcr_reset;
+        fdt_init(_dtb_start);
+        serial_console_init();
+}
diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts
index 7dc37c9a7446..ba2521bdaab1 100644
--- a/arch/powerpc/boot/dts/bamboo.dts
+++ b/arch/powerpc/boot/dts/bamboo.dts
@@ -204,7 +204,6 @@
                        };
                        EMAC0: ethernet@ef600e00 {
-                                linux,network-index = <0>;
                                device_type = "network";
                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;
@@ -225,7 +224,6 @@
                        };
                        EMAC1: ethernet@ef600f00 {
-                                linux,network-index = <1>;
                                device_type = "network";
                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts
new file mode 100644
index 000000000000..6f3d38a1554f
--- /dev/null
+++ b/arch/powerpc/boot/dts/canyonlands.dts
@@ -0,0 +1,402 @@
+/*
+ * Device Tree Source for AMCC Canyonlands (460EX)
+ *
+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ */
+/ {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        model = "amcc,canyonlands";
+        compatible = "amcc,canyonlands";
+        dcr-parent = <&/cpus/cpu@0>;
+        aliases {
+                ethernet0 = &EMAC0;
+                ethernet1 = &EMAC1;
+                serial0 = &UART0;
+                serial1 = &UART1;
+        };
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                cpu@0 {
+                        device_type = "cpu";
+                        model = "PowerPC,460EX";
+                        reg = <0>;
+                        clock-frequency = <0>; /* Filled in by U-Boot */
+                        timebase-frequency = <0>; /* Filled in by U-Boot */
+                        i-cache-line-size = <20>;
+                        d-cache-line-size = <20>;
+                        i-cache-size = <8000>;
+                        d-cache-size = <8000>;
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+        memory {
+                device_type = "memory";
+                reg = <0 0 0>; /* Filled in by U-Boot */
+        };
+        UIC0: interrupt-controller0 {
+                compatible = "ibm,uic-460ex","ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0c0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+        UIC1: interrupt-controller1 {
+                compatible = "ibm,uic-460ex","ibm,uic";
+                interrupt-controller;
+                cell-index = <1>;
+                dcr-reg = <0d0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+        UIC2: interrupt-controller2 {
+                compatible = "ibm,uic-460ex","ibm,uic";
+                interrupt-controller;
+                cell-index = <2>;
+                dcr-reg = <0e0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <a 4 b 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+        UIC3: interrupt-controller3 {
+                compatible = "ibm,uic-460ex","ibm,uic";
+                interrupt-controller;
+                cell-index = <3>;
+                dcr-reg = <0f0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <10 4 11 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+        SDR0: sdr {
+                compatible = "ibm,sdr-460ex";
+                dcr-reg = <00e 002>;
+        };
+        CPR0: cpr {
+                compatible = "ibm,cpr-460ex";
+                dcr-reg = <00c 002>;
+        };
+        plb {
+                compatible = "ibm,plb-460ex", "ibm,plb4";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by U-Boot */
+                SDRAM0: sdram {
+                        compatible = "ibm,sdram-460ex", "ibm,sdram-405gp";
+                        dcr-reg = <010 2>;
+                };
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-460ex", "ibm,mcmal2";
+                        dcr-reg = <180 62>;
+                        num-tx-chans = <2>;
+                        num-rx-chans = <10>;
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        interrupt-parent = <&UIC2>;
+                        interrupts = <  /*TXEOB*/ 6 4
+                                        /*RXEOB*/ 7 4
+                                        /*SERR*/  3 4
+                                        /*TXDE*/  4 4
+                                        /*RXDE*/  5 4>;
+                };
+                POB0: opb {
+                        compatible = "ibm,opb-460ex", "ibm,opb";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <b0000000 4 b0000000 50000000>;
+                        clock-frequency = <0>; /* Filled in by U-Boot */
+                        EBC0: ebc {
+                                compatible = "ibm,ebc-460ex", "ibm,ebc";
+                                dcr-reg = <012 2>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                interrupts = <6 4>;
+                                interrupt-parent = <&UIC1>;
+                        };
+                        UART0: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600300 8>;
+                                virtual-reg = <ef600300>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>; /* Filled in by U-Boot */
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <1 4>;
+                        };
+                        UART1: serial@ef600400 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600400 8>;
+                                virtual-reg = <ef600400>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>; /* Filled in by U-Boot */
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+                        UART2: serial@ef600500 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600500 8>;
+                                virtual-reg = <ef600500>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>; /* Filled in by U-Boot */
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <1d 4>;
+                        };
+                        UART3: serial@ef600600 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600600 8>;
+                                virtual-reg = <ef600600>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>; /* Filled in by U-Boot */
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <1e 4>;
+                        };
+                        IIC0: i2c@ef600700 {
+                                compatible = "ibm,iic-460ex", "ibm,iic";
+                                reg = <ef600700 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+                        IIC1: i2c@ef600800 {
+                                compatible = "ibm,iic-460ex", "ibm,iic";
+                                reg = <ef600800 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <3 4>;
+                        };
+                        ZMII0: emac-zmii@ef600d00 {
+                                compatible = "ibm,zmii-460ex", "ibm,zmii";
+                                reg = <ef600d00 c>;
+                        };
+                        RGMII0: emac-rgmii@ef601500 {
+                                compatible = "ibm,rgmii-460ex", "ibm,rgmii";
+                                reg = <ef601500 8>;
+                                has-mdio;
+                        };
+                        TAH0: emac-tah@ef601350 {
+                                compatible = "ibm,tah-460ex", "ibm,tah";
+                                reg = <ef601350 30>;
+                        };
+                        TAH1: emac-tah@ef601450 {
+                                compatible = "ibm,tah-460ex", "ibm,tah";
+                                reg = <ef601450 30>;
+                        };
+                        EMAC0: ethernet@ef600e00 {
+                                device_type = "network";
+                                compatible = "ibm,emac-460ex", "ibm,emac4";
+                                interrupt-parent = <&EMAC0>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC2 10 4
+                                                 /*Wake*/   1 &UIC2 14 4>;
+                                reg = <ef600e00 70>;
+                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <0>;
+                                mal-rx-channel = <0>;
+                                cell-index = <0>;
+                                max-frame-size = <2328>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000000>;
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <0>;
+                                tah-device = <&TAH0>;
+                                tah-channel = <0>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                        };
+                        EMAC1: ethernet@ef600f00 {
+                                device_type = "network";
+                                compatible = "ibm,emac-460ex", "ibm,emac4";
+                                interrupt-parent = <&EMAC1>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC2 11 4
+                                                 /*Wake*/   1 &UIC2 15 4>;
+                                reg = <ef600f00 70>;
+                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <1>;
+                                mal-rx-channel = <8>;
+                                cell-index = <1>;
+                                max-frame-size = <2328>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000000>;
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <1>;
+                                tah-device = <&TAH1>;
+                                tah-channel = <1>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                                mdio-device = <&EMAC0>;
+                        };
+                };
+                PCIX0: pci@c0ec00000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "ibm,plb-pcix-460ex", "ibm,plb-pcix";
+                        primary;
+                        large-inbound-windows;
+                        enable-msi-hole;
+                        reg = <c 0ec00000   8   /* Config space access */
+                               0 0 0            /* no IACK cycles */
+                               c 0ed00000   4   /* Special cycles */
+                               c 0ec80000 100   /* Internal registers */
+                               c 0ec80100  fc>; /* Internal messaging registers */
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed
+                         */
+                        ranges = <02000000 0 80000000 0000000d 80000000 0 80000000
+                                  01000000 0 00000000 0000000c 08000000 0 00010000>;
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        /* This drives busses 0 to 0x3f */
+                        bus-range = <0 3f>;
+                        /* All PCI interrupts are routed to ext IRQ 2 -> UIC1-0 */
+                        interrupt-map-mask = <0000 0 0 0>;
+                        interrupt-map = < 0000 0 0 0 &UIC1 0 8 >;
+                };
+                PCIE0: pciex@d00000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
+                        primary;
+                        port = <0>; /* port number */
+                        reg = <d 00000000 20000000      /* Config space access */
+                               c 08010000 00001000>;    /* Registers */
+                        dcr-reg = <100 020>;
+                        sdr-base = <300>;
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed
+                         */
+                        ranges = <02000000 0 80000000 0000000e 00000000 0 80000000
+                                  01000000 0 00000000 0000000f 80000000 0 00010000>;
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        /* This drives busses 40 to 0x7f */
+                        bus-range = <40 7f>;
+                        /* Legacy interrupts (note the weird polarity, the bridge seems
+                         * to invert PCIe legacy interrupts).
+                         * We are de-swizzling here because the numbers are actually for
+                         * port of the root complex virtual P2P bridge. But I want
+                         * to avoid putting a node for it in the tree, so the numbers
+                         * below are basically de-swizzled numbers.
+                         * The real slot is on idsel 0, so the swizzling is 1:1
+                         */
+                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map = <
+                                0000 0 0 1 &UIC3 c 4 /* swizzled int A */
+                                0000 0 0 2 &UIC3 d 4 /* swizzled int B */
+                                0000 0 0 3 &UIC3 e 4 /* swizzled int C */
+                                0000 0 0 4 &UIC3 f 4 /* swizzled int D */>;
+                };
+                PCIE1: pciex@d20000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
+                        primary;
+                        port = <1>; /* port number */
+                        reg = <d 20000000 20000000      /* Config space access */
+                               c 08011000 00001000>;    /* Registers */
+                        dcr-reg = <120 020>;
+                        sdr-base = <340>;
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed
+                         */
+                        ranges = <02000000 0 80000000 0000000e 80000000 0 80000000
+                                  01000000 0 00000000 0000000f 80010000 0 00010000>;
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        /* This drives busses 80 to 0xbf */
+                        bus-range = <80 bf>;
+                        /* Legacy interrupts (note the weird polarity, the bridge seems
+                         * to invert PCIe legacy interrupts).
+                         * We are de-swizzling here because the numbers are actually for
+                         * port of the root complex virtual P2P bridge. But I want
+                         * to avoid putting a node for it in the tree, so the numbers
+                         * below are basically de-swizzled numbers.
+                         * The real slot is on idsel 0, so the swizzling is 1:1
+                         */
+                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map = <
+                                0000 0 0 1 &UIC3 10 4 /* swizzled int A */
+                                0000 0 0 2 &UIC3 11 4 /* swizzled int B */
+                                0000 0 0 3 &UIC3 12 4 /* swizzled int C */
+                                0000 0 0 4 &UIC3 13 4 /* swizzled int D */>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index 0b000cb7ed8b..5079dc890e0e 100644
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -241,7 +241,6 @@
                        };
                        EMAC0: ethernet@40000800 {
-                                linux,network-index = <0>;
                                device_type = "network";
                                compatible = "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;
@@ -261,7 +260,6 @@
                                zmii-channel = <0>;
                        };
                        EMAC1: ethernet@40000900 {
-                                linux,network-index = <1>;
                                device_type = "network";
                                compatible = "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;
diff --git a/arch/powerpc/boot/dts/glacier.dts b/arch/powerpc/boot/dts/glacier.dts
new file mode 100644
index 000000000000..958a5ca53d35
--- /dev/null
+++ b/arch/powerpc/boot/dts/glacier.dts
@@ -0,0 +1,467 @@
+/*
+ * Device Tree Source for AMCC Glacier (460GT)
+ *
+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ */
+/ {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        model = "amcc,glacier";
+        compatible = "amcc,glacier", "amcc,canyonlands";
+        dcr-parent = <&/cpus/cpu@0>;
+        aliases {
+                ethernet0 = &EMAC0;
+                ethernet1 = &EMAC1;
+                ethernet2 = &EMAC2;
+                ethernet3 = &EMAC3;
+                serial0 = &UART0;
+                serial1 = &UART1;
+        };
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                cpu@0 {
+                        device_type = "cpu";
+                        model = "PowerPC,460GT";
+                        reg = <0>;
+                        clock-frequency = <0>; /* Filled in by U-Boot */
+                        timebase-frequency = <0>; /* Filled in by U-Boot */
+                        i-cache-line-size = <20>;
+                        d-cache-line-size = <20>;
+                        i-cache-size = <8000>;
+                        d-cache-size = <8000>;
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+        memory {
+                device_type = "memory";
+                reg = <0 0 0>; /* Filled in by U-Boot */
+        };
+        UIC0: interrupt-controller0 {
+                compatible = "ibm,uic-460gt","ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0c0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+        UIC1: interrupt-controller1 {
+                compatible = "ibm,uic-460gt","ibm,uic";
+                interrupt-controller;
+                cell-index = <1>;
+                dcr-reg = <0d0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+        UIC2: interrupt-controller2 {
+                compatible = "ibm,uic-460gt","ibm,uic";
+                interrupt-controller;
+                cell-index = <2>;
+                dcr-reg = <0e0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <a 4 b 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+        UIC3: interrupt-controller3 {
+                compatible = "ibm,uic-460gt","ibm,uic";
+                interrupt-controller;
+                cell-index = <3>;
+                dcr-reg = <0f0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <10 4 11 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+        SDR0: sdr {
+                compatible = "ibm,sdr-460gt";
+                dcr-reg = <00e 002>;
+        };
+        CPR0: cpr {
+                compatible = "ibm,cpr-460gt";
+                dcr-reg = <00c 002>;
+        };
+        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 = <010 2>;
+                };
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-460gt", "ibm,mcmal2";
+                        dcr-reg = <180 62>;
+                        num-tx-chans = <4>;
+                        num-rx-chans = <20>;
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        interrupt-parent = <&UIC2>;
+                        interrupts = <  /*TXEOB*/ 6 4
+                                        /*RXEOB*/ 7 4
+                                        /*SERR*/  3 4
+                                        /*TXDE*/  4 4
+                                        /*RXDE*/  5 4>;
+                        desc-base-addr-high = <8>;
+                };
+                POB0: opb {
+                        compatible = "ibm,opb-460gt", "ibm,opb";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges = <b0000000 4 b0000000 50000000>;
+                        clock-frequency = <0>; /* Filled in by U-Boot */
+                        EBC0: ebc {
+                                compatible = "ibm,ebc-460gt", "ibm,ebc";
+                                dcr-reg = <012 2>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                interrupts = <6 4>;
+                                interrupt-parent = <&UIC1>;
+                        };
+                        UART0: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600300 8>;
+                                virtual-reg = <ef600300>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>; /* Filled in by U-Boot */
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <1 4>;
+                        };
+                        UART1: serial@ef600400 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600400 8>;
+                                virtual-reg = <ef600400>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>; /* Filled in by U-Boot */
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+                        UART2: serial@ef600500 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600500 8>;
+                                virtual-reg = <ef600500>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>; /* Filled in by U-Boot */
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <1d 4>;
+                        };
+                        UART3: serial@ef600600 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600600 8>;
+                                virtual-reg = <ef600600>;
+                                clock-frequency = <0>; /* Filled in by U-Boot */
+                                current-speed = <0>; /* Filled in by U-Boot */
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <1e 4>;
+                        };
+                        IIC0: i2c@ef600700 {
+                                compatible = "ibm,iic-460gt", "ibm,iic";
+                                reg = <ef600700 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+                        IIC1: i2c@ef600800 {
+                                compatible = "ibm,iic-460gt", "ibm,iic";
+                                reg = <ef600800 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <3 4>;
+                        };
+                        ZMII0: emac-zmii@ef600d00 {
+                                compatible = "ibm,zmii-460gt", "ibm,zmii";
+                                reg = <ef600d00 c>;
+                        };
+                        RGMII0: emac-rgmii@ef601500 {
+                                compatible = "ibm,rgmii-460gt", "ibm,rgmii";
+                                reg = <ef601500 8>;
+                                has-mdio;
+                        };
+                        RGMII1: emac-rgmii@ef601600 {
+                                compatible = "ibm,rgmii-460gt", "ibm,rgmii";
+                                reg = <ef601600 8>;
+                                has-mdio;
+                        };
+                        TAH0: emac-tah@ef601350 {
+                                compatible = "ibm,tah-460gt", "ibm,tah";
+                                reg = <ef601350 30>;
+                        };
+                        TAH1: emac-tah@ef601450 {
+                                compatible = "ibm,tah-460gt", "ibm,tah";
+                                reg = <ef601450 30>;
+                        };
+                        EMAC0: ethernet@ef600e00 {
+                                device_type = "network";
+                                compatible = "ibm,emac-460gt", "ibm,emac4";
+                                interrupt-parent = <&EMAC0>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC2 10 4
+                                                 /*Wake*/   1 &UIC2 14 4>;
+                                reg = <ef600e00 70>;
+                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <0>;
+                                mal-rx-channel = <0>;
+                                cell-index = <0>;
+                                max-frame-size = <2328>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000000>;
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <0>;
+                                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,emac4";
+                                interrupt-parent = <&EMAC1>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC2 11 4
+                                                 /*Wake*/   1 &UIC2 15 4>;
+                                reg = <ef600f00 70>;
+                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <1>;
+                                mal-rx-channel = <8>;
+                                cell-index = <1>;
+                                max-frame-size = <2328>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000000>;
+                                rgmii-device = <&RGMII0>;
+                                rgmii-channel = <1>;
+                                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,emac4";
+                                interrupt-parent = <&EMAC2>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC2 12 4
+                                                 /*Wake*/   1 &UIC2 16 4>;
+                                reg = <ef601100 70>;
+                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <2>;
+                                mal-rx-channel = <10>;
+                                cell-index = <2>;
+                                max-frame-size = <2328>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000000>;
+                                rgmii-device = <&RGMII1>;
+                                rgmii-channel = <0>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                                mdio-device = <&EMAC0>;
+                        };
+                        EMAC3: ethernet@ef601200 {
+                                device_type = "network";
+                                compatible = "ibm,emac-460gt", "ibm,emac4";
+                                interrupt-parent = <&EMAC3>;
+                                interrupts = <0 1>;
+                                #interrupt-cells = <1>;
+                                #address-cells = <0>;
+                                #size-cells = <0>;
+                                interrupt-map = </*Status*/ 0 &UIC2 13 4
+                                                 /*Wake*/   1 &UIC2 17 4>;
+                                reg = <ef601200 70>;
+                                local-mac-address = [000000000000]; /* Filled in by U-Boot */
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <3>;
+                                mal-rx-channel = <18>;
+                                cell-index = <3>;
+                                max-frame-size = <2328>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rgmii";
+                                phy-map = <00000000>;
+                                rgmii-device = <&RGMII1>;
+                                rgmii-channel = <1>;
+                                has-inverted-stacr-oc;
+                                has-new-stacr-staopc;
+                                mdio-device = <&EMAC0>;
+                        };
+                };
+                PCIX0: pci@c0ec00000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "ibm,plb-pcix-460gt", "ibm,plb-pcix";
+                        primary;
+                        large-inbound-windows;
+                        enable-msi-hole;
+                        reg = <c 0ec00000   8   /* Config space access */
+                               0 0 0            /* no IACK cycles */
+                               c 0ed00000   4   /* Special cycles */
+                               c 0ec80000 100   /* Internal registers */
+                               c 0ec80100  fc>; /* Internal messaging registers */
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed
+                         */
+                        ranges = <02000000 0 80000000 0000000d 80000000 0 80000000
+                                  01000000 0 00000000 0000000c 08000000 0 00010000>;
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        /* This drives busses 0 to 0x3f */
+                        bus-range = <0 3f>;
+                        /* All PCI interrupts are routed to ext IRQ 2 -> UIC1-0 */
+                        interrupt-map-mask = <0000 0 0 0>;
+                        interrupt-map = < 0000 0 0 0 &UIC1 0 8 >;
+                };
+                PCIE0: pciex@d00000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
+                        primary;
+                        port = <0>; /* port number */
+                        reg = <d 00000000 20000000      /* Config space access */
+                               c 08010000 00001000>;    /* Registers */
+                        dcr-reg = <100 020>;
+                        sdr-base = <300>;
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed
+                         */
+                        ranges = <02000000 0 80000000 0000000e 00000000 0 80000000
+                                  01000000 0 00000000 0000000f 80000000 0 00010000>;
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        /* This drives busses 40 to 0x7f */
+                        bus-range = <40 7f>;
+                        /* Legacy interrupts (note the weird polarity, the bridge seems
+                         * to invert PCIe legacy interrupts).
+                         * We are de-swizzling here because the numbers are actually for
+                         * port of the root complex virtual P2P bridge. But I want
+                         * to avoid putting a node for it in the tree, so the numbers
+                         * below are basically de-swizzled numbers.
+                         * The real slot is on idsel 0, so the swizzling is 1:1
+                         */
+                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map = <
+                                0000 0 0 1 &UIC3 c 4 /* swizzled int A */
+                                0000 0 0 2 &UIC3 d 4 /* swizzled int B */
+                                0000 0 0 3 &UIC3 e 4 /* swizzled int C */
+                                0000 0 0 4 &UIC3 f 4 /* swizzled int D */>;
+                };
+                PCIE1: pciex@d20000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "ibm,plb-pciex-460ex", "ibm,plb-pciex";
+                        primary;
+                        port = <1>; /* port number */
+                        reg = <d 20000000 20000000      /* Config space access */
+                               c 08011000 00001000>;    /* Registers */
+                        dcr-reg = <120 020>;
+                        sdr-base = <340>;
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed
+                         */
+                        ranges = <02000000 0 80000000 0000000e 80000000 0 80000000
+                                  01000000 0 00000000 0000000f 80010000 0 00010000>;
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        /* This drives busses 80 to 0xbf */
+                        bus-range = <80 bf>;
+                        /* Legacy interrupts (note the weird polarity, the bridge seems
+                         * to invert PCIe legacy interrupts).
+                         * We are de-swizzling here because the numbers are actually for
+                         * port of the root complex virtual P2P bridge. But I want
+                         * to avoid putting a node for it in the tree, so the numbers
+                         * below are basically de-swizzled numbers.
+                         * The real slot is on idsel 0, so the swizzling is 1:1
+                         */
+                        interrupt-map-mask = <0000 0 0 7>;
+                        interrupt-map = <
+                                0000 0 0 1 &UIC3 10 4 /* swizzled int A */
+                                0000 0 0 2 &UIC3 11 4 /* swizzled int B */
+                                0000 0 0 3 &UIC3 12 4 /* swizzled int C */
+                                0000 0 0 4 &UIC3 13 4 /* swizzled int D */>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/haleakala.dts b/arch/powerpc/boot/dts/haleakala.dts
index ae68fefc01b6..b5d95ac24dbf 100644
--- a/arch/powerpc/boot/dts/haleakala.dts
+++ b/arch/powerpc/boot/dts/haleakala.dts
@@ -12,7 +12,7 @@
        #address-cells = <1>;
        #size-cells = <1>;
        model = "amcc,haleakala";
-        compatible = "amcc,kilauea";
+        compatible = "amcc,haleakala", "amcc,kilauea";
        dcr-parent = <&/cpus/cpu@0>;
        aliases {
@@ -218,7 +218,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;
                                cell-index = <0>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts
index fc86e5a3afc4..cc2873a531d2 100644
--- a/arch/powerpc/boot/dts/katmai.dts
+++ b/arch/powerpc/boot/dts/katmai.dts
@@ -212,7 +212,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;
                                cell-index = <0>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "gmii";
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index 8baef61f31cd..48c9a6e71f1a 100644
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -219,7 +219,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;
                                cell-index = <0>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
@@ -247,7 +247,7 @@
                                mal-tx-channel = <1>;
                                mal-rx-channel = <1>;
                                cell-index = <1>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
diff --git a/arch/powerpc/boot/dts/ksi8560.dts b/arch/powerpc/boot/dts/ksi8560.dts
new file mode 100644
index 000000000000..f869ce3ca0b7
--- /dev/null
+++ b/arch/powerpc/boot/dts/ksi8560.dts
@@ -0,0 +1,267 @@
+/*
+ * Device Tree Source for Emerson KSI8560
+ *
+ * Author: Alexandr Smirnov <asmirnov@ru.mvista.com>
+ *
+ * Based on mpc8560ads.dts
+ *
+ * 2008 (c) MontaVista, Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ *
+ */
+/dts-v1/;
+/ {
+        model = "KSI8560";
+        compatible = "emerson,KSI8560";
+        #address-cells = <1>;
+        #size-cells = <1>;
+        aliases {
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                ethernet2 = &enet2;
+        };
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                PowerPC,8560@0 {
+                        device_type = "cpu";
+                        reg = <0>;
+                        d-cache-line-size = <32>;
+                        i-cache-line-size = <32>;
+                        d-cache-size = <0x8000>;                /* L1, 32K */
+                        i-cache-size = <0x8000>;                /* L1, 32K */
+                        timebase-frequency = <0>;               /* From U-boot */
+                        bus-frequency = <0>;                    /* From U-boot */
+                        clock-frequency = <0>;                  /* From U-boot */
+                };
+        };
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;                  /* Fixed by bootwrapper */
+        };
+        soc@fdf00000 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                device_type = "soc";
+                ranges = <0x00000000 0xfdf00000 0x00100000>;
+                bus-frequency = <0>;                            /* Fixed by bootwrapper */
+                memory-controller@2000 {
+                        compatible = "fsl,8540-memory-controller";
+                        reg = <0x2000 0x1000>;
+                        interrupt-parent = <&MPIC>;
+                        interrupts = <0x12 0x2>;
+                };
+                l2-cache-controller@20000 {
+                        compatible = "fsl,8540-l2-cache-controller";
+                        reg = <0x20000 0x1000>;
+                        cache-line-size = <0x20>;               /* 32 bytes */
+                        cache-size = <0x40000>;                 /* L2, 256K */
+                        interrupt-parent = <&MPIC>;
+                        interrupts = <0x10 0x2>;
+                };
+                i2c@3000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        cell-index = <0>;
+                        compatible = "fsl-i2c";
+                        reg = <0x3000 0x100>;
+                        interrupts = <0x2b 0x2>;
+                        interrupt-parent = <&MPIC>;
+                        dfsrr;
+                };
+                mdio@24520 {                                    /* For TSECs */
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "fsl,gianfar-mdio";
+                        reg = <0x24520 0x20>;
+                        PHY1: ethernet-phy@1 {
+                                interrupt-parent = <&MPIC>;
+                                reg = <0x1>;
+                                device_type = "ethernet-phy";
+                        };
+                        PHY2: ethernet-phy@2 {
+                                interrupt-parent = <&MPIC>;
+                                reg = <0x2>;
+                                device_type = "ethernet-phy";
+                        };
+                };
+                enet0: ethernet@24000 {
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x24000 0x1000>;
+                        /* Mac address filled in by bootwrapper */
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <0x1d 0x2 0x1e 0x2 0x22 0x2>;
+                        interrupt-parent = <&MPIC>;
+                        phy-handle = <&PHY1>;
+                };
+                enet1: ethernet@25000 {
+                        device_type = "network";
+                        model = "TSEC";
+                        compatible = "gianfar";
+                        reg = <0x25000 0x1000>;
+                        /* Mac address filled in by bootwrapper */
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <0x23 0x2 0x24 0x2 0x28 0x2>;
+                        interrupt-parent = <&MPIC>;
+                        phy-handle = <&PHY2>;
+                };
+                MPIC: pic@40000 {
+                        #address-cells = <0>;
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+                        reg = <0x40000 0x40000>;
+                        device_type = "open-pic";
+                };
+                cpm@919c0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,mpc8560-cpm", "fsl,cpm2";
+                        reg = <0x919c0 0x30>;
+                        ranges;
+                        muram@80000 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                ranges = <0x0 0x80000 0x10000>;
+                                data@0 {
+                                        compatible = "fsl,cpm-muram-data";
+                                        reg = <0x0 0x4000 0x9000 0x2000>;
+                                };
+                        };
+                        brg@919f0 {
+                                compatible = "fsl,mpc8560-brg",
+                                             "fsl,cpm2-brg",
+                                             "fsl,cpm-brg";
+                                reg = <0x919f0 0x10 0x915f0 0x10>;
+                                clock-frequency = <165000000>;  /* 166MHz */
+                        };
+                        CPMPIC: pic@90c00 {
+                                #address-cells = <0>;
+                                #interrupt-cells = <2>;
+                                interrupt-controller;
+                                interrupts = <0x2e 0x2>;
+                                interrupt-parent = <&MPIC>;
+                                reg = <0x90c00 0x80>;
+                                compatible = "fsl,mpc8560-cpm-pic", "fsl,cpm2-pic";
+                        };
+                        serial@91a00 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc8560-scc-uart",
+                                             "fsl,cpm2-scc-uart";
+                                reg = <0x91a00 0x20 0x88000 0x100>;
+                                fsl,cpm-brg = <1>;
+                                fsl,cpm-command = <0x800000>;
+                                current-speed = <0x1c200>;
+                                interrupts = <0x28 0x8>;
+                                interrupt-parent = <&CPMPIC>;
+                        };
+                        serial@91a20 {
+                                device_type = "serial";
+                                compatible = "fsl,mpc8560-scc-uart",
+                                             "fsl,cpm2-scc-uart";
+                                reg = <0x91a20 0x20 0x88100 0x100>;
+                                fsl,cpm-brg = <2>;
+                                fsl,cpm-command = <0x4a00000>;
+                                current-speed = <0x1c200>;
+                                interrupts = <0x29 0x8>;
+                                interrupt-parent = <&CPMPIC>;
+                        };
+                        mdio@90d00 {                            /* For FCCs */
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                compatible = "fsl,cpm2-mdio-bitbang";
+                                reg = <0x90d00 0x14>;
+                                fsl,mdio-pin = <24>;
+                                fsl,mdc-pin = <25>;
+                                PHY0: ethernet-phy@0 {
+                                        interrupt-parent = <&MPIC>;
+                                        reg = <0x0>;
+                                        device_type = "ethernet-phy";
+                                };
+                        };
+                        enet2: ethernet@91300 {
+                                device_type = "network";
+                                compatible = "fsl,mpc8560-fcc-enet",
+                                             "fsl,cpm2-fcc-enet";
+                                reg = <0x91300 0x20 0x88400 0x100 0x91390 0x1>;
+                                /* Mac address filled in by bootwrapper */
+                                local-mac-address = [ 00 00 00 00 00 00 ];
+                                fsl,cpm-command = <0x12000300>;
+                                interrupts = <0x20 0x8>;
+                                interrupt-parent = <&CPMPIC>;
+                                phy-handle = <&PHY0>;
+                        };
+                };
+        };
+        localbus@fdf05000 {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "fsl,mpc8560-localbus";
+                reg = <0xfdf05000 0x68>;
+                ranges = <0x0 0x0 0xe0000000 0x00800000
+                          0x4 0x0 0xe8080000 0x00080000>;
+                flash@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "jedec-flash";
+                        reg = <0x0 0x0 0x800000>;
+                        bank-width = <0x2>;
+                        partition@0 {
+                                label = "Primary Kernel";
+                                reg = <0x0 0x180000>;
+                        };
+                        partition@180000 {
+                                label = "Primary Filesystem";
+                                reg = <0x180000 0x580000>;
+                        };
+                        partition@700000 {
+                                label = "Monitor";
+                                reg = <0x300000 0x100000>;
+                                read-only;
+                        };
+                };
+                cpld@4,0 {
+                        compatible = "emerson,KSI8560-cpld";
+                        reg = <0x4 0x0 0x80000>;
+                };
+        };
+        chosen {
+                linux,stdout-path = "/soc/cpm/serial@91a00";
+        };
+};
diff --git a/arch/powerpc/boot/dts/makalu.dts b/arch/powerpc/boot/dts/makalu.dts
index 710c01168179..84cc5e72ddd8 100644
--- a/arch/powerpc/boot/dts/makalu.dts
+++ b/arch/powerpc/boot/dts/makalu.dts
@@ -219,7 +219,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;
                                cell-index = <0>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
@@ -247,7 +247,7 @@
                                mal-tx-channel = <1>;
                                mal-rx-channel = <1>;
                                cell-index = <1>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
diff --git a/arch/powerpc/boot/dts/rainier.dts b/arch/powerpc/boot/dts/rainier.dts
index f947c75a2e94..6a8fa7089ea2 100644
--- a/arch/powerpc/boot/dts/rainier.dts
+++ b/arch/powerpc/boot/dts/rainier.dts
@@ -254,7 +254,6 @@
                        };
                        EMAC0: ethernet@ef600e00 {
-                                linux,network-index = <0>;
                                device_type = "network";
                                compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4";
                                interrupt-parent = <&EMAC0>;
@@ -270,7 +269,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;
                                cell-index = <0>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
@@ -284,7 +283,6 @@
                        };
                        EMAC1: ethernet@ef600f00 {
-                                linux,network-index = <1>;
                                device_type = "network";
                                compatible = "ibm,emac-440grx", "ibm,emac-440epx", "ibm,emac4";
                                interrupt-parent = <&EMAC1>;
@@ -300,7 +298,7 @@
                                mal-tx-channel = <1>;
                                mal-rx-channel = <1>;
                                cell-index = <1>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 8db9515d7dc3..a1ae4d6ec990 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -269,7 +269,6 @@
                        };
                        EMAC0: ethernet@ef600e00 {
-                                linux,network-index = <0>;
                                device_type = "network";
                                compatible = "ibm,emac-440epx", "ibm,emac4";
                                interrupt-parent = <&EMAC0>;
@@ -285,7 +284,7 @@
                                mal-tx-channel = <0>;
                                mal-rx-channel = <0>;
                                cell-index = <0>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
@@ -299,7 +298,6 @@
                        };
                        EMAC1: ethernet@ef600f00 {
-                                linux,network-index = <1>;
                                device_type = "network";
                                compatible = "ibm,emac-440epx", "ibm,emac4";
                                interrupt-parent = <&EMAC1>;
@@ -315,7 +313,7 @@
                                mal-tx-channel = <1>;
                                mal-rx-channel = <1>;
                                cell-index = <1>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts
index 8278068c802c..e808e1c5593a 100644
--- a/arch/powerpc/boot/dts/taishan.dts
+++ b/arch/powerpc/boot/dts/taishan.dts
@@ -104,6 +104,16 @@
                // FIXME: anything else?
        };
+        L2C0: l2c {
+                compatible = "ibm,l2-cache-440gx", "ibm,l2-cache";
+                dcr-reg = <20 8                 /* Internal SRAM DCR's */
+                           30 8>;               /* L2 cache DCR's */
+                cache-line-size = <20>;         /* 32 bytes */
+                cache-size = <40000>;           /* L2, 256K */
+                interrupt-parent = <&UIC2>;
+                interrupts = <17 1>;
+        };
        plb {
                compatible = "ibm,plb-440gx", "ibm,plb4";
                #address-cells = <2>;
@@ -232,10 +242,18 @@
                                reg = <40000790 8>;
                        };
+                        TAH0: emac-tah@40000b50 {
+                                compatible = "ibm,tah-440gx", "ibm,tah";
+                                reg = <40000b50 30>;
+                        };
+                        TAH1: emac-tah@40000d50 {
+                                compatible = "ibm,tah-440gx", "ibm,tah";
+                                reg = <40000d50 30>;
+                        };
                        EMAC0: ethernet@40000800 {
                                unused = <1>;
-                                linux,network-index = <2>;
                                device_type = "network";
                                compatible = "ibm,emac-440gx", "ibm,emac4";
                                interrupt-parent = <&UIC1>;
@@ -256,7 +274,6 @@
                        };
                        EMAC1: ethernet@40000900 {
                                unused = <1>;
-                                linux,network-index = <3>;
                                device_type = "network";
                                compatible = "ibm,emac-440gx", "ibm,emac4";
                                interrupt-parent = <&UIC1>;
@@ -277,7 +294,6 @@
                        };
                        EMAC2: ethernet@40000c00 {
-                                linux,network-index = <0>;
                                device_type = "network";
                                compatible = "ibm,emac-440gx", "ibm,emac4";
                                interrupt-parent = <&UIC2>;
@@ -288,7 +304,7 @@
                                mal-tx-channel = <2>;
                                mal-rx-channel = <2>;
                                cell-index = <2>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
@@ -297,10 +313,11 @@
                                rgmii-channel = <0>;
                                zmii-device = <&ZMII0>;
                                zmii-channel = <2>;
+                                tah-device = <&TAH0>;
+                                tah-channel = <0>;
                        };
                        EMAC3: ethernet@40000e00 {
-                                linux,network-index = <1>;
                                device_type = "network";
                                compatible = "ibm,emac-440gx", "ibm,emac4";
                                interrupt-parent = <&UIC2>;
@@ -311,7 +328,7 @@
                                mal-tx-channel = <3>;
                                mal-rx-channel = <3>;
                                cell-index = <3>;
-                                max-frame-size = <5dc>;
+                                max-frame-size = <2328>;
                                rx-fifo-size = <1000>;
                                tx-fifo-size = <800>;
                                phy-mode = "rgmii";
@@ -320,6 +337,8 @@
                                rgmii-channel = <1>;
                                zmii-device = <&ZMII0>;
                                zmii-channel = <3>;
+                                tah-device = <&TAH1>;
+                                tah-channel = <0>;
                        };
diff --git a/arch/powerpc/boot/dts/walnut.dts b/arch/powerpc/boot/dts/walnut.dts
index dcc21b0438e5..a328607c8f84 100644
--- a/arch/powerpc/boot/dts/walnut.dts
+++ b/arch/powerpc/boot/dts/walnut.dts
@@ -125,7 +125,6 @@
                        };
                        EMAC: ethernet@ef600800 {
-                                linux,network-index = <0>;
                                device_type = "network";
                                compatible = "ibm,emac-405gp", "ibm,emac";
                                interrupt-parent = <&UIC0>;
diff --git a/arch/powerpc/boot/dts/warp.dts b/arch/powerpc/boot/dts/warp.dts
index dc1499d30f43..b04a52e22bf5 100644
--- a/arch/powerpc/boot/dts/warp.dts
+++ b/arch/powerpc/boot/dts/warp.dts
@@ -204,7 +204,6 @@
                        };
                        EMAC0: ethernet@ef600e00 {
-                                linux,network-index = <0>;
                                device_type = "network";
                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
                                interrupt-parent = <&UIC1>;
diff --git a/arch/powerpc/boot/dts/yosemite.dts b/arch/powerpc/boot/dts/yosemite.dts
new file mode 100644
index 000000000000..0d6d332814e0
--- /dev/null
+++ b/arch/powerpc/boot/dts/yosemite.dts
@@ -0,0 +1,304 @@
+/*
+ * Device Tree Source for AMCC Yosemite
+ *
+ * Copyright 2008 IBM Corp.
+ * Josh Boyer <jwboyer@linux.vnet.ibm.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ */
+/ {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        model = "amcc,yosemite";
+        compatible = "amcc,yosemite","amcc,bamboo";
+        dcr-parent = <&/cpus/cpu@0>;
+        aliases {
+                ethernet0 = &EMAC0;
+                ethernet1 = &EMAC1;
+                serial0 = &UART0;
+                serial1 = &UART1;
+                serial2 = &UART2;
+                serial3 = &UART3;
+        };
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                cpu@0 {
+                        device_type = "cpu";
+                        model = "PowerPC,440EP";
+                        reg = <0>;
+                        clock-frequency = <0>; /* Filled in by zImage */
+                        timebase-frequency = <0>; /* Filled in by zImage */
+                        i-cache-line-size = <20>;
+                        d-cache-line-size = <20>;
+                        i-cache-size = <8000>;
+                        d-cache-size = <8000>;
+                        dcr-controller;
+                        dcr-access-method = "native";
+                };
+        };
+        memory {
+                device_type = "memory";
+                reg = <0 0 0>; /* Filled in by zImage */
+        };
+        UIC0: interrupt-controller0 {
+                compatible = "ibm,uic-440ep","ibm,uic";
+                interrupt-controller;
+                cell-index = <0>;
+                dcr-reg = <0c0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+        };
+        UIC1: interrupt-controller1 {
+                compatible = "ibm,uic-440ep","ibm,uic";
+                interrupt-controller;
+                cell-index = <1>;
+                dcr-reg = <0d0 009>;
+                #address-cells = <0>;
+                #size-cells = <0>;
+                #interrupt-cells = <2>;
+                interrupts = <1e 4 1f 4>; /* cascade */
+                interrupt-parent = <&UIC0>;
+        };
+        SDR0: sdr {
+                compatible = "ibm,sdr-440ep";
+                dcr-reg = <00e 002>;
+        };
+        CPR0: cpr {
+                compatible = "ibm,cpr-440ep";
+                dcr-reg = <00c 002>;
+        };
+        plb {
+                compatible = "ibm,plb-440ep", "ibm,plb-440gp", "ibm,plb4";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                ranges;
+                clock-frequency = <0>; /* Filled in by zImage */
+                SDRAM0: sdram {
+                        compatible = "ibm,sdram-440ep", "ibm,sdram-405gp";
+                        dcr-reg = <010 2>;
+                };
+                DMA0: dma {
+                        compatible = "ibm,dma-440ep", "ibm,dma-440gp";
+                        dcr-reg = <100 027>;
+                };
+                MAL0: mcmal {
+                        compatible = "ibm,mcmal-440ep", "ibm,mcmal-440gp", "ibm,mcmal";
+                        dcr-reg = <180 62>;
+                        num-tx-chans = <4>;
+                        num-rx-chans = <2>;
+                        interrupt-parent = <&MAL0>;
+                        interrupts = <0 1 2 3 4>;
+                        #interrupt-cells = <1>;
+                        #address-cells = <0>;
+                        #size-cells = <0>;
+                        interrupt-map = </*TXEOB*/ 0 &UIC0 a 4
+                                        /*RXEOB*/ 1 &UIC0 b 4
+                                        /*SERR*/  2 &UIC1 0 4
+                                        /*TXDE*/  3 &UIC1 1 4
+                                        /*RXDE*/  4 &UIC1 2 4>;
+                };
+                POB0: opb {
+                        compatible = "ibm,opb-440ep", "ibm,opb-440gp", "ibm,opb";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        /* Bamboo is oddball in the 44x world and doesn't use the ERPN
+                         * bits.
+                         */
+                        ranges = <00000000 0 00000000 80000000
+                                  80000000 0 80000000 80000000>;
+                        interrupt-parent = <&UIC1>;
+                        interrupts = <7 4>;
+                        clock-frequency = <0>; /* Filled in by zImage */
+                        EBC0: ebc {
+                                compatible = "ibm,ebc-440ep", "ibm,ebc-440gp", "ibm,ebc";
+                                dcr-reg = <012 2>;
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                interrupts = <5 1>;
+                                interrupt-parent = <&UIC1>;
+                        };
+                        UART0: serial@ef600300 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600300 8>;
+                                virtual-reg = <ef600300>;
+                                clock-frequency = <0>; /* Filled in by zImage */
+                                current-speed = <1c200>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <0 4>;
+                        };
+                        UART1: serial@ef600400 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600400 8>;
+                                virtual-reg = <ef600400>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <1 4>;
+                        };
+                        UART2: serial@ef600500 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600500 8>;
+                                virtual-reg = <ef600500>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <3 4>;
+                                status = "disabled";
+                        };
+                        UART3: serial@ef600600 {
+                                device_type = "serial";
+                                compatible = "ns16550";
+                                reg = <ef600600 8>;
+                                virtual-reg = <ef600600>;
+                                clock-frequency = <0>;
+                                current-speed = <0>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <4 4>;
+                                status = "disabled";
+                        };
+                        IIC0: i2c@ef600700 {
+                                compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
+                                reg = <ef600700 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <2 4>;
+                        };
+                        IIC1: i2c@ef600800 {
+                                compatible = "ibm,iic-440ep", "ibm,iic-440gp", "ibm,iic";
+                                reg = <ef600800 14>;
+                                interrupt-parent = <&UIC0>;
+                                interrupts = <7 4>;
+                        };
+                        spi@ef600900 {
+                                compatible = "amcc,spi-440ep";
+                                reg = <ef600900 6>;
+                                interrupts = <8 4>;
+                                interrupt-parent = <&UIC0>;
+                        };
+                        ZMII0: emac-zmii@ef600d00 {
+                                compatible = "ibm,zmii-440ep", "ibm,zmii-440gp", "ibm,zmii";
+                                reg = <ef600d00 c>;
+                        };
+                        EMAC0: ethernet@ef600e00 {
+                                device_type = "network";
+                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <1c 4 1d 4>;
+                                reg = <ef600e00 70>;
+                                local-mac-address = [000000000000];
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <0 1>;
+                                mal-rx-channel = <0>;
+                                cell-index = <0>;
+                                max-frame-size = <5dc>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rmii";
+                                phy-map = <00000000>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <0>;
+                        };
+                        EMAC1: ethernet@ef600f00 {
+                                device_type = "network";
+                                compatible = "ibm,emac-440ep", "ibm,emac-440gp", "ibm,emac";
+                                interrupt-parent = <&UIC1>;
+                                interrupts = <1e 4 1f 4>;
+                                reg = <ef600f00 70>;
+                                local-mac-address = [000000000000];
+                                mal-device = <&MAL0>;
+                                mal-tx-channel = <2 3>;
+                                mal-rx-channel = <1>;
+                                cell-index = <1>;
+                                max-frame-size = <5dc>;
+                                rx-fifo-size = <1000>;
+                                tx-fifo-size = <800>;
+                                phy-mode = "rmii";
+                                phy-map = <00000000>;
+                                zmii-device = <&ZMII0>;
+                                zmii-channel = <1>;
+                        };
+                        usb@ef601000 {
+                                compatible = "ohci-be";
+                                reg = <ef601000 80>;
+                                interrupts = <8 4 9 4>;
+                                interrupt-parent = < &UIC1 >;
+                        };
+                };
+                PCI0: pci@ec000000 {
+                        device_type = "pci";
+                        #interrupt-cells = <1>;
+                        #size-cells = <2>;
+                        #address-cells = <3>;
+                        compatible = "ibm,plb440ep-pci", "ibm,plb-pci";
+                        primary;
+                        reg = <0 eec00000 8     /* Config space access */
+                               0 eed00000 4     /* IACK */
+                               0 eed00000 4     /* Special cycle */
+                               0 ef400000 40>;  /* Internal registers */
+                        /* Outbound ranges, one memory and one IO,
+                         * later cannot be changed. Chip supports a second
+                         * IO range but we don't use it for now
+                         */
+                        ranges = <02000000 0 a0000000 0 a0000000 0 20000000
+                                  01000000 0 00000000 0 e8000000 0 00010000>;
+                        /* Inbound 2GB range starting at 0 */
+                        dma-ranges = <42000000 0 0 0 0 0 80000000>;
+                        /* Bamboo has all 4 IRQ pins tied together per slot */
+                        interrupt-map-mask = <f800 0 0 0>;
+                        interrupt-map = <
+                                /* IDSEL 1 */
+                                0800 0 0 0 &UIC0 1c 8
+                                /* IDSEL 2 */
+                                1000 0 0 0 &UIC0 1b 8
+                                /* IDSEL 3 */
+                                1800 0 0 0 &UIC0 1a 8
+                                /* IDSEL 4 */
+                                2000 0 0 0 &UIC0 19 8
+                        >;
+                };
+        };
+        chosen {
+                linux,stdout-path = "/plb/opb/serial@ef600300";
+        };
+};
diff --git a/arch/powerpc/boot/ebony.c b/arch/powerpc/boot/ebony.c
index f61364c47a76..5532ab3221dd 100644
--- a/arch/powerpc/boot/ebony.c
+++ b/arch/powerpc/boot/ebony.c
@@ -75,7 +75,8 @@ static void ebony_fixups(void)
        ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
        ibm4xx_sdram_fixup_memsize();
-        dt_fixup_mac_addresses(ebony_mac0, ebony_mac1);
+        dt_fixup_mac_address_by_alias("ethernet0", ebony_mac0);
+        dt_fixup_mac_address_by_alias("ethernet1", ebony_mac1);
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
        ebony_flashsel_fixup();
 }
diff --git a/arch/powerpc/boot/libfdt-wrapper.c b/arch/powerpc/boot/libfdt-wrapper.c
index 59016bef1391..c541fd8a95d4 100644
--- a/arch/powerpc/boot/libfdt-wrapper.c
+++ b/arch/powerpc/boot/libfdt-wrapper.c
@@ -35,7 +35,7 @@
 #define check_err(err) \
        ({ \
                if (BAD_ERROR(err) || ((err < 0) && DEBUG)) \
-                        printf("%s():%d  %s\n\r", __FUNCTION__, __LINE__, \
+                        printf("%s():%d  %s\n\r", __func__, __LINE__, \
                               fdt_strerror(err)); \
                if (BAD_ERROR(err)) \
                        exit(); \
diff --git a/arch/powerpc/boot/ps3-head.S b/arch/powerpc/boot/ps3-head.S
index a55c2735f759..b6fcbaf5027b 100644
--- a/arch/powerpc/boot/ps3-head.S
+++ b/arch/powerpc/boot/ps3-head.S
@@ -27,8 +27,9 @@
 /*
 * __system_reset_overlay - The PS3 first stage entry.
 *
- * The bootwraper build script copies the 0x100 bytes at symbol
+ * The bootwraper build script copies the 512 bytes at symbol
- * __system_reset_overlay to offset 0x100 of the rom image.
+ * __system_reset_overlay to offset 0x100 of the rom image.  This symbol
+ * must occupy 512 or less bytes.
 *
 * The PS3 has a single processor with two threads.
 */
@@ -47,8 +48,6 @@ __system_reset_overlay:
        mfspr   r3, 0x88
        cntlzw. r3, r3
-        li      r4, 0
-        li      r5, 0
        beq     1f
        /* Secondary goes to __secondary_hold in kernel. */
@@ -57,8 +56,14 @@ __system_reset_overlay:
        mtctr   r4
        bctr
-        /* Primary delays then goes to _zimage_start in wrapper. */
 1:
+        /* Save the value at addr zero for a null pointer write check later. */
+        li      r4, 0
+        lwz     r3, 0(r4)
+        /* Primary delays then goes to _zimage_start in wrapper. */
        or      31, 31, 31 /* db16cyc */
        or      31, 31, 31 /* db16cyc */
@@ -67,16 +72,18 @@ __system_reset_overlay:
        mtctr   r4
        bctr
+        . = __system_reset_overlay + 512
 /*
 * __system_reset_kernel - Place holder for the kernel reset vector.
 *
- * The bootwrapper build script copies 0x100 bytes from offset 0x100
+ * The bootwrapper build script copies 512 bytes from offset 0x100
 * of the rom image to the symbol __system_reset_kernel.  At runtime
- * the bootwrapper program copies the 0x100 bytes at __system_reset_kernel
+ * the bootwrapper program copies the 512 bytes at __system_reset_kernel
- * to ram address 0x100.  This symbol must occupy 0x100 bytes.
+ * to ram address 0x100.  This symbol must occupy 512 bytes.
 */
        .globl __system_reset_kernel
 __system_reset_kernel:
-        . = __system_reset_kernel + 0x100
+        . = __system_reset_kernel + 512
diff --git a/arch/powerpc/boot/ps3.c b/arch/powerpc/boot/ps3.c
index 3b0ac4d006ec..9954d98871d0 100644
--- a/arch/powerpc/boot/ps3.c
+++ b/arch/powerpc/boot/ps3.c
@@ -27,10 +27,10 @@
 #include "page.h"
 #include "ops.h"
-extern s64 lv1_panic(u64 in_1);
+extern int lv1_panic(u64 in_1);
-extern s64 lv1_get_logical_partition_id(u64 *out_1);
+extern int lv1_get_logical_partition_id(u64 *out_1);
-extern s64 lv1_get_logical_ppe_id(u64 *out_1);
+extern int lv1_get_logical_ppe_id(u64 *out_1);
-extern s64 lv1_get_repository_node_value(u64 in_1, u64 in_2, u64 in_3,
+extern int lv1_get_repository_node_value(u64 in_1, u64 in_2, u64 in_3,
        u64 in_4, u64 in_5, u64 *out_1, u64 *out_2);
 #ifdef DEBUG
@@ -46,6 +46,7 @@ BSS_STACK(4096);
 * edit the command line passed to vmlinux (by setting /chosen/bootargs).
 * The buffer is put in it's own section so that tools may locate it easier.
 */
 static char cmdline[COMMAND_LINE_SIZE]
        __attribute__((__section__("__builtin_cmdline")));
@@ -75,7 +76,7 @@ static void ps3_exit(void)
 static int ps3_repository_read_rm_size(u64 *rm_size)
 {
-        s64 result;
+        int result;
        u64 lpar_id;
        u64 ppe_id;
        u64 v2;
@@ -114,16 +115,17 @@ void ps3_copy_vectors(void)
 {
        extern char __system_reset_kernel[];
-        memcpy((void *)0x100, __system_reset_kernel, 0x100);
+        memcpy((void *)0x100, __system_reset_kernel, 512);
-        flush_cache((void *)0x100, 0x100);
+        flush_cache((void *)0x100, 512);
 }
-void platform_init(void)
+void platform_init(unsigned long null_check)
 {
        const u32 heapsize = 0x1000000 - (u32)_end; /* 16MiB */
        void *chosen;
        unsigned long ft_addr;
        u64 rm_size;
+        unsigned long val;
        console_ops.write = ps3_console_write;
        platform_ops.exit = ps3_exit;
@@ -151,6 +153,11 @@ void platform_init(void)
        printf(" flat tree at 0x%lx\n\r", ft_addr);
+        val = *(unsigned long *)0;
+        if (val != null_check)
+                printf("null check failed: %lx != %lx\n\r", val, null_check);
        ((kernel_entry_t)0)(ft_addr, 0, NULL);
        ps3_exit();
diff --git a/arch/powerpc/boot/simpleboot.c b/arch/powerpc/boot/simpleboot.c
new file mode 100644
index 000000000000..86cd285bccc6
--- /dev/null
+++ b/arch/powerpc/boot/simpleboot.c
@@ -0,0 +1,84 @@
+/*
+ * The simple platform -- for booting when firmware doesn't supply a device
+ *                        tree or any platform configuration information.
+ *                        All data is extracted from an embedded device tree
+ *                        blob.
+ *
+ * Authors: Scott Wood <scottwood@freescale.com>
+ *          Grant Likely <grant.likely@secretlab.ca>
+ *
+ * Copyright (c) 2007 Freescale Semiconductor, Inc.
+ * Copyright (c) 2008 Secret Lab Technologies Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ */
+#include "ops.h"
+#include "types.h"
+#include "io.h"
+#include "stdio.h"
+#include "libfdt/libfdt.h"
+BSS_STACK(4*1024);
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        const u32 *na, *ns, *reg, *timebase;
+        u64 memsize64;
+        int node, size, i;
+        /* Make sure FDT blob is sane */
+        if (fdt_check_header(_dtb_start) != 0)
+                fatal("Invalid device tree blob\n");
+        /* Find the #address-cells and #size-cells properties */
+        node = fdt_path_offset(_dtb_start, "/");
+        if (node < 0)
+                fatal("Cannot find root node\n");
+        na = fdt_getprop(_dtb_start, node, "#address-cells", &size);
+        if (!na || (size != 4))
+                fatal("Cannot find #address-cells property");
+        ns = fdt_getprop(_dtb_start, node, "#size-cells", &size);
+        if (!ns || (size != 4))
+                fatal("Cannot find #size-cells property");
+        /* Find the memory range */
+        node = fdt_node_offset_by_prop_value(_dtb_start, -1, "device_type",
+                                             "memory", sizeof("memory"));
+        if (node < 0)
+                fatal("Cannot find memory node\n");
+        reg = fdt_getprop(_dtb_start, node, "reg", &size);
+        if (size < (*na+*ns) * sizeof(u32))
+                fatal("cannot get memory range\n");
+        /* Only interested in memory based at 0 */
+        for (i = 0; i < *na; i++)
+                if (*reg++ != 0)
+                        fatal("Memory range is not based at address 0\n");
+        /* get the memsize and trucate it to under 4G on 32 bit machines */
+        memsize64 = 0;
+        for (i = 0; i < *ns; i++)
+                memsize64 = (memsize64 << 32) | *reg++;
+        if (sizeof(void *) == 4 && memsize64 >= 0x100000000ULL)
+                memsize64 = 0xffffffff;
+        /* finally, setup the timebase */
+        node = fdt_node_offset_by_prop_value(_dtb_start, -1, "device_type",
+                                             "cpu", sizeof("cpu"));
+        if (!node)
+                fatal("Cannot find cpu node\n");
+        timebase = fdt_getprop(_dtb_start, node, "timebase-frequency", &size);
+        if (timebase && (size == 4))
+                timebase_period_ns = 1000000000 / *timebase;
+        /* Now we have the memory size; initialize the heap */
+        simple_alloc_init(_end, memsize64 - (unsigned long)_end, 32, 64);
+        /* prepare the device tree and find the console */
+        fdt_init(_dtb_start);
+        serial_console_init();
+}
diff --git a/arch/powerpc/boot/treeboot-walnut.c b/arch/powerpc/boot/treeboot-walnut.c
index 472e36605a52..097974e59fac 100644
--- a/arch/powerpc/boot/treeboot-walnut.c
+++ b/arch/powerpc/boot/treeboot-walnut.c
@@ -68,7 +68,7 @@ static void walnut_fixups(void)
        ibm4xx_quiesce_eth((u32 *)0xef600800, NULL);
        ibm4xx_fixup_ebc_ranges("/plb/ebc");
        walnut_flashsel_fixup();
-        dt_fixup_mac_addresses((u8 *) WALNUT_OPENBIOS_MAC_OFF);
+        dt_fixup_mac_address_by_alias("ethernet0", (u8 *) WALNUT_OPENBIOS_MAC_OFF);
 }
 void platform_init(void)
diff --git a/arch/powerpc/boot/virtex405-head.S b/arch/powerpc/boot/virtex405-head.S
new file mode 100644
index 000000000000..3edb13f94669
--- /dev/null
+++ b/arch/powerpc/boot/virtex405-head.S
@@ -0,0 +1,30 @@
+#include "ppc_asm.h"
+        .text
+        .global _zimage_start
+_zimage_start:
+        /* PPC errata 213: needed by Virtex-4 FX */
+        mfccr0  0
+        oris    0,0,0x50000000@h
+        mtccr0  0
+        /*
+         * Invalidate the data cache if the data cache is turned off.
+         * - The 405 core does not invalidate the data cache on power-up
+         *   or reset but does turn off the data cache. We cannot assume
+         *   that the cache contents are valid.
+         * - If the data cache is turned on this must have been done by
+         *   a bootloader and we assume that the cache contents are
+         *   valid.
+         */
+        mfdccr  r9
+        cmplwi  r9,0
+        bne     2f
+        lis     r9,0
+        li      r8,256
+        mtctr   r8
+1:      dccci   r0,r9
+        addi    r9,r9,0x20
+        bdnz    1b
+2:      b       _zimage_start_lib
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 8f8b8494d62f..14a01823ba53 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -174,7 +174,7 @@ cuboot*)
    *-mpc83*)
        platformo=$object/cuboot-83xx.o
        ;;
-    *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555)
+    *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555|*-ksi8560*)
        platformo=$object/cuboot-85xx-cpm2.o
        ;;
    *-mpc85*|*-tqm8540|*-sbc85*)
@@ -199,6 +199,10 @@ adder875-redboot)
    platformo="$object/fixed-head.o $object/redboot-8xx.o"
    binary=y
    ;;
+simpleboot-virtex405-*)
+    platformo="$object/virtex405-head.o $object/simpleboot.o"
+    binary=y
+    ;;
 esac
 vmz="$tmpdir/`basename \"$kernel\"`.$ext"
@@ -298,15 +302,16 @@ treeboot*)
    exit 0
    ;;
 ps3)
-    # The ps3's loader supports loading gzipped binary images from flash
+    # The ps3's loader supports loading a gzipped binary image from flash
-    # rom to addr zero. The loader enters the image at addr 0x100.  A
+    # rom to ram addr zero. The loader then enters the system reset
-    # bootwrapper overlay is use to arrange for the kernel to be loaded
+    # vector at addr 0x100.  A bootwrapper overlay is used to arrange for
-    # to addr zero and to have a suitable bootwrapper entry at 0x100.
+    # a binary image of the kernel to be at addr zero, and yet have a
-    # To construct the rom image, 0x100 bytes from offset 0x100 in the
+    # suitable bootwrapper entry at 0x100.  To construct the final rom
-    # kernel is copied to the bootwrapper symbol __system_reset_kernel.
+    # image 512 bytes from offset 0x100 is copied to the bootwrapper
-    # The 0x100 bytes at the bootwrapper symbol __system_reset_overlay is
+    # place holder at symbol __system_reset_kernel.  The 512 bytes of the
-    # then copied to offset 0x100.  At runtime the bootwrapper program
+    # bootwrapper entry code at symbol __system_reset_overlay is then
-    # copies the 0x100 bytes at __system_reset_kernel to addr 0x100.
+    # copied to offset 0x100.  At runtime the bootwrapper program copies
+    # the data at __system_reset_kernel back to addr 0x100.
    system_reset_overlay=0x`${CROSS}nm "$ofile" \
        | grep ' __system_reset_overlay$'       \
@@ -317,7 +322,7 @@ ps3)
        | cut -d' ' -f1`
    system_reset_kernel=`printf "%d" $system_reset_kernel`
    overlay_dest="256"
-    overlay_size="256"
+    overlay_size="512"
    ${CROSS}objcopy -O binary "$ofile" "$ofile.bin"
diff --git a/arch/powerpc/configs/canyonlands_defconfig b/arch/powerpc/configs/canyonlands_defconfig
new file mode 100644
index 000000000000..a3b763c45ec6
--- /dev/null
+++ b/arch/powerpc/configs/canyonlands_defconfig
@@ -0,0 +1,721 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.25-rc1
+# Thu Feb 21 14:29:28 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_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_FAIR_GROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=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_LOGBUFFER is not set
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_COMPAT_BRK=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_ANON_INODES=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+# CONFIG_PROFILING is not set
+# CONFIG_MARKERS is not set
+CONFIG_HAVE_OPROFILE=y
+# CONFIG_KPROBES is not set
+CONFIG_HAVE_KPROBES=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+CONFIG_BLOCK=y
+CONFIG_LBD=y
+# CONFIG_BLK_DEV_IO_TRACE is not set
+# CONFIG_LSF is not set
+# CONFIG_BLK_DEV_BSG is not set
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_DEFAULT_AS=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_PREEMPT_RCU is not set
+CONFIG_PPC4xx_PCI_EXPRESS=y
+#
+# Platform support
+#
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+# CONFIG_BAMBOO is not set
+# CONFIG_EBONY is not set
+# CONFIG_SEQUOIA is not set
+# CONFIG_TAISHAN is not set
+# CONFIG_KATMAI is not set
+# CONFIG_RAINIER is not set
+# CONFIG_WARP is not set
+CONFIG_CANYONLANDS=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 is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_RCU_TRACE=y
+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_SPLIT_PTLOCK_CPUS=4
+CONFIG_RESOURCES_64BIT=y
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_PROC_DEVICETREE=y
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CMDLINE=""
+CONFIG_SECCOMP=y
+CONFIG_WANT_DEVICE_TREE=y
+CONFIG_ISA_DMA_API=y
+#
+# Bus options
+#
+CONFIG_ZONE_DMA=y
+CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIEPORTBUS is not set
+CONFIG_ARCH_SUPPORTS_MSI=y
+# CONFIG_PCI_MSI is not set
+CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCCARD is not set
+# CONFIG_HOTPLUG_PCI is not set
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_TASK_SIZE=0xc0000000
+CONFIG_CONSISTENT_START=0xff100000
+CONFIG_CONSISTENT_SIZE=0x00200000
+CONFIG_BOOT_LOAD=0x01000000
+#
+# Networking
+#
+CONFIG_NET=y
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+#
+# Device Drivers
+#
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=y
+# 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_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
+#
+# CONFIG_FIREWIRE is not set
+# CONFIG_IEEE1394 is not set
+# CONFIG_I2O is not set
+# CONFIG_MACINTOSH_DRIVERS is not set
+CONFIG_NETDEVICES=y
+# CONFIG_NETDEVICES_MULTIQUEUE is not set
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_MACVLAN is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_VETH is not set
+# CONFIG_ARCNET is not set
+# CONFIG_PHYLIB is not set
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_CASSINI is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_IBM_NEW_EMAC=y
+CONFIG_IBM_NEW_EMAC_RXB=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=y
+CONFIG_IBM_NEW_EMAC_RGMII=y
+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_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_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
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+# CONFIG_HWMON is not set
+# CONFIG_THERMAL is not set
+# CONFIG_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
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+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
+#
+# 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_INFINIBAND is not set
+# CONFIG_EDAC is not set
+# CONFIG_RTC_CLASS is not set
+#
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS 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_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_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_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_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 is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_NLS is not set
+# CONFIG_DLM is not set
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+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_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS 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_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_KGDB is not set
+# CONFIG_XMON 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
diff --git a/arch/powerpc/configs/chrp32_defconfig b/arch/powerpc/configs/chrp32_defconfig
index 38b85b211c38..d7fd298bd234 100644
--- a/arch/powerpc/configs/chrp32_defconfig
+++ b/arch/powerpc/configs/chrp32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.25-rc6
-# Thu Mar 20 10:33:36 2008
+# Thu Mar 27 13:55:37 2008
 #
 # CONFIG_PPC64 is not set
@@ -74,8 +74,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=15
 # CONFIG_CGROUPS is not set
 # CONFIG_GROUP_SCHED is not set
-# CONFIG_USER_SCHED is not set
-# CONFIG_CGROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
@@ -243,7 +241,7 @@ 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_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
@@ -1328,6 +1326,7 @@ CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
 #
 # Kernel hacking
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig
index 0f82f66a60f8..a20501f89474 100644
--- a/arch/powerpc/configs/g5_defconfig
+++ b/arch/powerpc/configs/g5_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.25-rc6
-# Thu Mar 20 10:36:41 2008
+# Thu Mar 27 13:55:43 2008
 #
 CONFIG_PPC64=y
@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_CGROUPS is not set
 # CONFIG_GROUP_SCHED is not set
-# CONFIG_USER_SCHED is not set
-# CONFIG_CGROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
@@ -276,7 +274,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
@@ -1596,6 +1594,7 @@ CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
 #
 # Kernel hacking
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig
index 8d9a84f50157..b3128fb7ce7e 100644
--- a/arch/powerpc/configs/iseries_defconfig
+++ b/arch/powerpc/configs/iseries_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.25-rc6
-# Thu Mar 20 10:43:46 2008
+# Thu Mar 27 13:55:45 2008
 #
 CONFIG_PPC64=y
@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=17
 # CONFIG_CGROUPS is not set
 # CONFIG_GROUP_SCHED is not set
-# CONFIG_USER_SCHED is not set
-# CONFIG_CGROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
@@ -261,7 +259,7 @@ 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_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCCARD is not set
 # CONFIG_HOTPLUG_PCI is not set
@@ -1065,6 +1063,7 @@ CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
 #
 # Kernel hacking
diff --git a/arch/powerpc/configs/ksi8560_defconfig b/arch/powerpc/configs/ksi8560_defconfig
new file mode 100644
index 000000000000..2d0debcefdbf
--- /dev/null
+++ b/arch/powerpc/configs/ksi8560_defconfig
@@ -0,0 +1,899 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.24
+# Mon Feb 11 16:25:19 2008
+#
+# CONFIG_PPC64 is not set
+#
+# Processor support
+#
+# CONFIG_6xx is not set
+CONFIG_PPC_85xx=y
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_E200 is not set
+CONFIG_E500=y
+CONFIG_BOOKE=y
+CONFIG_FSL_BOOKE=y
+CONFIG_FSL_EMB_PERFMON=y
+# CONFIG_PHYS_64BIT is not set
+CONFIG_SPE=y
+# CONFIG_PPC_MM_SLICES is not set
+CONFIG_PPC32=y
+CONFIG_WORD_SIZE=32
+CONFIG_PPC_MERGE=y
+CONFIG_MMU=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+CONFIG_GENERIC_TIME=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_HARDIRQS=y
+# CONFIG_HAVE_SETUP_PER_CPU_AREA is not set
+CONFIG_IRQ_PER_CPU=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_ARCH_HAS_ILOG2_U32=y
+CONFIG_GENERIC_HWEIGHT=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_GENERIC_FIND_NEXT_BIT=y
+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set
+CONFIG_PPC=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_GENERIC_NVRAM=y
+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_PPC_OF=y
+CONFIG_OF=y
+CONFIG_PPC_UDBG_16550=y
+# CONFIG_GENERIC_TBSYNC is not set
+CONFIG_AUDIT_ARCH=y
+CONFIG_GENERIC_BUG=y
+CONFIG_DEFAULT_UIMAGE=y
+# CONFIG_PPC_DCR_NATIVE is not set
+# CONFIG_PPC_DCR_MMIO is not set
+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
+#
+# General setup
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+# CONFIG_TASKSTATS is not set
+# CONFIG_USER_NS is not set
+# CONFIG_PID_NS is not set
+# CONFIG_AUDIT is not set
+# CONFIG_IKCONFIG is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_CGROUPS is not set
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_FAIR_USER_SCHED=y
+# CONFIG_FAIR_CGROUP_SCHED is not set
+CONFIG_SYSFS_DEPRECATED=y
+# CONFIG_RELAY 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_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_HAVE_KPROBES=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_SLABINFO=y
+CONFIG_RT_MUTEXES=y
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+# CONFIG_MODULES 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
+# CONFIG_PREEMPT_RCU is not set
+#
+# Platform support
+#
+# CONFIG_PPC_MPC512x is not set
+# CONFIG_PPC_MPC5121 is not set
+# CONFIG_PPC_CELL is not set
+# CONFIG_PPC_CELL_NATIVE is not set
+# CONFIG_PQ2ADS is not set
+CONFIG_MPC85xx=y
+# CONFIG_MPC8540_ADS is not set
+# CONFIG_MPC8560_ADS is not set
+# CONFIG_MPC85xx_CDS is not set
+# CONFIG_MPC85xx_MDS is not set
+# CONFIG_MPC85xx_DS is not set
+CONFIG_KSI8560=y
+# CONFIG_STX_GP3 is not set
+# CONFIG_TQM8540 is not set
+# CONFIG_TQM8541 is not set
+# CONFIG_TQM8555 is not set
+# CONFIG_TQM8560 is not set
+# CONFIG_SBC8548 is not set
+# CONFIG_SBC8560 is not set
+# CONFIG_IPIC is not set
+CONFIG_MPIC=y
+# CONFIG_MPIC_WEIRD is not set
+# CONFIG_PPC_I8259 is not set
+# CONFIG_PPC_RTAS is not set
+# CONFIG_MMIO_NVRAM is not set
+# CONFIG_PPC_MPC106 is not set
+# CONFIG_PPC_970_NAP is not set
+# CONFIG_PPC_INDIRECT_IO is not set
+# CONFIG_GENERIC_IOMAP is not set
+# CONFIG_CPU_FREQ is not set
+CONFIG_CPM2=y
+CONFIG_PPC_CPM_NEW_BINDING=y
+# CONFIG_FSL_ULI1575 is not set
+CONFIG_CPM=y
+#
+# Kernel options
+#
+CONFIG_HIGHMEM=y
+# CONFIG_TICK_ONESHOT is not set
+# CONFIG_NO_HZ is not set
+# CONFIG_HIGH_RES_TIMERS is not set
+CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+# CONFIG_SCHED_HRTICK is not set
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT is not set
+CONFIG_RCU_TRACE=y
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=y
+CONFIG_MATH_EMULATION=y
+# CONFIG_IOMMU_HELPER is not set
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_ARCH_POPULATES_NODE_MAP=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
+CONFIG_SPLIT_PTLOCK_CPUS=4
+# CONFIG_RESOURCES_64BIT is not set
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+# CONFIG_PROC_DEVICETREE is not set
+# CONFIG_CMDLINE_BOOL is not set
+# CONFIG_PM is not set
+# CONFIG_SECCOMP is not set
+CONFIG_WANT_DEVICE_TREE=y
+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
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_TASK_SIZE=0xc0000000
+CONFIG_BOOT_LOAD=0x00800000
+#
+# Networking
+#
+CONFIG_NET=y
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+# CONFIG_XFRM_STATISTICS is not set
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_XFRM_TUNNEL is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_TRANSPORT=y
+CONFIG_INET_XFRM_MODE_TUNNEL=y
+CONFIG_INET_XFRM_MODE_BEET=y
+# CONFIG_INET_LRO is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_DEFAULT_TCP_CONG="cubic"
+# CONFIG_TCP_MD5SIG is not set
+# CONFIG_IPV6 is not set
+# CONFIG_INET6_XFRM_TUNNEL is not set
+# CONFIG_INET6_TUNNEL is not set
+# CONFIG_NETWORK_SECMARK is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_IP_DCCP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_TIPC is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_CAN is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_AF_RXRPC is not set
+#
+# Wireless
+#
+# CONFIG_CFG80211 is not set
+# CONFIG_WIRELESS_EXT is not set
+# CONFIG_MAC80211 is not set
+# CONFIG_IEEE80211 is not set
+# CONFIG_RFKILL is not set
+# CONFIG_NET_9P is not set
+#
+# Device Drivers
+#
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+# CONFIG_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
+#
+# 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=y
+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_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=32768
+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024
+# CONFIG_CDROM_PKTCDVD is not set
+# CONFIG_ATA_OVER_ETH is not set
+CONFIG_MISC_DEVICES=y
+# CONFIG_EEPROM_93CX6 is not set
+CONFIG_IDE=y
+CONFIG_IDE_MAX_HWIFS=4
+CONFIG_BLK_DEV_IDE=y
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_IDEDISK is not set
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_PROC_FS=y
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_IDEDMA is not set
+CONFIG_IDE_ARCH_OBSOLETE_INIT=y
+# CONFIG_BLK_DEV_HD is not set
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+# CONFIG_SCSI is not set
+# CONFIG_SCSI_DMA is not set
+# CONFIG_SCSI_NETLINK is not set
+# CONFIG_ATA is not set
+# CONFIG_MD is not set
+# CONFIG_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=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=y
+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 is not set
+CONFIG_FS_ENET_HAS_FCC=y
+CONFIG_FS_ENET_MDIO_FCC=y
+CONFIG_NETDEV_1000=y
+# CONFIG_E1000E_ENABLED is not set
+CONFIG_GIANFAR=y
+CONFIG_GFAR_NAPI=y
+CONFIG_NETDEV_10000=y
+#
+# Wireless LAN
+#
+# CONFIG_WLAN_PRE80211 is not set
+# CONFIG_WLAN_80211 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=y
+# CONFIG_INPUT_FF_MEMLESS is not set
+# CONFIG_INPUT_POLLDEV is not set
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TABLET is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+#
+# 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=y
+# 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 is not set
+# CONFIG_SERIAL_CPM_SMC2 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=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
+#
+# SPI support
+#
+# CONFIG_SPI is not set
+# CONFIG_SPI_MASTER is not set
+# CONFIG_W1 is not set
+# CONFIG_POWER_SUPPLY is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_F71882FG is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_PC87427 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP 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
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+# CONFIG_DVB_CORE is not set
+CONFIG_DAB=y
+#
+# Graphics support
+#
+# CONFIG_VGASTATE is not set
+CONFIG_VIDEO_OUTPUT_CONTROL=y
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+#
+# Display device support
+#
+# CONFIG_DISPLAY_SUPPORT is not set
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+CONFIG_HID_SUPPORT=y
+CONFIG_HID=y
+# CONFIG_HID_DEBUG is not set
+# CONFIG_HIDRAW is not set
+CONFIG_USB_SUPPORT=y
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+#
+# CONFIG_USB_GADGET is not set
+# CONFIG_MMC is not set
+# CONFIG_NEW_LEDS is not set
+# CONFIG_EDAC is not set
+# CONFIG_RTC_CLASS is not set
+#
+# Userspace I/O
+#
+# CONFIG_UIO is not set
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+# CONFIG_EXT4DEV_FS is not set
+CONFIG_JBD=y
+# CONFIG_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_GFS2_FS is not set
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_INOTIFY=y
+CONFIG_INOTIFY_USER=y
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_POSIX_ACL is not set
+# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_CONFIGFS_FS is not set
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=y
+# CONFIG_NFS_V3 is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_BIND34 is not set
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+# CONFIG_MSDOS_PARTITION is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_KARMA_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_NLS is not set
+# CONFIG_DLM is not set
+#
+# Library routines
+#
+CONFIG_BITREVERSE=y
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC32=y
+# CONFIG_CRC7 is not set
+# CONFIG_LIBCRC32C is not set
+CONFIG_PLIST=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT=y
+CONFIG_HAS_DMA=y
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+CONFIG_ENABLE_WARN_DEPRECATED=y
+CONFIG_ENABLE_MUST_CHECK=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_CHECK is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SHIRQ is not set
+CONFIG_DETECT_SOFTLOCKUP=y
+CONFIG_SCHED_DEBUG=y
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_TIMER_STATS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_RT_MUTEX_TESTER is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+CONFIG_DEBUG_MUTEXES=y
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_VM is not set
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_SG is not set
+CONFIG_FORCED_INLINING=y
+# 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_VIRQ_DEBUG is not set
+# CONFIG_BDI_SWITCH is not set
+# CONFIG_PPC_EARLY_DEBUG is not set
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+# CONFIG_SECURITY_FILE_CAPABILITIES is not set
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_SEQIV is not set
+# CONFIG_CRYPTO_MANAGER is not set
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_XCBC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+# CONFIG_CRYPTO_MD5 is not set
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+# CONFIG_CRYPTO_WP512 is not set
+# CONFIG_CRYPTO_TGR192 is not set
+# CONFIG_CRYPTO_GF128MUL is not set
+# CONFIG_CRYPTO_ECB is not set
+# CONFIG_CRYPTO_CBC is not set
+# CONFIG_CRYPTO_PCBC is not set
+# CONFIG_CRYPTO_LRW is not set
+# CONFIG_CRYPTO_XTS is not set
+# CONFIG_CRYPTO_CTR is not set
+# CONFIG_CRYPTO_GCM is not set
+# CONFIG_CRYPTO_CCM is not set
+# CONFIG_CRYPTO_CRYPTD is not set
+# CONFIG_CRYPTO_DES is not set
+# CONFIG_CRYPTO_FCRYPT is not set
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+# CONFIG_CRYPTO_SEED is not set
+# CONFIG_CRYPTO_SALSA20 is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_CAMELLIA is not set
+# CONFIG_CRYPTO_AUTHENC is not set
+# CONFIG_CRYPTO_LZO is not set
+CONFIG_CRYPTO_HW=y
+# CONFIG_PPC_CLOCK is not set
+CONFIG_PPC_LIB_RHEAP=y
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig
index 8b810d056440..7a166a39d92d 100644
--- a/arch/powerpc/configs/maple_defconfig
+++ b/arch/powerpc/configs/maple_defconfig
@@ -333,7 +333,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_STANDALONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=y
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
@@ -374,6 +374,7 @@ CONFIG_BLK_DEV_IDEDISK=y
 CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
 CONFIG_IDE_TASK_IOCTL=y
 CONFIG_IDE_PROC_FS=y
@@ -427,10 +428,129 @@ CONFIG_IDE_ARCH_OBSOLETE_INIT=y
 # SCSI device support
 #
 # CONFIG_RAID_ATTRS is not set
-# CONFIG_SCSI is not set
+CONFIG_SCSI=y
-# CONFIG_SCSI_DMA is not set
+CONFIG_SCSI_DMA=y
+# CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
-# CONFIG_ATA is not set
+# CONFIG_SCSI_PROC_FS is not set
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+CONFIG_CHR_DEV_SG=y
+# CONFIG_CHR_DEV_SCH is not set
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+# CONFIG_SCSI_SCAN_ASYNC is not set
+CONFIG_SCSI_WAIT_SCAN=m
+#
+# SCSI Transports
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+# CONFIG_SCSI_SAS_LIBSAS is not set
+# CONFIG_SCSI_SRP_ATTRS is not set
+CONFIG_SCSI_LOWLEVEL=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_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_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_STEX is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+CONFIG_SCSI_IPR=y
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+# 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_DEBUG is not set
+# CONFIG_SCSI_SRP is not set
+CONFIG_ATA=y
+CONFIG_ATA_NONSTANDARD=y
+# CONFIG_SATA_AHCI is not set
+# 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_SIL24 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 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_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_MD is not set
 # CONFIG_FUSION is not set
@@ -536,6 +656,7 @@ CONFIG_USB_PEGASUS=y
 # CONFIG_HIPPI is not set
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETPOLL is not set
@@ -783,12 +904,14 @@ CONFIG_USB_UHCI_HCD=y
 #
 # may also be needed; see USB_STORAGE Help for more information
 #
+# CONFIG_USB_STORAGE is not set
 # CONFIG_USB_LIBUSUAL is not set
 #
 # USB Imaging devices
 #
 # CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
 CONFIG_USB_MON=y
 #
diff --git a/arch/powerpc/configs/pmac32_defconfig b/arch/powerpc/configs/pmac32_defconfig
index 558b0d348d4f..fca114252ac7 100644
--- a/arch/powerpc/configs/pmac32_defconfig
+++ b/arch/powerpc/configs/pmac32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.25-rc6
-# Thu Mar 20 11:05:14 2008
+# Thu Mar 27 13:56:21 2008
 #
 # CONFIG_PPC64 is not set
@@ -77,8 +77,6 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_CGROUPS is not set
 # CONFIG_GROUP_SCHED is not set
-# CONFIG_USER_SCHED is not set
-# CONFIG_CGROUP_SCHED is not set
 CONFIG_SYSFS_DEPRECATED=y
 CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
@@ -272,7 +270,7 @@ 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_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCCARD=m
 # CONFIG_PCMCIA_DEBUG is not set
@@ -1895,6 +1893,7 @@ CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
 #
 # Kernel hacking
diff --git a/arch/powerpc/configs/ppc44x_defconfig b/arch/powerpc/configs/ppc44x_defconfig
index 57bd775ef777..12f9b5a80220 100644
--- a/arch/powerpc/configs/ppc44x_defconfig
+++ b/arch/powerpc/configs/ppc44x_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.25-rc2
+# Linux kernel version: 2.6.25-rc6
-# Fri Feb 15 21:57:35 2008
+# Sat Apr  5 09:35:48 2008
 #
 # CONFIG_PPC64 is not set
@@ -79,6 +79,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 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
@@ -113,6 +114,7 @@ CONFIG_SLUB=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
@@ -143,7 +145,6 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
 CONFIG_CLASSIC_RCU=y
-# CONFIG_PREEMPT_RCU is not set
 CONFIG_PPC4xx_PCI_EXPRESS=y
 #
@@ -161,12 +162,15 @@ CONFIG_TAISHAN=y
 CONFIG_KATMAI=y
 CONFIG_RAINIER=y
 CONFIG_WARP=y
+CONFIG_CANYONLANDS=y
+CONFIG_YOSEMITE=y
 CONFIG_440EP=y
 CONFIG_440EPX=y
 CONFIG_440GRX=y
 CONFIG_440GP=y
 CONFIG_440GX=y
 CONFIG_440SPe=y
+CONFIG_460EX=y
 CONFIG_IBM440EP_ERR42=y
 # CONFIG_IPIC is not set
 # CONFIG_MPIC is not set
@@ -199,7 +203,6 @@ CONFIG_HZ=250
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_RCU_TRACE is not set
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 CONFIG_MATH_EMULATION=y
@@ -232,6 +235,7 @@ CONFIG_ISA_DMA_API=y
 #
 CONFIG_ZONE_DMA=y
 CONFIG_PPC_INDIRECT_PCI=y
+CONFIG_4xx_SOC=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_SYSCALL=y
@@ -678,6 +682,7 @@ CONFIG_USB_ARCH_HAS_EHCI=y
 # CONFIG_INFINIBAND is not set
 # CONFIG_EDAC is not set
 # CONFIG_RTC_CLASS is not set
+# CONFIG_DMADEVICES is not set
 #
 # Userspace I/O
@@ -805,6 +810,7 @@ CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
 #
 # Kernel hacking
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig
index 880ab7ad10c1..970282b1a004 100644
--- a/arch/powerpc/configs/ppc64_defconfig
+++ b/arch/powerpc/configs/ppc64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.25-rc6
-# Thu Mar 20 11:06:28 2008
+# Thu Mar 27 13:56:24 2008
 #
 CONFIG_PPC64=y
@@ -84,8 +84,6 @@ CONFIG_CGROUPS=y
 # CONFIG_CGROUP_NS is not set
 CONFIG_CPUSETS=y
 # CONFIG_GROUP_SCHED is not set
-# CONFIG_USER_SCHED is not set
-# CONFIG_CGROUP_SCHED is not set
 # CONFIG_CGROUP_CPUACCT is not set
 # CONFIG_RESOURCE_COUNTERS is not set
 CONFIG_SYSFS_DEPRECATED=y
@@ -289,6 +287,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_KEXEC=y
 # CONFIG_CRASH_DUMP is not set
+# CONFIG_PHYP_DUMP is not set
 CONFIG_IRQ_ALL_CPUS=y
 # CONFIG_NUMA is not set
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -335,7 +334,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 CONFIG_PCCARD=y
 # CONFIG_PCMCIA_DEBUG is not set
@@ -1881,6 +1880,7 @@ CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
 #
 # Kernel hacking
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig
index 755aca72b522..3e2593c60b12 100644
--- a/arch/powerpc/configs/pseries_defconfig
+++ b/arch/powerpc/configs/pseries_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.25-rc6
-# Thu Mar 20 11:08:01 2008
+# Thu Mar 27 13:56:28 2008
 #
 CONFIG_PPC64=y
@@ -83,8 +83,6 @@ CONFIG_CGROUPS=y
 CONFIG_CGROUP_NS=y
 CONFIG_CPUSETS=y
 # CONFIG_GROUP_SCHED is not set
-# CONFIG_USER_SCHED is not set
-# CONFIG_CGROUP_SCHED is not set
 CONFIG_CGROUP_CPUACCT=y
 # CONFIG_RESOURCE_COUNTERS is not set
 CONFIG_SYSFS_DEPRECATED=y
@@ -237,6 +235,7 @@ CONFIG_ARCH_HAS_WALK_MEMORY=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_KEXEC=y
 # CONFIG_CRASH_DUMP is not set
+# CONFIG_PHYP_DUMP is not set
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_NUMA=y
 CONFIG_NODES_SHIFT=4
@@ -283,7 +282,7 @@ CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY=y
+# CONFIG_PCI_LEGACY is not set
 # CONFIG_PCI_DEBUG is not set
 # CONFIG_PCCARD is not set
 CONFIG_HOTPLUG_PCI=m
@@ -1519,6 +1518,7 @@ CONFIG_PLIST=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
+CONFIG_HAVE_LMB=y
 #
 # Kernel hacking
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 4b749c416464..e932b43bd82f 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -26,8 +26,6 @@
 #ifdef CONFIG_PPC64
 #include <linux/time.h>
 #include <linux/hardirq.h>
-#else
-#include <linux/ptrace.h>
 #endif
 #include <asm/io.h>
@@ -60,7 +58,6 @@ int main(void)
        DEFINE(AUDITCONTEXT, offsetof(struct task_struct, audit_context));
 #else
        DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));
-        DEFINE(PTRACE, offsetof(struct task_struct, ptrace));
 #endif /* CONFIG_PPC64 */
        DEFINE(KSP, offsetof(struct thread_struct, ksp));
@@ -80,7 +77,6 @@ int main(void)
        DEFINE(PGDIR, offsetof(struct thread_struct, pgdir));
 #if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
        DEFINE(THREAD_DBCR0, offsetof(struct thread_struct, dbcr0));
-        DEFINE(PT_PTRACED, PT_PTRACED);
 #endif
 #ifdef CONFIG_SPE
        DEFINE(THREAD_EVR0, offsetof(struct thread_struct, evr[0]));
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
index 80e2eef05b2e..9f9377745490 100644
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
@@ -7,6 +7,7 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/lmb.h>
 #include <asm/sections.h>
 #include <asm/prom.h>
@@ -15,7 +16,7 @@
 #include <asm/mmu.h>
 #include <asm/pgtable.h>
 #include <asm/io.h>
-#include <asm/lmb.h>
+#include <asm/prom.h>
 #include <asm/processor.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/kernel/cpu_setup_44x.S b/arch/powerpc/kernel/cpu_setup_44x.S
index 6250443ab9c9..5465e8de0e61 100644
--- a/arch/powerpc/kernel/cpu_setup_44x.S
+++ b/arch/powerpc/kernel/cpu_setup_44x.S
@@ -3,7 +3,7 @@
 * Valentine Barshak <vbarshak@ru.mvista.com>
 * MontaVista Software, Inc (c) 2007
 *
- * Based on cpu_setup_6xx code by 
+ * Based on cpu_setup_6xx code by
 * Benjamin Herrenschmidt <benh@kernel.crashing.org>
 *
 * This program is free software; you can redistribute it and/or
@@ -32,6 +32,9 @@ _GLOBAL(__setup_cpu_440grx)
        bl      __fixup_440A_mcheck
        mtlr    r4
        blr
+_GLOBAL(__setup_cpu_460ex)
+_GLOBAL(__setup_cpu_460gt)
+        b       __init_fpu_44x
 _GLOBAL(__setup_cpu_440gx)
 _GLOBAL(__setup_cpu_440spe)
        b       __fixup_440A_mcheck
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 2a8f5cc5184f..26ffb44e2701 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -36,6 +36,8 @@ extern void __setup_cpu_440epx(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_440gx(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_440grx(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_440spe(unsigned long offset, struct cpu_spec* spec);
+extern void __setup_cpu_460ex(unsigned long offset, struct cpu_spec* spec);
+extern void __setup_cpu_460gt(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_603(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_604(unsigned long offset, struct cpu_spec* spec);
 extern void __setup_cpu_750(unsigned long offset, struct cpu_spec* spec);
@@ -1397,6 +1399,30 @@ static struct cpu_spec __initdata cpu_specs[] = {
                .machine_check          = machine_check_440A,
                .platform               = "ppc440",
        },
+        { /* 460EX */
+                .pvr_mask               = 0xffff0002,
+                .pvr_value              = 0x13020002,
+                .cpu_name               = "460EX",
+                .cpu_features           = CPU_FTRS_44X,
+                .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+                .cpu_setup              = __setup_cpu_460ex,
+                .machine_check          = machine_check_440A,
+                .platform               = "ppc440",
+        },
+        { /* 460GT */
+                .pvr_mask               = 0xffff0002,
+                .pvr_value              = 0x13020000,
+                .cpu_name               = "460GT",
+                .cpu_features           = CPU_FTRS_44X,
+                .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+                .cpu_setup              = __setup_cpu_460gt,
+                .machine_check          = machine_check_440A,
+                .platform               = "ppc440",
+        },
 #endif /* CONFIG_44x */
 #ifdef CONFIG_FSL_BOOKE
 #ifdef CONFIG_E200
@@ -1512,7 +1538,7 @@ struct cpu_spec * __init identify_cpu(unsigned long offset, unsigned int pvr)
                                *t = *s;
                        *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;
 #if defined(CONFIG_PPC64) || defined(CONFIG_BOOKE)
-                        /* ppc64 and booke expect identify_cpu to also call 
+                        /* ppc64 and booke expect identify_cpu to also call
                         * setup_cpu for that processor. I will consolidate
                         * that at a later time, for now, just use #ifdef.
                         * we also don't need to PTRRELOC the function pointer
diff --git a/arch/powerpc/kernel/crash.c b/arch/powerpc/kernel/crash.c
index 571132ed12c1..eae401de3f76 100644
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -24,12 +24,13 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <linux/types.h>
+#include <linux/lmb.h>
 #include <asm/processor.h>
 #include <asm/machdep.h>
 #include <asm/kexec.h>
 #include <asm/kdump.h>
-#include <asm/lmb.h>
+#include <asm/prom.h>
 #include <asm/firmware.h>
 #include <asm/smp.h>
 #include <asm/system.h>
diff --git a/arch/powerpc/kernel/crash_dump.c b/arch/powerpc/kernel/crash_dump.c
index 29ff77c468ac..9ee3c5278db0 100644
--- a/arch/powerpc/kernel/crash_dump.c
+++ b/arch/powerpc/kernel/crash_dump.c
@@ -13,8 +13,9 @@
 #include <linux/crash_dump.h>
 #include <linux/bootmem.h>
+#include <linux/lmb.h>
 #include <asm/kdump.h>
-#include <asm/lmb.h>
+#include <asm/prom.h>
 #include <asm/firmware.h>
 #include <asm/uaccess.h>
diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S
index 0f4fac512020..c16d1354b19d 100644
--- a/arch/powerpc/kernel/head_32.S
+++ b/arch/powerpc/kernel/head_32.S
@@ -763,23 +763,6 @@ load_up_altivec:
        b       fast_exception_return
 /*
- * AltiVec unavailable trap from kernel - print a message, but let
- * the task use AltiVec in the kernel until it returns to user mode.
- */
-KernelAltiVec:
-        lwz     r3,_MSR(r1)
-        oris    r3,r3,MSR_VEC@h
-        stw     r3,_MSR(r1)     /* enable use of AltiVec after return */
-        lis     r3,87f@h
-        ori     r3,r3,87f@l
-        mr      r4,r2           /* current */
-        lwz     r5,_NIP(r1)
-        bl      printk
-        b       ret_from_except
-87:     .string "AltiVec used in kernel  (task=%p, pc=%x)  \n"
-        .align  4,0
-/*
 * giveup_altivec(tsk)
 * Disable AltiVec for the task given as the argument,
 * and save the AltiVec registers in its thread_struct.
diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 2f50bb5d00f9..9971159c8040 100644
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -183,7 +183,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches)
                ret = ibmebus_create_device(child);
                if (ret) {
                        printk(KERN_ERR "%s: failed to create device (%i)",
-                               __FUNCTION__, ret);
+                               __func__, ret);
                        of_node_put(child);
                        break;
                }
@@ -269,7 +269,7 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
        if (bus_find_device(&ibmebus_bus_type, NULL, path,
                            ibmebus_match_path)) {
                printk(KERN_WARNING "%s: %s has already been probed\n",
-                       __FUNCTION__, path);
+                       __func__, path);
                rc = -EEXIST;
                goto out;
        }
@@ -279,7 +279,7 @@ static ssize_t ibmebus_store_probe(struct bus_type *bus,
                of_node_put(dn);
        } else {
                printk(KERN_WARNING "%s: no such device node: %s\n",
-                       __FUNCTION__, path);
+                       __func__, path);
                rc = -ENODEV;
        }
@@ -308,7 +308,7 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus,
                return count;
        } else {
                printk(KERN_WARNING "%s: %s not on the bus\n",
-                       __FUNCTION__, path);
+                       __func__, path);
                kfree(path);
                return -ENODEV;
@@ -337,14 +337,14 @@ static int __init ibmebus_bus_init(void)
        err = of_bus_type_init(&ibmebus_bus_type, "ibmebus");
        if (err) {
                printk(KERN_ERR "%s: failed to register IBM eBus.\n",
-                       __FUNCTION__);
+                       __func__);
                return err;
        }
        err = device_register(&ibmebus_bus_device);
        if (err) {
                printk(KERN_WARNING "%s: device_register returned %i\n",
-                       __FUNCTION__, err);
+                       __func__, err);
                bus_unregister(&ibmebus_bus_type);
                return err;
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 8f1f4e539c4b..0c663669bc32 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -520,7 +520,7 @@ void iommu_free_table(struct iommu_table *tbl, const char *node_name)
        unsigned int order;
        if (!tbl || !tbl->it_map) {
-                printk(KERN_ERR "%s: expected TCE map for %s\n", __FUNCTION__,
+                printk(KERN_ERR "%s: expected TCE map for %s\n", __func__,
                                node_name);
                return;
        }
@@ -530,7 +530,7 @@ void iommu_free_table(struct iommu_table *tbl, const char *node_name)
        for (i = 0; i < (tbl->it_size/64); i++) {
                if (tbl->it_map[i] != 0) {
                        printk(KERN_WARNING "%s: Unexpected TCEs for %s\n",
-                                __FUNCTION__, node_name);
+                                __func__, node_name);
                        break;
                }
        }
diff --git a/arch/powerpc/kernel/isa-bridge.c b/arch/powerpc/kernel/isa-bridge.c
index ee172aa42aa7..289af348978d 100644
--- a/arch/powerpc/kernel/isa-bridge.c
+++ b/arch/powerpc/kernel/isa-bridge.c
@@ -80,13 +80,13 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
         *                      (size depending on dev->n_addr_cells)
         *   cell 5:            the size of the range
         */
-        if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO) {
+        if ((range->isa_addr.a_hi & ISA_SPACE_MASK) != ISA_SPACE_IO) {
                range++;
                rlen -= sizeof(struct isa_range);
                if (rlen < sizeof(struct isa_range))
                        goto inval_range;
        }
-        if ((range->isa_addr.a_hi && ISA_SPACE_MASK) != ISA_SPACE_IO)
+        if ((range->isa_addr.a_hi & ISA_SPACE_MASK) != ISA_SPACE_IO)
                goto inval_range;
        isa_addr = range->isa_addr.a_lo;
@@ -99,7 +99,7 @@ static void __devinit pci_process_ISA_OF_ranges(struct device_node *isa_node,
         */
        if ((pci_addr != 0) || (isa_addr != 0)) {
                printk(KERN_ERR "unexpected isa to pci mapping: %s\n",
-                       __FUNCTION__);
+                       __func__);
                return;
        }
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/kernel/lparcfg.c
index dcb89a88df46..1ffacc698ffb 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/kernel/lparcfg.c
@@ -226,7 +226,7 @@ static void parse_system_parameter_string(struct seq_file *m)
        unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
        if (!local_buffer) {
                printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
-                       __FILE__, __FUNCTION__, __LINE__);
+                       __FILE__, __func__, __LINE__);
                return;
        }
@@ -243,14 +243,14 @@ static void parse_system_parameter_string(struct seq_file *m)
        if (call_status != 0) {
                printk(KERN_INFO
                       "%s %s Error calling get-system-parameter (0x%x)\n",
-                       __FILE__, __FUNCTION__, call_status);
+                       __FILE__, __func__, call_status);
        } else {
                int splpar_strlen;
                int idx, w_idx;
                char *workbuffer = kzalloc(SPLPAR_MAXLENGTH, GFP_KERNEL);
                if (!workbuffer) {
                        printk(KERN_ERR "%s %s kmalloc failure at line %d \n",
-                               __FILE__, __FUNCTION__, __LINE__);
+                               __FILE__, __func__, __LINE__);
                        kfree(local_buffer);
                        return;
                }
@@ -484,10 +484,10 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf,
        current_weight = (resource >> 5 * 8) & 0xFF;
        pr_debug("%s: current_entitled = %lu, current_weight = %u\n",
-                 __FUNCTION__, current_entitled, current_weight);
+                 __func__, current_entitled, current_weight);
        pr_debug("%s: new_entitled = %lu, new_weight = %u\n",
-                 __FUNCTION__, *new_entitled_ptr, *new_weight_ptr);
+                 __func__, *new_entitled_ptr, *new_weight_ptr);
        retval = plpar_hcall_norets(H_SET_PPP, *new_entitled_ptr,
                                    *new_weight_ptr);
@@ -502,7 +502,7 @@ static ssize_t lparcfg_write(struct file *file, const char __user * buf,
                retval = -EINVAL;
        } else {
                printk(KERN_WARNING "%s: received unknown hv return code %ld",
-                       __FUNCTION__, retval);
+                       __func__, retval);
                retval = -EIO;
        }
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index c0c8e8c3ced9..2d202f274e73 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -12,8 +12,9 @@
 #include <linux/kexec.h>
 #include <linux/reboot.h>
 #include <linux/threads.h>
+#include <linux/lmb.h>
 #include <asm/machdep.h>
-#include <asm/lmb.h>
+#include <asm/prom.h>
 void machine_crash_shutdown(struct pt_regs *regs)
 {
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index 9c98424277a8..5a4c76eada48 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -58,7 +58,6 @@ extern void program_check_exception(struct pt_regs *regs);
 extern void single_step_exception(struct pt_regs *regs);
 extern int sys_sigreturn(struct pt_regs *regs);
-EXPORT_SYMBOL(empty_zero_page);
 EXPORT_SYMBOL(clear_pages);
 EXPORT_SYMBOL(copy_page);
 EXPORT_SYMBOL(ISA_DMA_THRESHOLD);
@@ -79,6 +78,7 @@ EXPORT_SYMBOL(strncpy);
 EXPORT_SYMBOL(strcat);
 EXPORT_SYMBOL(strlen);
 EXPORT_SYMBOL(strcmp);
+EXPORT_SYMBOL(strncmp);
 EXPORT_SYMBOL(csum_partial);
 EXPORT_SYMBOL(csum_partial_copy_generic);
@@ -192,3 +192,4 @@ EXPORT_SYMBOL(intercept_table);
 EXPORT_SYMBOL(__mtdcr);
 EXPORT_SYMBOL(__mfdcr);
 #endif
+EXPORT_SYMBOL(empty_zero_page);
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 4ec605521504..a27910207c7e 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -868,11 +868,6 @@ int sys_execve(unsigned long a0, unsigned long a1, unsigned long a2,
        flush_spe_to_thread(current);
        error = do_execve(filename, (char __user * __user *) a1,
                          (char __user * __user *) a2, regs);
-        if (error == 0) {
-                task_lock(current);
-                current->ptrace &= ~PT_DTRACE;
-                task_unlock(current);
-        }
        putname(filename);
 out:
        return error;
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index eac97f48b9b8..31d5b22c59a2 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -31,10 +31,10 @@
 #include <linux/kexec.h>
 #include <linux/debugfs.h>
 #include <linux/irq.h>
+#include <linux/lmb.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
-#include <asm/lmb.h>
 #include <asm/page.h>
 #include <asm/processor.h>
 #include <asm/irq.h>
@@ -51,6 +51,7 @@
 #include <asm/machdep.h>
 #include <asm/pSeries_reconfig.h>
 #include <asm/pci-bridge.h>
+#include <asm/phyp_dump.h>
 #include <asm/kexec.h>
 #ifdef DEBUG
@@ -436,7 +437,7 @@ early_param("mem", early_parse_mem);
 * The device tree may be allocated beyond our memory limit, or inside the
 * crash kernel region for kdump. If so, move it out of the way.
 */
-static void move_device_tree(void)
+static void __init move_device_tree(void)
 {
        unsigned long start, size;
        void *p;
@@ -1040,6 +1041,56 @@ static void __init early_reserve_mem(void)
 #endif
 }
+#ifdef CONFIG_PHYP_DUMP
+/**
+ * phyp_dump_reserve_mem() - reserve all not-yet-dumped mmemory
+ *
+ * This routine may reserve memory regions in the kernel only
+ * if the system is supported and a dump was taken in last
+ * boot instance or if the hardware is supported and the
+ * scratch area needs to be setup. In other instances it returns
+ * without reserving anything. The memory in case of dump being
+ * active is freed when the dump is collected (by userland tools).
+ */
+static void __init phyp_dump_reserve_mem(void)
+{
+        unsigned long base, size;
+        if (!phyp_dump_info->phyp_dump_configured) {
+                printk(KERN_ERR "Phyp-dump not supported on this hardware\n");
+                return;
+        }
+        if (!phyp_dump_info->phyp_dump_at_boot) {
+                printk(KERN_INFO "Phyp-dump disabled at boot time\n");
+                return;
+        }
+        if (phyp_dump_info->phyp_dump_is_active) {
+                /* Reserve *everything* above RMR.Area freed by userland tools*/
+                base = PHYP_DUMP_RMR_END;
+                size = lmb_end_of_DRAM() - base;
+                /* XXX crashed_ram_end is wrong, since it may be beyond
+                 * the memory_limit, it will need to be adjusted. */
+                lmb_reserve(base, size);
+                phyp_dump_info->init_reserve_start = base;
+                phyp_dump_info->init_reserve_size = size;
+        } else {
+                size = phyp_dump_info->cpu_state_size +
+                        phyp_dump_info->hpte_region_size +
+                        PHYP_DUMP_RMR_END;
+                base = lmb_end_of_DRAM() - size;
+                lmb_reserve(base, size);
+                phyp_dump_info->init_reserve_start = base;
+                phyp_dump_info->init_reserve_size = size;
+        }
+}
+#else
+static inline void __init phyp_dump_reserve_mem(void) {}
+#endif /* CONFIG_PHYP_DUMP  && CONFIG_PPC_RTAS */
 void __init early_init_devtree(void *params)
 {
        DBG(" -> early_init_devtree(%p)\n", params);
@@ -1052,6 +1103,11 @@ void __init early_init_devtree(void *params)
        of_scan_flat_dt(early_init_dt_scan_rtas, NULL);
 #endif
+#ifdef CONFIG_PHYP_DUMP
+        /* scan tree to see if dump occured during last boot */
+        of_scan_flat_dt(early_init_dt_scan_phyp_dump, NULL);
+#endif
        /* Retrieve various informations from the /chosen node of the
         * device-tree, including the platform type, initrd location and
         * size, TCE reserve, and more ...
@@ -1072,6 +1128,7 @@ void __init early_init_devtree(void *params)
        reserve_kdump_trampoline();
        reserve_crashkernel();
        early_reserve_mem();
+        phyp_dump_reserve_mem();
        lmb_enforce_memory_limit(memory_limit);
        lmb_analyze();
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 52e95c2158c0..eb3beea4536e 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -22,6 +22,7 @@
 #include <linux/smp.h>
 #include <linux/completion.h>
 #include <linux/cpumask.h>
+#include <linux/lmb.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
@@ -34,7 +35,6 @@
 #include <asm/system.h>
 #include <asm/delay.h>
 #include <asm/uaccess.h>
-#include <asm/lmb.h>
 #include <asm/udbg.h>
 #include <asm/syscalls.h>
 #include <asm/smp.h>
@@ -507,7 +507,7 @@ int rtas_error_rc(int rtas_rc)
                        break;
                default:
                        printk(KERN_ERR "%s: unexpected RTAS error %d\n",
-                                        __FUNCTION__, rtas_rc);
+                                        __func__, rtas_rc);
                        rc = -ERANGE;
                        break;
        }
diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c
index 538baf46f15f..627f126d1848 100644
--- a/arch/powerpc/kernel/rtas_flash.c
+++ b/arch/powerpc/kernel/rtas_flash.c
@@ -807,7 +807,7 @@ int __init rtas_flash_init(void)
                                rtas_block_ctor);
        if (!flash_block_cache) {
                printk(KERN_ERR "%s: failed to create block cache\n",
-                                __FUNCTION__);
+                                __func__);
                rc = -ENOMEM;
                goto cleanup;
        }
diff --git a/arch/powerpc/kernel/rtas_pci.c b/arch/powerpc/kernel/rtas_pci.c
index 433a0a0949fb..3ab88a9dc70d 100644
--- a/arch/powerpc/kernel/rtas_pci.c
+++ b/arch/powerpc/kernel/rtas_pci.c
@@ -56,21 +56,6 @@ static inline int config_access_valid(struct pci_dn *dn, int where)
        return 0;
 }
-static int of_device_available(struct device_node * dn)
-{
-        const char *status;
-        status = of_get_property(dn, "status", NULL);
-        if (!status)
-                return 1;
-        if (!strcmp(status, "okay"))
-                return 1;
-        return 0;
-}
 int rtas_read_config(struct pci_dn *pdn, int where, int size, u32 *val)
 {
        int returnval = -1;
@@ -117,7 +102,7 @@ static int rtas_pci_read_config(struct pci_bus *bus,
        for (dn = busdn->child; dn; dn = dn->sibling) {
                struct pci_dn *pdn = PCI_DN(dn);
                if (pdn && pdn->devfn == devfn
-                    && of_device_available(dn))
+                    && of_device_is_available(dn))
                        return rtas_read_config(pdn, where, size, val);
        }
@@ -164,7 +149,7 @@ static int rtas_pci_write_config(struct pci_bus *bus,
        for (dn = busdn->child; dn; dn = dn->sibling) {
                struct pci_dn *pdn = PCI_DN(dn);
                if (pdn && pdn->devfn == devfn
-                    && of_device_available(dn))
+                    && of_device_is_available(dn))
                        return rtas_write_config(pdn, where, size, val);
        }
        return PCIBIOS_DEVICE_NOT_FOUND;
@@ -326,7 +311,7 @@ int pcibios_remove_root_bus(struct pci_controller *phb)
        res = b->resource[0];
        if (!res->flags) {
-                printk(KERN_ERR "%s: no IO resource for PHB %s\n", __FUNCTION__,
+                printk(KERN_ERR "%s: no IO resource for PHB %s\n", __func__,
                                b->name);
                return 1;
        }
@@ -334,13 +319,13 @@ int pcibios_remove_root_bus(struct pci_controller *phb)
        rc = pcibios_unmap_io_space(b);
        if (rc) {
                printk(KERN_ERR "%s: failed to unmap IO on bus %s\n",
-                        __FUNCTION__, b->name);
+                        __func__, b->name);
                return 1;
        }
        if (release_resource(res)) {
                printk(KERN_ERR "%s: failed to release IO on bus %s\n",
-                                __FUNCTION__, b->name);
+                                __func__, b->name);
                return 1;
        }
@@ -348,13 +333,13 @@ int pcibios_remove_root_bus(struct pci_controller *phb)
                res = b->resource[i];
                if (!res->flags && i == 0) {
                        printk(KERN_ERR "%s: no MEM resource for PHB %s\n",
-                                __FUNCTION__, b->name);
+                                __func__, b->name);
                        return 1;
                }
                if (res->flags && release_resource(res)) {
                        printk(KERN_ERR
                               "%s: failed to release IO %d on bus %s\n",
-                                __FUNCTION__, i, b->name);
+                                __func__, i, b->name);
                        return 1;
                }
        }
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 6adb5a1e98bb..db540eab09f4 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -34,6 +34,7 @@
 #include <linux/serial_8250.h>
 #include <linux/debugfs.h>
 #include <linux/percpu.h>
+#include <linux/lmb.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/processor.h>
@@ -56,7 +57,6 @@
 #include <asm/cache.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
-#include <asm/lmb.h>
 #include <asm/xmon.h>
 #include <asm/cputhreads.h>
@@ -167,6 +167,8 @@ static int show_cpuinfo(struct seq_file *m, void *v)
        unsigned short min;
        if (cpu_id == NR_CPUS) {
+                struct device_node *root;
+                const char *model = NULL;
 #if defined(CONFIG_SMP) && defined(CONFIG_PPC32)
                unsigned long bogosum = 0;
                int i;
@@ -178,6 +180,13 @@ static int show_cpuinfo(struct seq_file *m, void *v)
                seq_printf(m, "timebase\t: %lu\n", ppc_tb_freq);
                if (ppc_md.name)
                        seq_printf(m, "platform\t: %s\n", ppc_md.name);
+                root = of_find_node_by_path("/");
+                if (root)
+                        model = of_get_property(root, "model", NULL);
+                if (model)
+                        seq_printf(m, "model\t\t: %s\n", model);
+                of_node_put(root);
                if (ppc_md.show_cpuinfo != NULL)
                        ppc_md.show_cpuinfo(m);
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index cd870a823d18..eac936eb3190 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -172,6 +172,18 @@ int __init ppc_setup_l2cr(char *str)
 }
 __setup("l2cr=", ppc_setup_l2cr);
+/* Checks "l3cr=xxxx" command-line option */
+int __init ppc_setup_l3cr(char *str)
+{
+        if (cpu_has_feature(CPU_FTR_L3CR)) {
+                unsigned long val = simple_strtoul(str, NULL, 0);
+                printk(KERN_INFO "l3cr set to %lx\n", val);
+                _set_L3CR(val);         /* and enable it */
+        }
+        return 1;
+}
+__setup("l3cr=", ppc_setup_l3cr);
 #ifdef CONFIG_GENERIC_NVRAM
 /* Generic nvram hooks used by drivers/char/gen_nvram.c */
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 3b1529c103ef..2c2d8315193c 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -33,6 +33,7 @@
 #include <linux/serial_8250.h>
 #include <linux/bootmem.h>
 #include <linux/pci.h>
+#include <linux/lmb.h>
 #include <asm/io.h>
 #include <asm/kdump.h>
 #include <asm/prom.h>
@@ -55,7 +56,6 @@
 #include <asm/cache.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
-#include <asm/lmb.h>
 #include <asm/firmware.h>
 #include <asm/xmon.h>
 #include <asm/udbg.h>
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c
index 4a4f5c6b560b..9c3371e6958e 100644
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
@@ -368,11 +368,6 @@ long compat_sys_execve(unsigned long a0, unsigned long a1, unsigned long a2,
        error = compat_do_execve(filename, compat_ptr(a1), compat_ptr(a2), regs);
-        if (error == 0) {
-                task_lock(current);
-                current->ptrace &= ~PT_DTRACE;
-                task_unlock(current);
-        }
        putname(filename);
 out:
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index d3437c4c4a6f..c21a626af676 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -21,13 +21,14 @@
 #include <linux/elf.h>
 #include <linux/security.h>
 #include <linux/bootmem.h>
+#include <linux/lmb.h>
 #include <asm/pgtable.h>
 #include <asm/system.h>
 #include <asm/processor.h>
 #include <asm/mmu.h>
 #include <asm/mmu_context.h>
-#include <asm/lmb.h>
+#include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/cputable.h>
 #include <asm/sections.h>
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index f98867252ee2..b77f8af7ddde 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -139,7 +139,7 @@ static int vio_bus_remove(struct device *dev)
 */
 int vio_register_driver(struct vio_driver *viodrv)
 {
-        printk(KERN_DEBUG "%s: driver %s registering\n", __FUNCTION__,
+        printk(KERN_DEBUG "%s: driver %s registering\n", __func__,
                viodrv->driver.name);
        /* fill in 'struct driver' fields */
@@ -184,7 +184,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
        /* we need the 'device_type' property, in order to match with drivers */
        if (of_node->type == NULL) {
                printk(KERN_WARNING "%s: node %s missing 'device_type'\n",
-                                __FUNCTION__,
+                                __func__,
                                of_node->name ? of_node->name : "<unknown>");
                return NULL;
        }
@@ -192,7 +192,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
        unit_address = of_get_property(of_node, "reg", NULL);
        if (unit_address == NULL) {
                printk(KERN_WARNING "%s: node %s missing 'reg'\n",
-                                __FUNCTION__,
+                                __func__,
                                of_node->name ? of_node->name : "<unknown>");
                return NULL;
        }
@@ -227,7 +227,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
        /* register with generic device framework */
        if (device_register(&viodev->dev)) {
                printk(KERN_ERR "%s: failed to register device %s\n",
-                                __FUNCTION__, viodev->dev.bus_id);
+                                __func__, viodev->dev.bus_id);
                /* XXX free TCE table */
                kfree(viodev);
                return NULL;
@@ -258,7 +258,7 @@ static int __init vio_bus_init(void)
        err = device_register(&vio_bus_device.dev);
        if (err) {
                printk(KERN_WARNING "%s: device_register returned %i\n",
-                                __FUNCTION__, err);
+                                __func__, err);
                return err;
        }
diff --git a/arch/powerpc/lib/string.S b/arch/powerpc/lib/string.S
index c4c622d8e6ac..49eb1f1a2bb4 100644
--- a/arch/powerpc/lib/string.S
+++ b/arch/powerpc/lib/string.S
@@ -75,6 +75,20 @@ _GLOBAL(strcmp)
        beq     1b
        blr
+_GLOBAL(strncmp)
+        PPC_LCMPI r5,0
+        beqlr
+        mtctr   r5
+        addi    r5,r3,-1
+        addi    r4,r4,-1
+1:      lbzu    r3,1(r5)
+        cmpwi   1,r3,0
+        lbzu    r0,1(r4)
+        subf.   r3,r0,r3
+        beqlr   1
+        bdnzt   eq,1b
+        blr
 _GLOBAL(strlen)
        addi    r4,r3,-1
 1:      lbzu    r0,1(r4)
diff --git a/arch/powerpc/math-emu/fabs.c b/arch/powerpc/math-emu/fabs.c
index 41f0617f3d3a..549baba5948f 100644
--- a/arch/powerpc/math-emu/fabs.c
+++ b/arch/powerpc/math-emu/fabs.c
@@ -9,7 +9,7 @@ fabs(u32 *frD, u32 *frB)
        frD[1] = frB[1];
 #ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p: ", __func__, frD, frB);
        dump_double(frD);
        printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/fadd.c b/arch/powerpc/math-emu/fadd.c
index fc8836488b64..7befbbf2c332 100644
--- a/arch/powerpc/math-emu/fadd.c
+++ b/arch/powerpc/math-emu/fadd.c
@@ -14,7 +14,7 @@ fadd(void *frD, void *frA, void *frB)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fadds.c b/arch/powerpc/math-emu/fadds.c
index 93025b6c8f3c..2b346b38b480 100644
--- a/arch/powerpc/math-emu/fadds.c
+++ b/arch/powerpc/math-emu/fadds.c
@@ -15,7 +15,7 @@ fadds(void *frD, void *frA, void *frB)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fcmpo.c b/arch/powerpc/math-emu/fcmpo.c
index 4efac394b4cb..36d689044c63 100644
--- a/arch/powerpc/math-emu/fcmpo.c
+++ b/arch/powerpc/math-emu/fcmpo.c
@@ -15,7 +15,7 @@ fcmpo(u32 *ccr, int crfD, void *frA, void *frB)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p (%08x) %d %p %p\n", __FUNCTION__, ccr, *ccr, crfD, frA, frB);
+        printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fcmpu.c b/arch/powerpc/math-emu/fcmpu.c
index b7e33176e618..53d93894f2a6 100644
--- a/arch/powerpc/math-emu/fcmpu.c
+++ b/arch/powerpc/math-emu/fcmpu.c
@@ -14,7 +14,7 @@ fcmpu(u32 *ccr, int crfD, void *frA, void *frB)
        long cmp;
 #ifdef DEBUG
-        printk("%s: %p (%08x) %d %p %p\n", __FUNCTION__, ccr, *ccr, crfD, frA, frB);
+        printk("%s: %p (%08x) %d %p %p\n", __func__, ccr, *ccr, crfD, frA, frB);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fctiw.c b/arch/powerpc/math-emu/fctiw.c
index 3b3c98b840cf..fcd7a95e021d 100644
--- a/arch/powerpc/math-emu/fctiw.c
+++ b/arch/powerpc/math-emu/fctiw.c
@@ -16,7 +16,7 @@ fctiw(u32 *frD, void *frB)
        frD[1] = r;
 #ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p: ", __func__, frD, frB);
        dump_double(frD);
        printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/fctiwz.c b/arch/powerpc/math-emu/fctiwz.c
index 7717eb6fcfb6..1514d59e146e 100644
--- a/arch/powerpc/math-emu/fctiwz.c
+++ b/arch/powerpc/math-emu/fctiwz.c
@@ -23,7 +23,7 @@ fctiwz(u32 *frD, void *frB)
        __FPU_FPSCR = fpscr;
 #ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p: ", __func__, frD, frB);
        dump_double(frD);
        printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/fdiv.c b/arch/powerpc/math-emu/fdiv.c
index f2fba825b2d0..18a20fe396b0 100644
--- a/arch/powerpc/math-emu/fdiv.c
+++ b/arch/powerpc/math-emu/fdiv.c
@@ -14,7 +14,7 @@ fdiv(void *frD, void *frA, void *frB)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
        __FP_UNPACK_D(A, frA);
@@ -28,13 +28,13 @@ fdiv(void *frD, void *frA, void *frB)
        if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
                ret |= EFLAG_VXZDZ;
 #ifdef DEBUG
-                printk("%s: FPSCR_VXZDZ raised\n", __FUNCTION__);
+                printk("%s: FPSCR_VXZDZ raised\n", __func__);
 #endif
        }
        if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
                ret |= EFLAG_VXIDI;
 #ifdef DEBUG
-                printk("%s: FPSCR_VXIDI raised\n", __FUNCTION__);
+                printk("%s: FPSCR_VXIDI raised\n", __func__);
 #endif
        }
diff --git a/arch/powerpc/math-emu/fdivs.c b/arch/powerpc/math-emu/fdivs.c
index b971196e3175..24feed689c35 100644
--- a/arch/powerpc/math-emu/fdivs.c
+++ b/arch/powerpc/math-emu/fdivs.c
@@ -15,7 +15,7 @@ fdivs(void *frD, void *frA, void *frB)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
        __FP_UNPACK_D(A, frA);
@@ -29,13 +29,13 @@ fdivs(void *frD, void *frA, void *frB)
        if (A_c == FP_CLS_ZERO && B_c == FP_CLS_ZERO) {
                ret |= EFLAG_VXZDZ;
 #ifdef DEBUG
-                printk("%s: FPSCR_VXZDZ raised\n", __FUNCTION__);
+                printk("%s: FPSCR_VXZDZ raised\n", __func__);
 #endif
        }
        if (A_c == FP_CLS_INF && B_c == FP_CLS_INF) {
                ret |= EFLAG_VXIDI;
 #ifdef DEBUG
-                printk("%s: FPSCR_VXIDI raised\n", __FUNCTION__);
+                printk("%s: FPSCR_VXIDI raised\n", __func__);
 #endif
        }
diff --git a/arch/powerpc/math-emu/fmadd.c b/arch/powerpc/math-emu/fmadd.c
index 0a1dbce793e9..dedb465fdc68 100644
--- a/arch/powerpc/math-emu/fmadd.c
+++ b/arch/powerpc/math-emu/fmadd.c
@@ -16,7 +16,7 @@ fmadd(void *frD, void *frA, void *frB, void *frC)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fmadds.c b/arch/powerpc/math-emu/fmadds.c
index 0f70bba9445e..6bbb56d5502c 100644
--- a/arch/powerpc/math-emu/fmadds.c
+++ b/arch/powerpc/math-emu/fmadds.c
@@ -17,7 +17,7 @@ fmadds(void *frD, void *frA, void *frB, void *frC)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fmr.c b/arch/powerpc/math-emu/fmr.c
index 28df700c0c7e..bd55384b8196 100644
--- a/arch/powerpc/math-emu/fmr.c
+++ b/arch/powerpc/math-emu/fmr.c
@@ -9,7 +9,7 @@ fmr(u32 *frD, u32 *frB)
        frD[1] = frB[1];
 #ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p: ", __func__, frD, frB);
        dump_double(frD);
        printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/fmsub.c b/arch/powerpc/math-emu/fmsub.c
index 203fd48a6fec..f311e2c7e67e 100644
--- a/arch/powerpc/math-emu/fmsub.c
+++ b/arch/powerpc/math-emu/fmsub.c
@@ -16,7 +16,7 @@ fmsub(void *frD, void *frA, void *frB, void *frC)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fmsubs.c b/arch/powerpc/math-emu/fmsubs.c
index 8ce68624c189..81a716d3ee2e 100644
--- a/arch/powerpc/math-emu/fmsubs.c
+++ b/arch/powerpc/math-emu/fmsubs.c
@@ -17,7 +17,7 @@ fmsubs(void *frD, void *frA, void *frB, void *frC)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fmul.c b/arch/powerpc/math-emu/fmul.c
index 66c7e79aae2e..2f3d32784a04 100644
--- a/arch/powerpc/math-emu/fmul.c
+++ b/arch/powerpc/math-emu/fmul.c
@@ -14,7 +14,7 @@ fmul(void *frD, void *frA, void *frB)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fmuls.c b/arch/powerpc/math-emu/fmuls.c
index 26bc4278271c..962b5883f784 100644
--- a/arch/powerpc/math-emu/fmuls.c
+++ b/arch/powerpc/math-emu/fmuls.c
@@ -15,7 +15,7 @@ fmuls(void *frD, void *frA, void *frB)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fnabs.c b/arch/powerpc/math-emu/fnabs.c
index c6b913d179e0..a7d34f3d9499 100644
--- a/arch/powerpc/math-emu/fnabs.c
+++ b/arch/powerpc/math-emu/fnabs.c
@@ -9,7 +9,7 @@ fnabs(u32 *frD, u32 *frB)
        frD[1] = frB[1];
 #ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p: ", __func__, frD, frB);
        dump_double(frD);
        printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/fneg.c b/arch/powerpc/math-emu/fneg.c
index fe9a98deff69..1e988cd9c6cc 100644
--- a/arch/powerpc/math-emu/fneg.c
+++ b/arch/powerpc/math-emu/fneg.c
@@ -9,7 +9,7 @@ fneg(u32 *frD, u32 *frB)
        frD[1] = frB[1];
 #ifdef DEBUG
-        printk("%s: D %p, B %p: ", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p: ", __func__, frD, frB);
        dump_double(frD);
        printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/fnmadd.c b/arch/powerpc/math-emu/fnmadd.c
index 7f312276d920..8cf7827c4fb5 100644
--- a/arch/powerpc/math-emu/fnmadd.c
+++ b/arch/powerpc/math-emu/fnmadd.c
@@ -16,7 +16,7 @@ fnmadd(void *frD, void *frA, void *frB, void *frC)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fnmadds.c b/arch/powerpc/math-emu/fnmadds.c
index 65454c9c70bc..f1c4f0f0d807 100644
--- a/arch/powerpc/math-emu/fnmadds.c
+++ b/arch/powerpc/math-emu/fnmadds.c
@@ -17,7 +17,7 @@ fnmadds(void *frD, void *frA, void *frB, void *frC)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fnmsub.c b/arch/powerpc/math-emu/fnmsub.c
index f1ca7482b5f0..98944e6e2601 100644
--- a/arch/powerpc/math-emu/fnmsub.c
+++ b/arch/powerpc/math-emu/fnmsub.c
@@ -16,7 +16,7 @@ fnmsub(void *frD, void *frA, void *frB, void *frC)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fnmsubs.c b/arch/powerpc/math-emu/fnmsubs.c
index 5c9a09a87dc7..b20f4eb63fb9 100644
--- a/arch/powerpc/math-emu/fnmsubs.c
+++ b/arch/powerpc/math-emu/fnmsubs.c
@@ -17,7 +17,7 @@ fnmsubs(void *frD, void *frA, void *frB, void *frC)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fres.c b/arch/powerpc/math-emu/fres.c
index ec11e46d20af..10ecbd08b79e 100644
--- a/arch/powerpc/math-emu/fres.c
+++ b/arch/powerpc/math-emu/fres.c
@@ -6,7 +6,7 @@ int
 fres(void *frD, void *frB)
 {
 #ifdef DEBUG
-        printk("%s: %p %p\n", __FUNCTION__, frD, frB);
+        printk("%s: %p %p\n", __func__, frD, frB);
 #endif
        return -ENOSYS;
 }
diff --git a/arch/powerpc/math-emu/frsp.c b/arch/powerpc/math-emu/frsp.c
index d879b2a3d0c9..724ccbc0468e 100644
--- a/arch/powerpc/math-emu/frsp.c
+++ b/arch/powerpc/math-emu/frsp.c
@@ -12,7 +12,7 @@ frsp(void *frD, void *frB)
        FP_DECL_D(B);
 #ifdef DEBUG
-        printk("%s: D %p, B %p\n", __FUNCTION__, frD, frB);
+        printk("%s: D %p, B %p\n", __func__, frD, frB);
 #endif
        __FP_UNPACK_D(B, frB);
diff --git a/arch/powerpc/math-emu/frsqrte.c b/arch/powerpc/math-emu/frsqrte.c
index a11ae1829850..1d0a3a0fd0e6 100644
--- a/arch/powerpc/math-emu/frsqrte.c
+++ b/arch/powerpc/math-emu/frsqrte.c
@@ -6,7 +6,7 @@ int
 frsqrte(void *frD, void *frB)
 {
 #ifdef DEBUG
-        printk("%s: %p %p\n", __FUNCTION__, frD, frB);
+        printk("%s: %p %p\n", __func__, frD, frB);
 #endif
        return 0;
 }
diff --git a/arch/powerpc/math-emu/fsel.c b/arch/powerpc/math-emu/fsel.c
index e36e6e72819a..ecb5f28eb1f3 100644
--- a/arch/powerpc/math-emu/fsel.c
+++ b/arch/powerpc/math-emu/fsel.c
@@ -11,7 +11,7 @@ fsel(u32 *frD, void *frA, u32 *frB, u32 *frC)
        FP_DECL_D(A);
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frA, frB, frC);
+        printk("%s: %p %p %p %p\n", __func__, frD, frA, frB, frC);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fsqrt.c b/arch/powerpc/math-emu/fsqrt.c
index 6f8319f64a8a..38ec2b752e9d 100644
--- a/arch/powerpc/math-emu/fsqrt.c
+++ b/arch/powerpc/math-emu/fsqrt.c
@@ -13,7 +13,7 @@ fsqrt(void *frD, void *frB)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frB);
+        printk("%s: %p %p %p %p\n", __func__, frD, frB);
 #endif
        __FP_UNPACK_D(B, frB);
diff --git a/arch/powerpc/math-emu/fsqrts.c b/arch/powerpc/math-emu/fsqrts.c
index 3b2b1cf55c12..335263e06ee5 100644
--- a/arch/powerpc/math-emu/fsqrts.c
+++ b/arch/powerpc/math-emu/fsqrts.c
@@ -14,7 +14,7 @@ fsqrts(void *frD, void *frB)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p %p\n", __FUNCTION__, frD, frB);
+        printk("%s: %p %p %p %p\n", __func__, frD, frB);
 #endif
        __FP_UNPACK_D(B, frB);
diff --git a/arch/powerpc/math-emu/fsub.c b/arch/powerpc/math-emu/fsub.c
index 956679042bb2..208d20fc52a5 100644
--- a/arch/powerpc/math-emu/fsub.c
+++ b/arch/powerpc/math-emu/fsub.c
@@ -14,7 +14,7 @@ fsub(void *frD, void *frA, void *frB)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/fsubs.c b/arch/powerpc/math-emu/fsubs.c
index 3428117dfe8c..0e61b808c44b 100644
--- a/arch/powerpc/math-emu/fsubs.c
+++ b/arch/powerpc/math-emu/fsubs.c
@@ -15,7 +15,7 @@ fsubs(void *frD, void *frA, void *frB)
        int ret = 0;
 #ifdef DEBUG
-        printk("%s: %p %p %p\n", __FUNCTION__, frD, frA, frB);
+        printk("%s: %p %p %p\n", __func__, frD, frA, frB);
 #endif
        __FP_UNPACK_D(A, frA);
diff --git a/arch/powerpc/math-emu/lfd.c b/arch/powerpc/math-emu/lfd.c
index 7d38101c329b..6ec90b57c61a 100644
--- a/arch/powerpc/math-emu/lfd.c
+++ b/arch/powerpc/math-emu/lfd.c
@@ -11,7 +11,7 @@ lfd(void *frD, void *ea)
        if (copy_from_user(frD, ea, sizeof(double)))
                return -EFAULT;
 #ifdef DEBUG
-        printk("%s: D %p, ea %p: ", __FUNCTION__, frD, ea);
+        printk("%s: D %p, ea %p: ", __func__, frD, ea);
        dump_double(frD);
        printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/lfs.c b/arch/powerpc/math-emu/lfs.c
index c86dee3d7655..6f18ebe3a7ff 100644
--- a/arch/powerpc/math-emu/lfs.c
+++ b/arch/powerpc/math-emu/lfs.c
@@ -14,7 +14,7 @@ lfs(void *frD, void *ea)
        float f;
 #ifdef DEBUG
-        printk("%s: D %p, ea %p\n", __FUNCTION__, frD, ea);
+        printk("%s: D %p, ea %p\n", __func__, frD, ea);
 #endif
        if (copy_from_user(&f, ea, sizeof(float)))
diff --git a/arch/powerpc/math-emu/mcrfs.c b/arch/powerpc/math-emu/mcrfs.c
index 106dd912914b..41ba247faf89 100644
--- a/arch/powerpc/math-emu/mcrfs.c
+++ b/arch/powerpc/math-emu/mcrfs.c
@@ -10,7 +10,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)
        u32 value, clear;
 #ifdef DEBUG
-        printk("%s: %p (%08x) %d %d\n", __FUNCTION__, ccr, *ccr, crfD, crfS);
+        printk("%s: %p (%08x) %d %d\n", __func__, ccr, *ccr, crfD, crfS);
 #endif
        clear = 15 << ((7 - crfS) << 2);
@@ -24,7 +24,7 @@ mcrfs(u32 *ccr, u32 crfD, u32 crfS)
        *ccr |= (value << ((7 - crfD) << 2));
 #ifdef DEBUG
-        printk("CR: %08x\n", __FUNCTION__, *ccr);
+        printk("CR: %08x\n", __func__, *ccr);
 #endif
        return 0;
diff --git a/arch/powerpc/math-emu/mffs.c b/arch/powerpc/math-emu/mffs.c
index f477c9170e75..b0e2106e6eb6 100644
--- a/arch/powerpc/math-emu/mffs.c
+++ b/arch/powerpc/math-emu/mffs.c
@@ -10,7 +10,7 @@ mffs(u32 *frD)
        frD[1] = __FPU_FPSCR;
 #ifdef DEBUG
-        printk("%s: frD %p: %08x.%08x\n", __FUNCTION__, frD, frD[0], frD[1]);
+        printk("%s: frD %p: %08x.%08x\n", __func__, frD, frD[0], frD[1]);
 #endif
        return 0;
diff --git a/arch/powerpc/math-emu/mtfsb0.c b/arch/powerpc/math-emu/mtfsb0.c
index 99bfd80f4af3..d3062350ea21 100644
--- a/arch/powerpc/math-emu/mtfsb0.c
+++ b/arch/powerpc/math-emu/mtfsb0.c
@@ -11,7 +11,7 @@ mtfsb0(int crbD)
                __FPU_FPSCR &= ~(1 << (31 - crbD));
 #ifdef DEBUG
-        printk("%s: %d %08lx\n", __FUNCTION__, crbD, __FPU_FPSCR);
+        printk("%s: %d %08lx\n", __func__, crbD, __FPU_FPSCR);
 #endif
        return 0;
diff --git a/arch/powerpc/math-emu/mtfsb1.c b/arch/powerpc/math-emu/mtfsb1.c
index 3d9e7ed92d2b..2e948704b56e 100644
--- a/arch/powerpc/math-emu/mtfsb1.c
+++ b/arch/powerpc/math-emu/mtfsb1.c
@@ -11,7 +11,7 @@ mtfsb1(int crbD)
                __FPU_FPSCR |= (1 << (31 - crbD));
 #ifdef DEBUG
-        printk("%s: %d %08lx\n", __FUNCTION__, crbD, __FPU_FPSCR);
+        printk("%s: %d %08lx\n", __func__, crbD, __FPU_FPSCR);
 #endif
        return 0;
diff --git a/arch/powerpc/math-emu/mtfsf.c b/arch/powerpc/math-emu/mtfsf.c
index d70cf714994c..48014d8e3af1 100644
--- a/arch/powerpc/math-emu/mtfsf.c
+++ b/arch/powerpc/math-emu/mtfsf.c
@@ -38,7 +38,7 @@ mtfsf(unsigned int FM, u32 *frB)
        __FPU_FPSCR |= (frB[1] & mask);
 #ifdef DEBUG
-        printk("%s: %02x %p: %08lx\n", __FUNCTION__, FM, frB, __FPU_FPSCR);
+        printk("%s: %02x %p: %08lx\n", __func__, FM, frB, __FPU_FPSCR);
 #endif
        return 0;
diff --git a/arch/powerpc/math-emu/mtfsfi.c b/arch/powerpc/math-emu/mtfsfi.c
index 71df854baa7e..031e20093549 100644
--- a/arch/powerpc/math-emu/mtfsfi.c
+++ b/arch/powerpc/math-emu/mtfsfi.c
@@ -16,7 +16,7 @@ mtfsfi(unsigned int crfD, unsigned int IMM)
        __FPU_FPSCR |= (IMM & 0xf) << ((7 - crfD) << 2);
 #ifdef DEBUG
-        printk("%s: %d %x: %08lx\n", __FUNCTION__, crfD, IMM, __FPU_FPSCR);
+        printk("%s: %d %x: %08lx\n", __func__, crfD, IMM, __FPU_FPSCR);
 #endif
        return 0;
diff --git a/arch/powerpc/math-emu/stfd.c b/arch/powerpc/math-emu/stfd.c
index 3f8c2558a9e8..33a165c8df0f 100644
--- a/arch/powerpc/math-emu/stfd.c
+++ b/arch/powerpc/math-emu/stfd.c
@@ -7,7 +7,7 @@ stfd(void *frS, void *ea)
 {
 #if 0
 #ifdef DEBUG
-        printk("%s: S %p, ea %p: ", __FUNCTION__, frS, ea);
+        printk("%s: S %p, ea %p: ", __func__, frS, ea);
        dump_double(frS);
        printk("\n");
 #endif
diff --git a/arch/powerpc/math-emu/stfiwx.c b/arch/powerpc/math-emu/stfiwx.c
index 95caaeec6a08..f15a35f67e2c 100644
--- a/arch/powerpc/math-emu/stfiwx.c
+++ b/arch/powerpc/math-emu/stfiwx.c
@@ -6,7 +6,7 @@ int
 stfiwx(u32 *frS, void *ea)
 {
 #ifdef DEBUG
-        printk("%s: %p %p\n", __FUNCTION__, frS, ea);
+        printk("%s: %p %p\n", __func__, frS, ea);
 #endif
        if (copy_to_user(ea, &frS[1], sizeof(frS[1])))
diff --git a/arch/powerpc/math-emu/stfs.c b/arch/powerpc/math-emu/stfs.c
index e87ca23c6dc3..8689aa48ef69 100644
--- a/arch/powerpc/math-emu/stfs.c
+++ b/arch/powerpc/math-emu/stfs.c
@@ -15,7 +15,7 @@ stfs(void *frS, void *ea)
        int err;
 #ifdef DEBUG
-        printk("%s: S %p, ea %p\n", __FUNCTION__, frS, ea);
+        printk("%s: S %p, ea %p\n", __func__, frS, ea);
 #endif
        __FP_UNPACK_D(A, frS);
diff --git a/arch/powerpc/mm/Makefile b/arch/powerpc/mm/Makefile
index 41649a5d3602..1c00e0196f6c 100644
--- a/arch/powerpc/mm/Makefile
+++ b/arch/powerpc/mm/Makefile
@@ -6,7 +6,7 @@ ifeq ($(CONFIG_PPC64),y)
 EXTRA_CFLAGS    += -mno-minimal-toc
 endif
-obj-y                           := fault.o mem.o lmb.o \
+obj-y                           := fault.o mem.o \
                                   init_$(CONFIG_WORD_SIZE).o \
                                   pgtable_$(CONFIG_WORD_SIZE).o \
                                   mmu_context_$(CONFIG_WORD_SIZE).o
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index a83dfa3cf40c..2b5a399f6fa6 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -31,6 +31,7 @@
 #include <linux/cache.h>
 #include <linux/init.h>
 #include <linux/signal.h>
+#include <linux/lmb.h>
 #include <asm/processor.h>
 #include <asm/pgtable.h>
@@ -41,7 +42,7 @@
 #include <asm/system.h>
 #include <asm/uaccess.h>
 #include <asm/machdep.h>
-#include <asm/lmb.h>
+#include <asm/prom.h>
 #include <asm/abs_addr.h>
 #include <asm/tlbflush.h>
 #include <asm/io.h>
@@ -191,6 +192,29 @@ int htab_bolt_mapping(unsigned long vstart, unsigned long vend,
        return ret < 0 ? ret : 0;
 }
+#ifdef CONFIG_MEMORY_HOTPLUG
+static int htab_remove_mapping(unsigned long vstart, unsigned long vend,
+                      int psize, int ssize)
+{
+        unsigned long vaddr;
+        unsigned int step, shift;
+        shift = mmu_psize_defs[psize].shift;
+        step = 1 << shift;
+        if (!ppc_md.hpte_removebolted) {
+                printk(KERN_WARNING "Platform doesn't implement "
+                                "hpte_removebolted\n");
+                return -EINVAL;
+        }
+        for (vaddr = vstart; vaddr < vend; vaddr += step)
+                ppc_md.hpte_removebolted(vaddr, psize, ssize);
+        return 0;
+}
+#endif /* CONFIG_MEMORY_HOTPLUG */
 static int __init htab_dt_scan_seg_sizes(unsigned long node,
                                         const char *uname, int depth,
                                         void *data)
@@ -434,6 +458,12 @@ void create_section_mapping(unsigned long start, unsigned long end)
                        _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_COHERENT | PP_RWXX,
                        mmu_linear_psize, mmu_kernel_ssize));
 }
+int remove_section_mapping(unsigned long start, unsigned long end)
+{
+        return htab_remove_mapping(start, end, mmu_linear_psize,
+                        mmu_kernel_ssize);
+}
 #endif /* CONFIG_MEMORY_HOTPLUG */
 static inline void make_bl(unsigned int *insn_addr, void *func)
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index 977cb1ee5e72..0c66a9fe63f5 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -30,6 +30,7 @@
 #include <linux/highmem.h>
 #include <linux/initrd.h>
 #include <linux/pagemap.h>
+#include <linux/lmb.h>
 #include <asm/pgalloc.h>
 #include <asm/prom.h>
@@ -41,7 +42,6 @@
 #include <asm/machdep.h>
 #include <asm/btext.h>
 #include <asm/tlb.h>
-#include <asm/lmb.h>
 #include <asm/sections.h>
 #include "mmu_decl.h"
@@ -276,7 +276,7 @@ static int __init setup_kcore(void)
                kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
                if (!kcore_mem)
-                        panic("%s: kmalloc failed\n", __FUNCTION__);
+                        panic("%s: kmalloc failed\n", __func__);
                /* must stay under 32 bits */
                if ( 0xfffffffful - (unsigned long)__va(base) < size) {
diff --git a/arch/powerpc/mm/init_64.c b/arch/powerpc/mm/init_64.c
index c0f5cff77035..5f553991698b 100644
--- a/arch/powerpc/mm/init_64.c
+++ b/arch/powerpc/mm/init_64.c
@@ -38,11 +38,11 @@
 #include <linux/nodemask.h>
 #include <linux/module.h>
 #include <linux/poison.h>
+#include <linux/lmb.h>
 #include <asm/pgalloc.h>
 #include <asm/page.h>
 #include <asm/prom.h>
-#include <asm/lmb.h>
 #include <asm/rtas.h>
 #include <asm/io.h>
 #include <asm/mmu_context.h>
@@ -122,7 +122,7 @@ static int __init setup_kcore(void)
                /* GFP_ATOMIC to avoid might_sleep warnings during boot */
                kcore_mem = kmalloc(sizeof(struct kcore_list), GFP_ATOMIC);
                if (!kcore_mem)
-                        panic("%s: kmalloc failed\n", __FUNCTION__);
+                        panic("%s: kmalloc failed\n", __func__);
                kclist_add(kcore_mem, __va(base), size);
        }
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index be5c506779a7..e3349ead3959 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -31,6 +31,7 @@
 #include <linux/initrd.h>
 #include <linux/pagemap.h>
 #include <linux/suspend.h>
+#include <linux/lmb.h>
 #include <asm/pgalloc.h>
 #include <asm/prom.h>
@@ -42,7 +43,6 @@
 #include <asm/machdep.h>
 #include <asm/btext.h>
 #include <asm/tlb.h>
-#include <asm/lmb.h>
 #include <asm/sections.h>
 #include <asm/vdso.h>
@@ -111,7 +111,7 @@ int memory_add_physaddr_to_nid(u64 start)
 }
 #endif
-int __devinit arch_add_memory(int nid, u64 start, u64 size)
+int arch_add_memory(int nid, u64 start, u64 size)
 {
        struct pglist_data *pgdata;
        struct zone *zone;
@@ -175,7 +175,6 @@ void show_mem(void)
        printk("Mem-info:\n");
        show_free_areas();
-        printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
        for_each_online_pgdat(pgdat) {
                unsigned long flags;
                pgdat_resize_lock(pgdat, &flags);
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index a300d254aac6..1efd631211ef 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -17,8 +17,9 @@
 #include <linux/nodemask.h>
 #include <linux/cpu.h>
 #include <linux/notifier.h>
+#include <linux/lmb.h>
 #include <asm/sparsemem.h>
-#include <asm/lmb.h>
+#include <asm/prom.h>
 #include <asm/system.h>
 #include <asm/smp.h>
diff --git a/arch/powerpc/mm/ppc_mmu_32.c b/arch/powerpc/mm/ppc_mmu_32.c
index 5c45d474cfcc..72de3c79210a 100644
--- a/arch/powerpc/mm/ppc_mmu_32.c
+++ b/arch/powerpc/mm/ppc_mmu_32.c
@@ -26,11 +26,11 @@
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/highmem.h>
+#include <linux/lmb.h>
 #include <asm/prom.h>
 #include <asm/mmu.h>
 #include <asm/machdep.h>
-#include <asm/lmb.h>
 #include "mmu_decl.h"
diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c
index 50448d5de9d2..efbbd13d93e5 100644
--- a/arch/powerpc/mm/stab.c
+++ b/arch/powerpc/mm/stab.c
@@ -12,12 +12,14 @@
 *      2 of the License, or (at your option) any later version.
 */
+#include <linux/lmb.h>
 #include <asm/pgtable.h>
 #include <asm/mmu.h>
 #include <asm/mmu_context.h>
 #include <asm/paca.h>
 #include <asm/cputable.h>
-#include <asm/lmb.h>
+#include <asm/prom.h>
 #include <asm/abs_addr.h>
 #include <asm/firmware.h>
 #include <asm/iseries/hv_call.h>
diff --git a/arch/powerpc/oprofile/cell/spu_task_sync.c b/arch/powerpc/oprofile/cell/spu_task_sync.c
index 257b13cb18af..2a9b4a049329 100644
--- a/arch/powerpc/oprofile/cell/spu_task_sync.c
+++ b/arch/powerpc/oprofile/cell/spu_task_sync.c
@@ -68,7 +68,7 @@ static struct cached_info *get_cached_info(struct spu *the_spu, int spu_num)
        if (spu_num >= num_spu_nodes) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: Invalid index %d into spu info cache\n",
-                       __FUNCTION__, __LINE__, spu_num);
+                       __func__, __LINE__, spu_num);
                ret_info = NULL;
                goto out;
        }
@@ -115,7 +115,7 @@ prepare_cached_spu_info(struct spu *spu, unsigned long objectId)
        if (!info) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: create vma_map failed\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                retval = -ENOMEM;
                goto err_alloc;
        }
@@ -123,7 +123,7 @@ prepare_cached_spu_info(struct spu *spu, unsigned long objectId)
        if (!new_map) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: create vma_map failed\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                retval = -ENOMEM;
                goto err_alloc;
        }
@@ -171,7 +171,7 @@ static int release_cached_info(int spu_index)
                        printk(KERN_ERR "SPU_PROF: "
                                "%s, line %d: "
                                "Invalid index %d into spu info cache\n",
-                                __FUNCTION__, __LINE__, spu_index);
+                                __func__, __LINE__, spu_index);
                        goto out;
                }
                end = spu_index + 1;
@@ -273,7 +273,7 @@ fail_no_image_cookie:
        printk(KERN_ERR "SPU_PROF: "
                "%s, line %d: Cannot find dcookie for SPU binary\n",
-                __FUNCTION__, __LINE__);
+                __func__, __LINE__);
        goto out;
 }
@@ -467,7 +467,7 @@ int spu_sync_stop(void)
        if (ret) {
                printk(KERN_ERR "SPU_PROF: "
                        "%s, line %d: spu_switch_event_unregister returned %d\n",
-                        __FUNCTION__, __LINE__, ret);
+                        __func__, __LINE__, ret);
                goto out;
        }
diff --git a/arch/powerpc/oprofile/cell/vma_map.c b/arch/powerpc/oprofile/cell/vma_map.c
index 9a932177e70e..fff66662d021 100644
--- a/arch/powerpc/oprofile/cell/vma_map.c
+++ b/arch/powerpc/oprofile/cell/vma_map.c
@@ -72,7 +72,7 @@ vma_map_add(struct vma_to_fileoffset_map *map, unsigned int vma,
                kzalloc(sizeof(struct vma_to_fileoffset_map), GFP_KERNEL);
        if (!new) {
                printk(KERN_ERR "SPU_PROF: %s, line %d: malloc failed\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                vma_map_free(map);
                return NULL;
        }
@@ -134,19 +134,19 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu,
        if (memcmp(ehdr.e_ident, expected, EI_PAD) != 0) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: Unexpected e_ident parsing SPU ELF\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                goto fail;
        }
        if (ehdr.e_machine != EM_SPU) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: Unexpected e_machine parsing SPU ELF\n",
-                       __FUNCTION__,  __LINE__);
+                       __func__,  __LINE__);
                goto fail;
        }
        if (ehdr.e_type != ET_EXEC) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: Unexpected e_type parsing SPU ELF\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                goto fail;
        }
        phdr_start = spu_elf_start + ehdr.e_phoff;
@@ -232,7 +232,7 @@ struct vma_to_fileoffset_map *create_vma_map(const struct spu *aSpu,
        if (overlay_tbl_offset < 0) {
                printk(KERN_ERR "SPU_PROF: "
                       "%s, line %d: Error finding SPU overlay table\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                goto fail;
        }
        ovly_table = spu_elf_start + overlay_tbl_offset;
diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c
index 9eed1f68fcab..5ff4de3eb3be 100644
--- a/arch/powerpc/oprofile/op_model_cell.c
+++ b/arch/powerpc/oprofile/op_model_cell.c
@@ -216,7 +216,7 @@ static void pm_rtas_reset_signals(u32 node)
                 * failure to stop OProfile.
                 */
                printk(KERN_WARNING "%s: rtas returned: %d\n",
-                       __FUNCTION__, ret);
+                       __func__, ret);
 }
 static int pm_rtas_activate_signals(u32 node, u32 count)
@@ -255,7 +255,7 @@ static int pm_rtas_activate_signals(u32 node, u32 count)
                if (unlikely(ret)) {
                        printk(KERN_WARNING "%s: rtas returned: %d\n",
-                               __FUNCTION__, ret);
+                               __func__, ret);
                        return -EIO;
                }
        }
@@ -560,7 +560,7 @@ static int cell_reg_setup(struct op_counter_config *ctr,
                if (unlikely(spu_rtas_token == RTAS_UNKNOWN_SERVICE)) {
                        printk(KERN_ERR
                               "%s: rtas token ibm,cbe-spu-perftools unknown\n",
-                               __FUNCTION__);
+                               __func__);
                        return -EIO;
                }
        }
@@ -576,7 +576,7 @@ static int cell_reg_setup(struct op_counter_config *ctr,
        if (unlikely(pm_rtas_token == RTAS_UNKNOWN_SERVICE)) {
                printk(KERN_ERR
                       "%s: rtas token ibm,cbe-perftools unknown\n",
-                       __FUNCTION__);
+                       __func__);
                return -EIO;
        }
@@ -853,7 +853,7 @@ static int pm_rtas_activate_spu_profiling(u32 node)
        if (unlikely(ret)) {
                printk(KERN_WARNING "%s: rtas returned: %d\n",
-                       __FUNCTION__, ret);
+                       __func__, ret);
                return -EIO;
        }
@@ -949,7 +949,7 @@ static int cell_global_start_spu(struct op_counter_config *ctr)
                if (unlikely(ret != 0)) {
                        printk(KERN_ERR
                               "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",
-                               __FUNCTION__, ret);
+                               __func__, ret);
                        rtas_error = -EIO;
                        goto out;
                }
@@ -1061,7 +1061,7 @@ static void cell_global_stop_spu(void)
                if (unlikely(rtn_value != 0)) {
                        printk(KERN_ERR
                               "%s: rtas call ibm,cbe-spu-perftools failed, return = %d\n",
-                               __FUNCTION__, rtn_value);
+                               __func__, rtn_value);
                }
                /* Deactivate the signals */
diff --git a/arch/powerpc/platforms/40x/ep405.c b/arch/powerpc/platforms/40x/ep405.c
index 13d1345026da..ae2e7f67c18e 100644
--- a/arch/powerpc/platforms/40x/ep405.c
+++ b/arch/powerpc/platforms/40x/ep405.c
@@ -29,6 +29,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
 static struct device_node *bcsr_node;
 static void __iomem *bcsr_regs;
@@ -119,5 +120,6 @@ define_machine(ep405) {
        .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/40x/kilauea.c b/arch/powerpc/platforms/40x/kilauea.c
index f9206a7fede0..1dd24ffc0dc1 100644
--- a/arch/powerpc/platforms/40x/kilauea.c
+++ b/arch/powerpc/platforms/40x/kilauea.c
@@ -1,7 +1,7 @@
 /*
 * Kilauea board specific routines
 *
- * Copyright 2007 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ * Copyright 2007-2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
 *
 * Based on the Walnut code by
 * Josh Boyer <jwboyer@linux.vnet.ibm.com>
@@ -20,6 +20,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
 static __initdata struct of_device_id kilauea_of_bus[] = {
        { .compatible = "ibm,plb4", },
@@ -54,5 +55,6 @@ define_machine(kilauea) {
        .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/40x/makalu.c b/arch/powerpc/platforms/40x/makalu.c
index 4e4df72fc9cd..a6a1d6017b71 100644
--- a/arch/powerpc/platforms/40x/makalu.c
+++ b/arch/powerpc/platforms/40x/makalu.c
@@ -20,6 +20,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
 static __initdata struct of_device_id makalu_of_bus[] = {
        { .compatible = "ibm,plb4", },
@@ -54,5 +55,6 @@ define_machine(makalu) {
        .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/40x/virtex.c b/arch/powerpc/platforms/40x/virtex.c
index 0422590040db..fc7fb001276c 100644
--- a/arch/powerpc/platforms/40x/virtex.c
+++ b/arch/powerpc/platforms/40x/virtex.c
@@ -14,6 +14,7 @@
 #include <asm/prom.h>
 #include <asm/time.h>
 #include <asm/xilinx_intc.h>
+#include <asm/ppc4xx.h>
 static struct of_device_id xilinx_of_bus_ids[] __initdata = {
        { .compatible = "xlnx,plb-v46-1.00.a", },
@@ -48,5 +49,6 @@ define_machine(virtex) {
        .probe                  = virtex_probe,
        .init_IRQ               = xilinx_intc_init_tree,
        .get_irq                = xilinx_intc_get_irq,
+        .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
 };
diff --git a/arch/powerpc/platforms/40x/walnut.c b/arch/powerpc/platforms/40x/walnut.c
index b8b257efeb77..335df91fbee5 100644
--- a/arch/powerpc/platforms/40x/walnut.c
+++ b/arch/powerpc/platforms/40x/walnut.c
@@ -26,6 +26,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
 static __initdata struct of_device_id walnut_of_bus[] = {
        { .compatible = "ibm,plb3", },
@@ -61,5 +62,6 @@ define_machine(walnut) {
        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
-        .calibrate_decr = generic_calibrate_decr,
+        .restart                = ppc4xx_reset_system,
+        .calibrate_decr         = generic_calibrate_decr,
 };
diff --git a/arch/powerpc/platforms/44x/44x.h b/arch/powerpc/platforms/44x/44x.h
index 42eabf87fea3..dbc4d2b4301a 100644
--- a/arch/powerpc/platforms/44x/44x.h
+++ b/arch/powerpc/platforms/44x/44x.h
@@ -3,6 +3,5 @@
 extern u8 as1_readb(volatile u8 __iomem  *addr);
 extern void as1_writeb(u8 data, volatile u8 __iomem *addr);
-extern void ppc44x_reset_system(char *cmd);
 #endif /* __POWERPC_PLATFORMS_44X_44X_H */
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 1bfb2191010a..6abe91357eee 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -67,6 +67,25 @@ config WARP
          See http://www.pikatechnologies.com/ and follow the "PIKA for Computer
          Telephony Developers" link for more information.
+config CANYONLANDS
+        bool "Canyonlands"
+        depends on 44x
+        default n
+        select 460EX
+        select PCI
+        select PPC4xx_PCI_EXPRESS
+        help
+          This option enables support for the AMCC PPC460EX evaluation board.
+config YOSEMITE
+        bool "Yosemite"
+        depends on 44x
+        default n
+        select 440EP
+        select PCI
+        help
+          This option enables support for the AMCC PPC440EP evaluation board.
 #config LUAN
 #       bool "Luan"
 #       depends on 44x
@@ -122,6 +141,14 @@ config 440SPe
        bool
        select IBM_NEW_EMAC_EMAC4
+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
 config IBM440EP_ERR42
        bool
diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index 0864d4f1cbc2..2320ae5dc8a7 100644
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -2,8 +2,10 @@ obj-$(CONFIG_44x)	:= misc_44x.o
 obj-$(CONFIG_EBONY)     += ebony.o
 obj-$(CONFIG_TAISHAN)   += taishan.o
 obj-$(CONFIG_BAMBOO)    += bamboo.o
+obj-$(CONFIG_YOSEMITE)  += bamboo.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
diff --git a/arch/powerpc/platforms/44x/bamboo.c b/arch/powerpc/platforms/44x/bamboo.c
index fb9a22a7e8d0..cef169e95156 100644
--- a/arch/powerpc/platforms/44x/bamboo.c
+++ b/arch/powerpc/platforms/44x/bamboo.c
@@ -22,8 +22,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
-#include "44x.h"
 static __initdata struct of_device_id bamboo_of_bus[] = {
        { .compatible = "ibm,plb4", },
@@ -53,11 +52,11 @@ static int __init bamboo_probe(void)
 }
 define_machine(bamboo) {
-        .name                           = "Bamboo",
+        .name                   = "Bamboo",
-        .probe                          = bamboo_probe,
+        .probe                  = bamboo_probe,
-        .progress                       = udbg_progress,
+        .progress               = udbg_progress,
-        .init_IRQ                       = uic_init_tree,
+        .init_IRQ               = uic_init_tree,
-        .get_irq                        = uic_get_irq,
+        .get_irq                = uic_get_irq,
-        .restart                        = ppc44x_reset_system,
+        .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
new file mode 100644
index 000000000000..3949289f51df
--- /dev/null
+++ b/arch/powerpc/platforms/44x/canyonlands.c
@@ -0,0 +1,63 @@
+/*
+ * 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/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index 1a8d467bff85..a0e8fe4662f6 100644
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -26,8 +26,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
-#include "44x.h"
 static __initdata struct of_device_id ebony_of_bus[] = {
        { .compatible = "ibm,plb4", },
@@ -66,6 +65,6 @@ define_machine(ebony) {
        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
-        .restart                = ppc44x_reset_system,
+        .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
index 11134121f272..44f4b3a00ced 100644
--- a/arch/powerpc/platforms/44x/katmai.c
+++ b/arch/powerpc/platforms/44x/katmai.c
@@ -22,8 +22,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
-#include "44x.h"
 static __initdata struct of_device_id katmai_of_bus[] = {
        { .compatible = "ibm,plb4", },
@@ -58,6 +57,6 @@ define_machine(katmai) {
        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,
-        .restart                        = ppc44x_reset_system,
+        .restart                        = ppc4xx_reset_system,
        .calibrate_decr                 = generic_calibrate_decr,
 };
diff --git a/arch/powerpc/platforms/44x/misc_44x.S b/arch/powerpc/platforms/44x/misc_44x.S
index 3bce71d5d756..dc12b8009e48 100644
--- a/arch/powerpc/platforms/44x/misc_44x.S
+++ b/arch/powerpc/platforms/44x/misc_44x.S
@@ -44,14 +44,3 @@ _GLOBAL(as1_writeb)
        sync
        isync
        blr
-/*
- * void ppc44x_reset_system(char *cmd)
- *
- * At present, this routine just applies a system reset.
- */
-_GLOBAL(ppc44x_reset_system)
-        mfspr   r13,SPRN_DBCR0
-        oris    r13,r13,DBCR0_RST_SYSTEM@h
-        mtspr   SPRN_DBCR0,r13
-        b       .                       /* Just in case the reset doesn't work */
diff --git a/arch/powerpc/platforms/44x/rainier.c b/arch/powerpc/platforms/44x/rainier.c
index a7fae1cf69c1..4f1ff84c4b63 100644
--- a/arch/powerpc/platforms/44x/rainier.c
+++ b/arch/powerpc/platforms/44x/rainier.c
@@ -22,7 +22,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
-#include "44x.h"
+#include <asm/ppc4xx.h>
 static __initdata struct of_device_id rainier_of_bus[] = {
        { .compatible = "ibm,plb4", },
@@ -57,6 +57,6 @@ define_machine(rainier) {
        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,
-        .restart                        = ppc44x_reset_system,
+        .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
index d279db42c896..49eb73daacdf 100644
--- a/arch/powerpc/platforms/44x/sequoia.c
+++ b/arch/powerpc/platforms/44x/sequoia.c
@@ -23,7 +23,7 @@
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
-#include "44x.h"
+#include <asm/ppc4xx.h>
 static __initdata struct of_device_id sequoia_of_bus[] = {
        { .compatible = "ibm,plb4", },
@@ -58,6 +58,6 @@ define_machine(sequoia) {
        .progress                       = udbg_progress,
        .init_IRQ                       = uic_init_tree,
        .get_irq                        = uic_get_irq,
-        .restart                        = ppc44x_reset_system,
+        .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
index 28ab7e2e02c3..49c78b2098b4 100644
--- a/arch/powerpc/platforms/44x/taishan.c
+++ b/arch/powerpc/platforms/44x/taishan.c
@@ -29,8 +29,7 @@
 #include <asm/time.h>
 #include <asm/uic.h>
 #include <asm/pci-bridge.h>
+#include <asm/ppc4xx.h>
-#include "44x.h"
 static __initdata struct of_device_id taishan_of_bus[] = {
        { .compatible = "ibm,plb4", },
@@ -68,6 +67,6 @@ define_machine(taishan) {
        .progress               = udbg_progress,
        .init_IRQ               = uic_init_tree,
        .get_irq                = uic_get_irq,
-        .restart                = ppc44x_reset_system,
+        .restart                = ppc4xx_reset_system,
        .calibrate_decr         = generic_calibrate_decr,
 };
diff --git a/arch/powerpc/platforms/44x/warp-nand.c b/arch/powerpc/platforms/44x/warp-nand.c
index 84ab78ff8c03..9150318cfc56 100644
--- a/arch/powerpc/platforms/44x/warp-nand.c
+++ b/arch/powerpc/platforms/44x/warp-nand.c
@@ -11,6 +11,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/nand.h>
 #include <linux/mtd/ndfc.h>
+#include <asm/machdep.h>
 #ifdef CONFIG_MTD_NAND_NDFC
@@ -100,6 +101,6 @@ static int warp_setup_nand_flash(void)
        return 0;
 }
-device_initcall(warp_setup_nand_flash);
+machine_device_initcall(warp, warp_setup_nand_flash);
 #endif
diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index da5b7b7599db..39cf6150a72b 100644
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -18,9 +18,7 @@
 #include <asm/udbg.h>
 #include <asm/time.h>
 #include <asm/uic.h>
+#include <asm/ppc4xx.h>
-#include "44x.h"
 static __initdata struct of_device_id warp_of_bus[] = {
        { .compatible = "ibm,plb4", },
@@ -49,7 +47,7 @@ define_machine(warp) {
        .progress       = udbg_progress,
        .init_IRQ       = uic_init_tree,
        .get_irq        = uic_get_irq,
-        .restart        = ppc44x_reset_system,
+        .restart        = ppc4xx_reset_system,
        .calibrate_decr = generic_calibrate_decr,
 };
diff --git a/arch/powerpc/platforms/52xx/lite5200.c b/arch/powerpc/platforms/52xx/lite5200.c
index 956f459e175c..6d584f4e3c9a 100644
--- a/arch/powerpc/platforms/52xx/lite5200.c
+++ b/arch/powerpc/platforms/52xx/lite5200.c
@@ -63,7 +63,7 @@ lite5200_fix_clock_config(void)
        of_node_put(np);
        if (!cdm) {
                printk(KERN_ERR "%s() failed; expect abnormal behaviour\n",
-                       __FUNCTION__);
+                       __func__);
                return;
        }
@@ -98,7 +98,7 @@ lite5200_fix_port_config(void)
        of_node_put(np);
        if (!gpio) {
                printk(KERN_ERR "%s() failed. expect abnormal behavior\n",
-                       __FUNCTION__);
+                       __func__);
                return;
        }
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 7e76ddbd5821..28bc6e58a970 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -46,6 +46,13 @@ config MPC85xx_DS
        help
          This option enables support for the MPC85xx DS (MPC8544 DS) board
+config KSI8560
+        bool "Emerson KSI8560"
+        select PPC_CPM_NEW_BINDING
+        select DEFAULT_UIMAGE
+        help
+          This option enables support for the Emerson KSI8560 board
 config STX_GP3
        bool "Silicon Turnkey Express GP3"
        help
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index cb7af4ebd75f..6cea185f62b2 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -10,3 +10,4 @@ obj-$(CONFIG_STX_GP3)	  += stx_gp3.o
 obj-$(CONFIG_TQM85xx)     += tqm85xx.o
 obj-$(CONFIG_SBC8560)     += sbc8560.o
 obj-$(CONFIG_SBC8548)     += sbc8548.o
+obj-$(CONFIG_KSI8560)     += ksi8560.o
diff --git a/arch/powerpc/platforms/85xx/ksi8560.c b/arch/powerpc/platforms/85xx/ksi8560.c
new file mode 100644
index 000000000000..2145adeb220c
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/ksi8560.c
@@ -0,0 +1,257 @@
+/*
+ * Board setup routines for the Emerson KSI8560
+ *
+ * Author: Alexandr Smirnov <asmirnov@ru.mvista.com>
+ *
+ * Based on mpc85xx_ads.c maintained by Kumar Gala
+ *
+ * 2008 (c) MontaVista, Software, Inc.  This file is licensed under
+ * the terms of the GNU General Public License version 2.  This program
+ * is licensed "as is" without any warranty of any kind, whether express
+ * or implied.
+ *
+ */
+#include <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/mpic.h>
+#include <mm/mmu_decl.h>
+#include <asm/udbg.h>
+#include <asm/prom.h>
+#include <sysdev/fsl_soc.h>
+#include <sysdev/fsl_pci.h>
+#include <asm/cpm2.h>
+#include <sysdev/cpm2_pic.h>
+#define KSI8560_CPLD_HVR                0x04 /* Hardware Version Register */
+#define KSI8560_CPLD_PVR                0x08 /* PLD Version Register */
+#define KSI8560_CPLD_RCR1               0x30 /* Reset Command Register 1 */
+#define KSI8560_CPLD_RCR1_CPUHR         0x80 /* CPU Hard Reset */
+static void __iomem *cpld_base = NULL;
+static void machine_restart(char *cmd)
+{
+        if (cpld_base)
+                out_8(cpld_base + KSI8560_CPLD_RCR1, KSI8560_CPLD_RCR1_CPUHR);
+        else
+                printk(KERN_ERR "Can't find CPLD base, hang forever\n");
+        for (;;);
+}
+static void cpm2_cascade(unsigned int irq, struct irq_desc *desc)
+{
+        int cascade_irq;
+        while ((cascade_irq = cpm2_get_irq()) >= 0)
+                generic_handle_irq(cascade_irq);
+        desc->chip->eoi(irq);
+}
+static void __init ksi8560_pic_init(void)
+{
+        struct mpic *mpic;
+        struct resource r;
+        struct device_node *np;
+#ifdef CONFIG_CPM2
+        int irq;
+#endif
+        np = of_find_node_by_type(NULL, "open-pic");
+        if (np == NULL) {
+                printk(KERN_ERR "Could not find open-pic node\n");
+                return;
+        }
+        if (of_address_to_resource(np, 0, &r)) {
+                printk(KERN_ERR "Could not map mpic register space\n");
+                of_node_put(np);
+                return;
+        }
+        mpic = mpic_alloc(np, r.start,
+                        MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
+                        0, 256, " OpenPIC  ");
+        BUG_ON(mpic == NULL);
+        of_node_put(np);
+        mpic_init(mpic);
+#ifdef CONFIG_CPM2
+        /* Setup CPM2 PIC */
+        np = of_find_compatible_node(NULL, NULL, "fsl,cpm2-pic");
+        if (np == NULL) {
+                printk(KERN_ERR "PIC init: can not find fsl,cpm2-pic node\n");
+                return;
+        }
+        irq = irq_of_parse_and_map(np, 0);
+        cpm2_pic_init(np);
+        of_node_put(np);
+        set_irq_chained_handler(irq, cpm2_cascade);
+        setup_irq(0, NULL);
+#endif
+}
+#ifdef CONFIG_CPM2
+/*
+ * Setup I/O ports
+ */
+struct cpm_pin {
+        int port, pin, flags;
+};
+static struct cpm_pin __initdata ksi8560_pins[] = {
+        /* SCC1 */
+        {3, 29, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {3, 30, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        /* SCC2 */
+        {3, 26, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {3, 27, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {3, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        /* FCC1 */
+        {0, 14, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {0, 15, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {0, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {0, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+        {0, 18, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {0, 19, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {0, 20, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {0, 21, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
+        {0, 26, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
+        {0, 27, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
+        {0, 28, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {0, 29, CPM_PIN_OUTPUT | CPM_PIN_SECONDARY},
+        {0, 30, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
+        {0, 31, CPM_PIN_INPUT | CPM_PIN_SECONDARY},
+        {2, 23, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK9 */
+        {2, 22, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK10 */
+};
+static void __init init_ioports(void)
+{
+        int i;
+        for (i = 0; i < ARRAY_SIZE(ksi8560_pins); i++) {
+                struct cpm_pin *pin = &ksi8560_pins[i];
+                cpm2_set_pin(pin->port, pin->pin, pin->flags);
+        }
+        cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_SCC1, CPM_BRG1, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_SCC2, CPM_BRG2, CPM_CLK_TX);
+        cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK9, CPM_CLK_RX);
+        cpm2_clk_setup(CPM_CLK_FCC1, CPM_CLK10, CPM_CLK_TX);
+}
+#endif
+/*
+ * Setup the architecture
+ */
+static void __init ksi8560_setup_arch(void)
+{
+        struct device_node *cpld;
+        cpld = of_find_compatible_node(NULL, NULL, "emerson,KSI8560-cpld");
+        if (cpld)
+                cpld_base = of_iomap(cpld, 0);
+        else
+                printk(KERN_ERR "Can't find CPLD in device tree\n");
+        if (ppc_md.progress)
+                ppc_md.progress("ksi8560_setup_arch()", 0);
+#ifdef CONFIG_CPM2
+        cpm2_reset();
+        init_ioports();
+#endif
+}
+static void ksi8560_show_cpuinfo(struct seq_file *m)
+{
+        uint pvid, svid, phid1;
+        uint memsize = total_memory;
+        pvid = mfspr(SPRN_PVR);
+        svid = mfspr(SPRN_SVR);
+        seq_printf(m, "Vendor\t\t: Emerson Network Power\n");
+        seq_printf(m, "Board\t\t: KSI8560\n");
+        if (cpld_base) {
+                seq_printf(m, "Hardware rev\t: %d\n",
+                                        in_8(cpld_base + KSI8560_CPLD_HVR));
+                seq_printf(m, "CPLD rev\t: %d\n",
+                                        in_8(cpld_base + KSI8560_CPLD_PVR));
+        } else
+                seq_printf(m, "Unknown Hardware and CPLD revs\n");
+        seq_printf(m, "PVR\t\t: 0x%x\n", pvid);
+        seq_printf(m, "SVR\t\t: 0x%x\n", svid);
+        /* Display cpu Pll setting */
+        phid1 = mfspr(SPRN_HID1);
+        seq_printf(m, "PLL setting\t: 0x%x\n", ((phid1 >> 24) & 0x3f));
+        /* Display the amount of memory */
+        seq_printf(m, "Memory\t\t: %d MB\n", memsize / (1024 * 1024));
+}
+static struct of_device_id __initdata of_bus_ids[] = {
+        { .type = "soc", },
+        { .name = "cpm", },
+        { .name = "localbus", },
+        {},
+};
+static int __init declare_of_platform_devices(void)
+{
+        of_platform_bus_probe(NULL, of_bus_ids, NULL);
+        return 0;
+}
+machine_device_initcall(ksi8560, declare_of_platform_devices);
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init ksi8560_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+        return of_flat_dt_is_compatible(root, "emerson,KSI8560");
+}
+define_machine(ksi8560) {
+        .name                   = "KSI8560",
+        .probe                  = ksi8560_probe,
+        .setup_arch             = ksi8560_setup_arch,
+        .init_IRQ               = ksi8560_pic_init,
+        .show_cpuinfo           = ksi8560_show_cpuinfo,
+        .get_irq                = mpic_get_irq,
+        .restart                = machine_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+};
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ds.c b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
index bdb3d0b38cd2..2865d019afc3 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_ds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ds.c
@@ -36,7 +36,7 @@
 #undef DEBUG
 #ifdef DEBUG
-#define DBG(fmt, args...) printk(KERN_ERR "%s: " fmt, __FUNCTION__, ## args)
+#define DBG(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)
 #else
 #define DBG(fmt, args...)
 #endif
diff --git a/arch/powerpc/platforms/8xx/m8xx_setup.c b/arch/powerpc/platforms/8xx/m8xx_setup.c
index 184f998d1be2..0d9f75c74f8c 100644
--- a/arch/powerpc/platforms/8xx/m8xx_setup.c
+++ b/arch/powerpc/platforms/8xx/m8xx_setup.c
@@ -111,17 +111,12 @@ void __init mpc8xx_calibrate_decr(void)
        /* Processor frequency is MHz.
         */
-        ppc_tb_freq = 50000000;
-        if (!get_freq("bus-frequency", &ppc_tb_freq)) {
-                printk(KERN_ERR "WARNING: Estimating decrementer frequency "
-                                "(not found)\n");
-        }
-        ppc_tb_freq /= 16;
        ppc_proc_freq = 50000000;
        if (!get_freq("clock-frequency", &ppc_proc_freq))
                printk(KERN_ERR "WARNING: Estimating processor frequency "
                                "(not found)\n");
+        ppc_tb_freq = ppc_proc_freq / 16;
        printk("Decrementer Frequency = 0x%lx\n", ppc_tb_freq);
        /* Perform some more timer/timebase initialization.  This used
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 0c3face0ddbb..5fc7fac10e93 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -41,11 +41,13 @@ config 40x
        bool "AMCC 40x"
        select PPC_DCR_NATIVE
        select PPC_UDBG_16550
+        select 4xx_SOC
 config 44x
        bool "AMCC 44x"
        select PPC_DCR_NATIVE
        select PPC_UDBG_16550
+        select 4xx_SOC
 config E200
        bool "Freescale e200"
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index d75ccded7f10..45646b2b4af4 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -28,13 +28,13 @@
 #include <linux/notifier.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/lmb.h>
 #include <asm/prom.h>
 #include <asm/iommu.h>
 #include <asm/machdep.h>
 #include <asm/pci-bridge.h>
 #include <asm/udbg.h>
-#include <asm/lmb.h>
 #include <asm/firmware.h>
 #include <asm/cell-regs.h>
@@ -316,7 +316,7 @@ static void cell_iommu_setup_stab(struct cbe_iommu *iommu,
        segments = max(dbase + dsize, fbase + fsize) >> IO_SEGMENT_SHIFT;
        pr_debug("%s: iommu[%d]: segments: %lu\n",
-                        __FUNCTION__, iommu->nid, segments);
+                        __func__, iommu->nid, segments);
        /* set up the segment table */
        stab_size = segments * sizeof(unsigned long);
@@ -343,7 +343,7 @@ static unsigned long *cell_iommu_alloc_ptab(struct cbe_iommu *iommu,
                                (1 << 12) / sizeof(unsigned long));
        ptab_size = segments * pages_per_segment * sizeof(unsigned long);
-        pr_debug("%s: iommu[%d]: ptab_size: %lu, order: %d\n", __FUNCTION__,
+        pr_debug("%s: iommu[%d]: ptab_size: %lu, order: %d\n", __func__,
                        iommu->nid, ptab_size, get_order(ptab_size));
        page = alloc_pages_node(iommu->nid, GFP_KERNEL, get_order(ptab_size));
        BUG_ON(!page);
@@ -355,7 +355,7 @@ static unsigned long *cell_iommu_alloc_ptab(struct cbe_iommu *iommu,
        n_pte_pages = (pages_per_segment * sizeof(unsigned long)) >> 12;
        pr_debug("%s: iommu[%d]: stab at %p, ptab at %p, n_pte_pages: %lu\n",
-                        __FUNCTION__, iommu->nid, iommu->stab, ptab,
+                        __func__, iommu->nid, iommu->stab, ptab,
                        n_pte_pages);
        /* initialise the STEs */
@@ -394,7 +394,7 @@ static void cell_iommu_enable_hardware(struct cbe_iommu *iommu)
        if (cell_iommu_find_ioc(iommu->nid, &xlate_base))
                panic("%s: missing IOC register mappings for node %d\n",
-                      __FUNCTION__, iommu->nid);
+                      __func__, iommu->nid);
        iommu->xlate_regs = ioremap(xlate_base, IOC_Reg_Size);
        iommu->cmd_regs = iommu->xlate_regs + IOC_IOCmd_Offset;
diff --git a/arch/powerpc/platforms/cell/pervasive.c b/arch/powerpc/platforms/cell/pervasive.c
index 0304589c0a80..8a3631ce912b 100644
--- a/arch/powerpc/platforms/cell/pervasive.c
+++ b/arch/powerpc/platforms/cell/pervasive.c
@@ -65,7 +65,7 @@ static void cbe_power_save(void)
                break;
        default:
                printk(KERN_WARNING "%s: unknown configuration\n",
-                        __FUNCTION__);
+                        __func__);
                break;
        }
        mtspr(SPRN_TSC_CELL, thread_switch_control);
diff --git a/arch/powerpc/platforms/cell/ras.c b/arch/powerpc/platforms/cell/ras.c
index e43024c0392e..655704ad03cf 100644
--- a/arch/powerpc/platforms/cell/ras.c
+++ b/arch/powerpc/platforms/cell/ras.c
@@ -132,7 +132,7 @@ static int __init cbe_ptcal_enable_on_node(int nid, int order)
                                (unsigned int)(addr >> 32),
                                (unsigned int)(addr & 0xffffffff))) {
                printk(KERN_ERR "%s: error enabling PTCAL on node %d!\n",
-                                __FUNCTION__, nid);
+                                __func__, nid);
                goto out_free_pages;
        }
@@ -162,7 +162,7 @@ static int __init cbe_ptcal_enable(void)
        if (!size)
                return -ENODEV;
-        pr_debug("%s: enabling PTCAL, size = 0x%x\n", __FUNCTION__, *size);
+        pr_debug("%s: enabling PTCAL, size = 0x%x\n", __func__, *size);
        order = get_order(*size);
        of_node_put(np);
@@ -180,7 +180,7 @@ static int __init cbe_ptcal_enable(void)
                const u32 *nid = of_get_property(np, "node-id", NULL);
                if (!nid) {
                        printk(KERN_ERR "%s: node %s is missing node-id?\n",
-                                        __FUNCTION__, np->full_name);
+                                        __func__, np->full_name);
                        continue;
                }
                cbe_ptcal_enable_on_node(*nid, order);
@@ -195,13 +195,13 @@ static int cbe_ptcal_disable(void)
        struct ptcal_area *area, *tmp;
        int ret = 0;
-        pr_debug("%s: disabling PTCAL\n", __FUNCTION__);
+        pr_debug("%s: disabling PTCAL\n", __func__);
        list_for_each_entry_safe(area, tmp, &ptcal_list, list) {
                /* disable ptcal on this node */
                if (rtas_call(ptcal_stop_tok, 1, 1, NULL, area->nid)) {
                        printk(KERN_ERR "%s: error disabling PTCAL "
-                                        "on node %d!\n", __FUNCTION__,
+                                        "on node %d!\n", __func__,
                                        area->nid);
                        ret = -EIO;
                        continue;
diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index 712001f6b7da..6bab44b7716b 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -165,7 +165,7 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
        struct spu_slb slb;
        int psize;
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
        slb.esid = (ea & ESID_MASK) | SLB_ESID_V;
@@ -215,7 +215,7 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
 extern int hash_page(unsigned long ea, unsigned long access, unsigned long trap); //XXX
 static int __spu_trap_data_map(struct spu *spu, unsigned long ea, u64 dsisr)
 {
-        pr_debug("%s, %lx, %lx\n", __FUNCTION__, dsisr, ea);
+        pr_debug("%s, %lx, %lx\n", __func__, dsisr, ea);
        /* Handle kernel space hash faults immediately.
           User hash faults need to be deferred to process context. */
@@ -351,7 +351,7 @@ spu_irq_class_1(int irq, void *data)
                __spu_trap_data_seg(spu, dar);
        spin_unlock(&spu->register_lock);
-        pr_debug("%s: %lx %lx %lx %lx\n", __FUNCTION__, mask, stat,
+        pr_debug("%s: %lx %lx %lx %lx\n", __func__, mask, stat,
                        dar, dsisr);
        if (stat & CLASS1_STORAGE_FAULT_INTR)
@@ -726,7 +726,7 @@ static int __init init_spu_base(void)
        if (ret < 0) {
                printk(KERN_WARNING "%s: Error initializing spus\n",
-                        __FUNCTION__);
+                        __func__);
                goto out_unregister_sysdev_class;
        }
diff --git a/arch/powerpc/platforms/cell/spu_callbacks.c b/arch/powerpc/platforms/cell/spu_callbacks.c
index dceb8b6a9382..19f6bfdbb933 100644
--- a/arch/powerpc/platforms/cell/spu_callbacks.c
+++ b/arch/powerpc/platforms/cell/spu_callbacks.c
@@ -54,7 +54,7 @@ long spu_sys_callback(struct spu_syscall_block *s)
        long (*syscall)(u64 a1, u64 a2, u64 a3, u64 a4, u64 a5, u64 a6);
        if (s->nr_ret >= ARRAY_SIZE(spu_syscall_table)) {
-                pr_debug("%s: invalid syscall #%ld", __FUNCTION__, s->nr_ret);
+                pr_debug("%s: invalid syscall #%ld", __func__, s->nr_ret);
                return -ENOSYS;
        }
diff --git a/arch/powerpc/platforms/cell/spu_manage.c b/arch/powerpc/platforms/cell/spu_manage.c
index d351bdebf5f1..4c506c1463cd 100644
--- a/arch/powerpc/platforms/cell/spu_manage.c
+++ b/arch/powerpc/platforms/cell/spu_manage.c
@@ -92,7 +92,7 @@ static int __init spu_map_interrupts_old(struct spu *spu,
        tmp = of_get_property(np->parent->parent, "node-id", NULL);
        if (!tmp) {
-                printk(KERN_WARNING "%s: can't find node-id\n", __FUNCTION__);
+                printk(KERN_WARNING "%s: can't find node-id\n", __func__);
                nid = spu->node;
        } else
                nid = tmp[0];
@@ -296,7 +296,7 @@ static int __init of_enumerate_spus(int (*fn)(void *data))
                ret = fn(node);
                if (ret) {
                        printk(KERN_WARNING "%s: Error initializing %s\n",
-                                __FUNCTION__, node->name);
+                                __func__, node->name);
                        break;
                }
                n++;
@@ -327,7 +327,7 @@ static int __init of_create_spu(struct spu *spu, void *data)
                if (!legacy_map) {
                        legacy_map = 1;
                        printk(KERN_WARNING "%s: Legacy device tree found, "
-                                "trying to map old style\n", __FUNCTION__);
+                                "trying to map old style\n", __func__);
                }
                ret = spu_map_device_old(spu);
                if (ret) {
@@ -342,7 +342,7 @@ static int __init of_create_spu(struct spu *spu, void *data)
                if (!legacy_irq) {
                        legacy_irq = 1;
                        printk(KERN_WARNING "%s: Legacy device tree found, "
-                                "trying old style irq\n", __FUNCTION__);
+                                "trying old style irq\n", __func__);
                }
                ret = spu_map_interrupts_old(spu, spe);
                if (ret) {
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index f7a7e8635fb6..f14d3a0a8615 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -1556,7 +1556,7 @@ void spufs_mfc_callback(struct spu *spu)
        wake_up_all(&ctx->mfc_wq);
-        pr_debug("%s %s\n", __FUNCTION__, spu->name);
+        pr_debug("%s %s\n", __func__, spu->name);
        if (ctx->mfc_fasync) {
                u32 free_elements, tagstatus;
                unsigned int mask;
@@ -1790,7 +1790,7 @@ static unsigned int spufs_mfc_poll(struct file *file,poll_table *wait)
        if (tagstatus & ctx->tagwait)
                mask |= POLLIN | POLLRDNORM;
-        pr_debug("%s: free %d tagstatus %d tagwait %d\n", __FUNCTION__,
+        pr_debug("%s: free %d tagstatus %d tagwait %d\n", __func__,
                free_elements, tagstatus, ctx->tagwait);
        return mask;
diff --git a/arch/powerpc/platforms/cell/spufs/run.c b/arch/powerpc/platforms/cell/spufs/run.c
index cac69e116776..5986d08115af 100644
--- a/arch/powerpc/platforms/cell/spufs/run.c
+++ b/arch/powerpc/platforms/cell/spufs/run.c
@@ -98,7 +98,7 @@ static int spu_setup_isolated(struct spu_context *ctx)
                        != MFC_CNTL_PURGE_DMA_COMPLETE) {
                if (time_after(jiffies, timeout)) {
                        printk(KERN_ERR "%s: timeout flushing MFC DMA queue\n",
-                                        __FUNCTION__);
+                                        __func__);
                        ret = -EIO;
                        goto out;
                }
@@ -124,7 +124,7 @@ static int spu_setup_isolated(struct spu_context *ctx)
                                status_loading) {
                if (time_after(jiffies, timeout)) {
                        printk(KERN_ERR "%s: timeout waiting for loader\n",
-                                        __FUNCTION__);
+                                        __func__);
                        ret = -EIO;
                        goto out_drop_priv;
                }
@@ -134,7 +134,7 @@ static int spu_setup_isolated(struct spu_context *ctx)
        if (!(status & SPU_STATUS_RUNNING)) {
                /* If isolated LOAD has failed: run SPU, we will get a stop-and
                 * signal later. */
-                pr_debug("%s: isolated LOAD failed\n", __FUNCTION__);
+                pr_debug("%s: isolated LOAD failed\n", __func__);
                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_RUNNABLE);
                ret = -EACCES;
                goto out_drop_priv;
@@ -142,7 +142,7 @@ static int spu_setup_isolated(struct spu_context *ctx)
        if (!(status & SPU_STATUS_ISOLATED_STATE)) {
                /* This isn't allowed by the CBEA, but check anyway */
-                pr_debug("%s: SPU fell out of isolated mode?\n", __FUNCTION__);
+                pr_debug("%s: SPU fell out of isolated mode?\n", __func__);
                ctx->ops->runcntl_write(ctx, SPU_RUNCNTL_STOP);
                ret = -EINVAL;
                goto out_drop_priv;
@@ -282,7 +282,7 @@ static int spu_handle_restartsys(struct spu_context *ctx, long *spu_ret,
                break;
        default:
                printk(KERN_WARNING "%s: unexpected return code %ld\n",
-                        __FUNCTION__, *spu_ret);
+                        __func__, *spu_ret);
                ret = 0;
        }
        return ret;
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
index d4f8bf581e3a..84e2d78b9a62 100644
--- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
+++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c
@@ -117,11 +117,11 @@ static void __init mpc7448_hpc2_init_IRQ(void)
        }
        if (mpic_paddr == 0) {
-                printk("%s: No tsi108 PIC found !\n", __FUNCTION__);
+                printk("%s: No tsi108 PIC found !\n", __func__);
                return;
        }
-        DBG("%s: tsi108 pic phys_addr = 0x%x\n", __FUNCTION__,
+        DBG("%s: tsi108 pic phys_addr = 0x%x\n", __func__,
            (u32) mpic_paddr);
        mpic = mpic_alloc(tsi_pic, mpic_paddr,
@@ -140,17 +140,17 @@ static void __init mpc7448_hpc2_init_IRQ(void)
 #ifdef CONFIG_PCI
        tsi_pci = of_find_node_by_type(NULL, "pci");
        if (tsi_pci == NULL) {
-                printk("%s: No tsi108 pci node found !\n", __FUNCTION__);
+                printk("%s: No tsi108 pci node found !\n", __func__);
                return;
        }
        cascade_node = of_find_node_by_type(NULL, "pic-router");
        if (cascade_node == NULL) {
-                printk("%s: No tsi108 pci cascade node found !\n", __FUNCTION__);
+                printk("%s: No tsi108 pci cascade node found !\n", __func__);
                return;
        }
        cascade_pci_irq = irq_of_parse_and_map(tsi_pci, 0);
-        DBG("%s: tsi108 cascade_pci_irq = 0x%x\n", __FUNCTION__,
+        DBG("%s: tsi108 cascade_pci_irq = 0x%x\n", __func__,
            (u32) cascade_pci_irq);
        tsi108_pci_int_init(cascade_node);
        set_irq_data(cascade_pci_irq, mpic);
diff --git a/arch/powerpc/platforms/iseries/pci.c b/arch/powerpc/platforms/iseries/pci.c
index cc562e4c2f32..02a634faedbe 100644
--- a/arch/powerpc/platforms/iseries/pci.c
+++ b/arch/powerpc/platforms/iseries/pci.c
@@ -23,6 +23,7 @@
 #undef DEBUG
+#include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/list.h>
 #include <linux/string.h>
@@ -586,7 +587,7 @@ static inline struct device_node *xlate_iomm_address(
                static unsigned long last_jiffies;
                static int num_printed;
-                if ((jiffies - last_jiffies) > 60 * HZ) {
+                if (time_after(jiffies, last_jiffies + 60 * HZ)) {
                        last_jiffies = jiffies;
                        num_printed = 0;
                }
diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index 3ffa0ac170ee..301855263b81 100644
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -592,50 +592,3 @@ int maple_pci_get_legacy_ide_irq(struct pci_dev *pdev, int channel)
        }
        return irq;
 }
-/* XXX: To remove once all firmwares are ok */
-static void fixup_maple_ide(struct pci_dev* dev)
-{
-        if (!machine_is(maple))
-                return;
-#if 0 /* Enable this to enable IDE port 0 */
-        {
-                u8 v;
-                pci_read_config_byte(dev, 0x40, &v);
-                v |= 2;
-                pci_write_config_byte(dev, 0x40, v);
-        }
-#endif
-#if 0 /* fix bus master base */
-        pci_write_config_dword(dev, 0x20, 0xcc01);
-        printk("old ide resource: %lx -> %lx \n",
-               dev->resource[4].start, dev->resource[4].end);
-        dev->resource[4].start = 0xcc00;
-        dev->resource[4].end = 0xcc10;
-#endif
-#if 0 /* Enable this to fixup IDE sense/polarity of irqs in IO-APICs */
-        {
-                struct pci_dev *apicdev;
-                u32 v;
-                apicdev = pci_get_slot (dev->bus, PCI_DEVFN(5,0));
-                if (apicdev == NULL)
-                        printk("IDE Fixup IRQ: Can't find IO-APIC !\n");
-                else {
-                        pci_write_config_byte(apicdev, 0xf2, 0x10 + 2*14);
-                        pci_read_config_dword(apicdev, 0xf4, &v);
-                        v &= ~0x00000022;
-                        pci_write_config_dword(apicdev, 0xf4, v);
-                        pci_write_config_byte(apicdev, 0xf2, 0x10 + 2*15);
-                        pci_read_config_dword(apicdev, 0xf4, &v);
-                        v &= ~0x00000022;
-                        pci_write_config_dword(apicdev, 0xf4, v);
-                        pci_dev_put(apicdev);
-                }
-        }
-#endif
-}
-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8111_IDE,
-                         fixup_maple_ide);
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index 3ce2d73b4177..364714757cf1 100644
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -43,6 +43,7 @@
 #include <linux/smp.h>
 #include <linux/bitops.h>
 #include <linux/of_device.h>
+#include <linux/lmb.h>
 #include <asm/processor.h>
 #include <asm/sections.h>
@@ -57,7 +58,6 @@
 #include <asm/dma.h>
 #include <asm/cputable.h>
 #include <asm/time.h>
-#include <asm/lmb.h>
 #include <asm/mpic.h>
 #include <asm/rtas.h>
 #include <asm/udbg.h>
@@ -319,7 +319,7 @@ static int __init maple_probe(void)
        return 1;
 }
-define_machine(maple_md) {
+define_machine(maple) {
        .name                   = "Maple",
        .probe                  = maple_probe,
        .setup_arch             = maple_setup_arch,
diff --git a/arch/powerpc/platforms/pasemi/dma_lib.c b/arch/powerpc/platforms/pasemi/dma_lib.c
index c529d8dff395..217af321b0ca 100644
--- a/arch/powerpc/platforms/pasemi/dma_lib.c
+++ b/arch/powerpc/platforms/pasemi/dma_lib.c
@@ -17,6 +17,7 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
+#include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/pci.h>
@@ -26,6 +27,8 @@
 #define MAX_TXCH 64
 #define MAX_RXCH 64
+#define MAX_FLAGS 64
+#define MAX_FUN 8
 static struct pasdma_status *dma_status;
@@ -43,6 +46,8 @@ static struct pci_dev *dma_pdev;
 static DECLARE_BITMAP(txch_free, MAX_TXCH);
 static DECLARE_BITMAP(rxch_free, MAX_RXCH);
+static DECLARE_BITMAP(flags_free, MAX_FLAGS);
+static DECLARE_BITMAP(fun_free, MAX_FUN);
 /* pasemi_read_iob_reg - read IOB register
 * @reg: Register to read (offset into PCI CFG space)
@@ -373,6 +378,106 @@ void pasemi_dma_free_buf(struct pasemi_dmachan *chan, int size,
 }
 EXPORT_SYMBOL(pasemi_dma_free_buf);
+/* pasemi_dma_alloc_flag - Allocate a flag (event) for channel syncronization
+ *
+ * Allocates a flag for use with channel syncronization (event descriptors).
+ * Returns allocated flag (0-63), < 0 on error.
+ */
+int pasemi_dma_alloc_flag(void)
+{
+        int bit;
+retry:
+        bit = find_next_bit(flags_free, MAX_FLAGS, 0);
+        if (bit >= MAX_FLAGS)
+                return -ENOSPC;
+        if (!test_and_clear_bit(bit, flags_free))
+                goto retry;
+        return bit;
+}
+EXPORT_SYMBOL(pasemi_dma_alloc_flag);
+/* pasemi_dma_free_flag - Deallocates a flag (event)
+ * @flag: Flag number to deallocate
+ *
+ * Frees up a flag so it can be reused for other purposes.
+ */
+void pasemi_dma_free_flag(int flag)
+{
+        BUG_ON(test_bit(flag, flags_free));
+        BUG_ON(flag >= MAX_FLAGS);
+        set_bit(flag, flags_free);
+}
+EXPORT_SYMBOL(pasemi_dma_free_flag);
+/* pasemi_dma_set_flag - Sets a flag (event) to 1
+ * @flag: Flag number to set active
+ *
+ * Sets the flag provided to 1.
+ */
+void pasemi_dma_set_flag(int flag)
+{
+        BUG_ON(flag >= MAX_FLAGS);
+        if (flag < 32)
+                pasemi_write_dma_reg(PAS_DMA_TXF_SFLG0, 1 << flag);
+        else
+                pasemi_write_dma_reg(PAS_DMA_TXF_SFLG1, 1 << flag);
+}
+EXPORT_SYMBOL(pasemi_dma_set_flag);
+/* pasemi_dma_clear_flag - Sets a flag (event) to 0
+ * @flag: Flag number to set inactive
+ *
+ * Sets the flag provided to 0.
+ */
+void pasemi_dma_clear_flag(int flag)
+{
+        BUG_ON(flag >= MAX_FLAGS);
+        if (flag < 32)
+                pasemi_write_dma_reg(PAS_DMA_TXF_CFLG0, 1 << flag);
+        else
+                pasemi_write_dma_reg(PAS_DMA_TXF_CFLG1, 1 << flag);
+}
+EXPORT_SYMBOL(pasemi_dma_clear_flag);
+/* pasemi_dma_alloc_fun - Allocate a function engine
+ *
+ * Allocates a function engine to use for crypto/checksum offload
+ * Returns allocated engine (0-8), < 0 on error.
+ */
+int pasemi_dma_alloc_fun(void)
+{
+        int bit;
+retry:
+        bit = find_next_bit(fun_free, MAX_FLAGS, 0);
+        if (bit >= MAX_FLAGS)
+                return -ENOSPC;
+        if (!test_and_clear_bit(bit, fun_free))
+                goto retry;
+        return bit;
+}
+EXPORT_SYMBOL(pasemi_dma_alloc_fun);
+/* pasemi_dma_free_fun - Deallocates a function engine
+ * @flag: Engine number to deallocate
+ *
+ * Frees up a function engine so it can be used for other purposes.
+ */
+void pasemi_dma_free_fun(int fun)
+{
+        BUG_ON(test_bit(fun, fun_free));
+        BUG_ON(fun >= MAX_FLAGS);
+        set_bit(fun, fun_free);
+}
+EXPORT_SYMBOL(pasemi_dma_free_fun);
 static void *map_onedev(struct pci_dev *p, int index)
 {
        struct device_node *dn;
@@ -410,6 +515,7 @@ int pasemi_dma_init(void)
        struct resource res;
        struct device_node *dn;
        int i, intf, err = 0;
+        unsigned long timeout;
        u32 tmp;
        if (!machine_is(pasemi))
@@ -478,6 +584,44 @@ int pasemi_dma_init(void)
        for (i = 0; i < MAX_RXCH; i++)
                __set_bit(i, rxch_free);
+        timeout = jiffies + HZ;
+        pasemi_write_dma_reg(PAS_DMA_COM_RXCMD, 0);
+        while (pasemi_read_dma_reg(PAS_DMA_COM_RXSTA) & 1) {
+                if (time_after(jiffies, timeout)) {
+                        pr_warning("Warning: Could not disable RX section\n");
+                        break;
+                }
+        }
+        timeout = jiffies + HZ;
+        pasemi_write_dma_reg(PAS_DMA_COM_TXCMD, 0);
+        while (pasemi_read_dma_reg(PAS_DMA_COM_TXSTA) & 1) {
+                if (time_after(jiffies, timeout)) {
+                        pr_warning("Warning: Could not disable TX section\n");
+                        break;
+                }
+        }
+        /* setup resource allocations for the different DMA sections */
+        tmp = pasemi_read_dma_reg(PAS_DMA_COM_CFG);
+        pasemi_write_dma_reg(PAS_DMA_COM_CFG, tmp | 0x18000000);
+        /* enable tx section */
+        pasemi_write_dma_reg(PAS_DMA_COM_TXCMD, PAS_DMA_COM_TXCMD_EN);
+        /* enable rx section */
+        pasemi_write_dma_reg(PAS_DMA_COM_RXCMD, PAS_DMA_COM_RXCMD_EN);
+        for (i = 0; i < MAX_FLAGS; i++)
+                __set_bit(i, flags_free);
+        for (i = 0; i < MAX_FUN; i++)
+                __set_bit(i, fun_free);
+        /* clear all status flags */
+        pasemi_write_dma_reg(PAS_DMA_TXF_CFLG0, 0xffffffff);
+        pasemi_write_dma_reg(PAS_DMA_TXF_CFLG1, 0xffffffff);
        printk(KERN_INFO "PA Semi PWRficient DMA library initialized "
                "(%d tx, %d rx channels)\n", num_txch, num_rxch);
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 36ff1b6b7fac..59404baf911f 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -53,6 +53,7 @@
 #include <linux/suspend.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+#include <linux/lmb.h>
 #include <asm/reg.h>
 #include <asm/sections.h>
@@ -74,7 +75,6 @@
 #include <asm/iommu.h>
 #include <asm/smu.h>
 #include <asm/pmc.h>
-#include <asm/lmb.h>
 #include <asm/udbg.h>
 #include "pmac.h"
diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
index 9d251d0ca8c6..3866debfa3c4 100644
--- a/arch/powerpc/platforms/ps3/device-init.c
+++ b/arch/powerpc/platforms/ps3/device-init.c
@@ -499,41 +499,14 @@ static int __init ps3_register_graphics_devices(void)
 }
 /**
- * ps3_register_repository_device - Register a device from the repositiory info.
+ * ps3_setup_dynamic_device - Setup a dynamic device from the repository
- *
 */
-static int ps3_register_repository_device(
+static int ps3_setup_dynamic_device(const struct ps3_repository_device *repo)
-        const struct ps3_repository_device *repo)
 {
        int result;
        switch (repo->dev_type) {
-        case PS3_DEV_TYPE_SB_GELIC:
-                result = ps3_setup_gelic_device(repo);
-                if (result) {
-                        pr_debug("%s:%d ps3_setup_gelic_device failed\n",
-                                __func__, __LINE__);
-                }
-                break;
-        case PS3_DEV_TYPE_SB_USB:
-                /* Each USB device has both an EHCI and an OHCI HC */
-                result = ps3_setup_ehci_device(repo);
-                if (result) {
-                        pr_debug("%s:%d ps3_setup_ehci_device failed\n",
-                                __func__, __LINE__);
-                }
-                result = ps3_setup_ohci_device(repo);
-                if (result) {
-                        pr_debug("%s:%d ps3_setup_ohci_device failed\n",
-                                __func__, __LINE__);
-                }
-                break;
        case PS3_DEV_TYPE_STOR_DISK:
                result = ps3_setup_storage_dev(repo, PS3_MATCH_ID_STOR_DISK);
@@ -572,6 +545,48 @@ static int ps3_register_repository_device(
        return result;
 }
+/**
+ * ps3_setup_static_device - Setup a static device from the repository
+ */
+static int __init ps3_setup_static_device(const struct ps3_repository_device *repo)
+{
+        int result;
+        switch (repo->dev_type) {
+        case PS3_DEV_TYPE_SB_GELIC:
+                result = ps3_setup_gelic_device(repo);
+                if (result) {
+                        pr_debug("%s:%d ps3_setup_gelic_device failed\n",
+                                __func__, __LINE__);
+                }
+                break;
+        case PS3_DEV_TYPE_SB_USB:
+                /* Each USB device has both an EHCI and an OHCI HC */
+                result = ps3_setup_ehci_device(repo);
+                if (result) {
+                        pr_debug("%s:%d ps3_setup_ehci_device failed\n",
+                                __func__, __LINE__);
+                }
+                result = ps3_setup_ohci_device(repo);
+                if (result) {
+                        pr_debug("%s:%d ps3_setup_ohci_device failed\n",
+                                __func__, __LINE__);
+                }
+                break;
+        default:
+                return ps3_setup_dynamic_device(repo);
+        }
+        return result;
+}
 static void ps3_find_and_add_device(u64 bus_id, u64 dev_id)
 {
        struct ps3_repository_device repo;
@@ -601,7 +616,7 @@ found:
                pr_debug("%s:%u: device %lu:%lu found after %u retries\n",
                         __func__, __LINE__, bus_id, dev_id, retries);
-        ps3_register_repository_device(&repo);
+        ps3_setup_dynamic_device(&repo);
        return;
 }
@@ -905,8 +920,7 @@ static int __init ps3_register_devices(void)
        ps3_register_graphics_devices();
-        ps3_repository_find_devices(PS3_BUS_TYPE_SB,
+        ps3_repository_find_devices(PS3_BUS_TYPE_SB, ps3_setup_static_device);
-                ps3_register_repository_device);
        ps3_register_sound_devices();
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c
index 7382f195c4f8..1cf901fa9031 100644
--- a/arch/powerpc/platforms/ps3/htab.c
+++ b/arch/powerpc/platforms/ps3/htab.c
@@ -19,9 +19,10 @@
 */
 #include <linux/kernel.h>
+#include <linux/lmb.h>
 #include <asm/machdep.h>
-#include <asm/lmb.h>
+#include <asm/prom.h>
 #include <asm/udbg.h>
 #include <asm/lv1call.h>
 #include <asm/ps3fb.h>
diff --git a/arch/powerpc/platforms/ps3/interrupt.c b/arch/powerpc/platforms/ps3/interrupt.c
index 3a6db04aa940..a14e5cdc2fed 100644
--- a/arch/powerpc/platforms/ps3/interrupt.c
+++ b/arch/powerpc/platforms/ps3/interrupt.c
@@ -709,7 +709,7 @@ static unsigned int ps3_get_irq(void)
        asm volatile("cntlzd %0,%1" : "=r" (plug) : "r" (x));
        plug &= 0x3f;
-        if (unlikely(plug) == NO_IRQ) {
+        if (unlikely(plug == NO_IRQ)) {
                pr_debug("%s:%d: no plug found: thread_id %lu\n", __func__,
                        __LINE__, pd->thread_id);
                dump_bmp(&per_cpu(ps3_private, 0));
diff --git a/arch/powerpc/platforms/ps3/mm.c b/arch/powerpc/platforms/ps3/mm.c
index 68900476c842..5b3fb2b321ab 100644
--- a/arch/powerpc/platforms/ps3/mm.c
+++ b/arch/powerpc/platforms/ps3/mm.c
@@ -21,9 +21,10 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/memory_hotplug.h>
+#include <linux/lmb.h>
 #include <asm/firmware.h>
-#include <asm/lmb.h>
+#include <asm/prom.h>
 #include <asm/udbg.h>
 #include <asm/lv1call.h>
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index b9ea09d9d2fb..c73379ec9141 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -24,8 +24,9 @@
 #include <linux/fs.h>
 #include <linux/syscalls.h>
 #include <linux/ctype.h>
+#include <linux/lmb.h>
-#include <asm/lmb.h>
+#include <asm/prom.h>
 #include "platform.h"
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
index 5c2cbb08eb52..a413abbd4123 100644
--- a/arch/powerpc/platforms/ps3/setup.c
+++ b/arch/powerpc/platforms/ps3/setup.c
@@ -95,6 +95,14 @@ static void ps3_power_off(void)
        ps3_sys_manager_power_off(); /* never returns */
 }
+static void ps3_halt(void)
+{
+        DBG("%s:%d\n", __func__, __LINE__);
+        smp_send_stop();
+        ps3_sys_manager_halt(); /* never returns */
+}
 static void ps3_panic(char *str)
 {
        DBG("%s:%d %s\n", __func__, __LINE__, str);
@@ -105,7 +113,8 @@ static void ps3_panic(char *str)
        printk("   Please press POWER button.\n");
        printk("\n");
-        while(1);
+        while(1)
+                lv1_pause(1);
 }
 #if defined(CONFIG_FB_PS3) || defined(CONFIG_FB_PS3_MODULE) || \
@@ -117,7 +126,7 @@ static void __init prealloc(struct ps3_prealloc *p)
        p->address = __alloc_bootmem(p->size, p->align, __pa(MAX_DMA_ADDRESS));
        if (!p->address) {
-                printk(KERN_ERR "%s: Cannot allocate %s\n", __FUNCTION__,
+                printk(KERN_ERR "%s: Cannot allocate %s\n", __func__,
                       p->name);
                return;
        }
@@ -266,6 +275,7 @@ define_machine(ps3) {
        .progress                       = ps3_progress,
        .restart                        = ps3_restart,
        .power_off                      = ps3_power_off,
+        .halt                           = ps3_halt,
 #if defined(CONFIG_KEXEC)
        .kexec_cpu_down                 = ps3_kexec_cpu_down,
        .machine_kexec                  = default_machine_kexec,
diff --git a/arch/powerpc/platforms/ps3/spu.c b/arch/powerpc/platforms/ps3/spu.c
index 5ad41189b494..d135cef9ed6a 100644
--- a/arch/powerpc/platforms/ps3/spu.c
+++ b/arch/powerpc/platforms/ps3/spu.c
@@ -27,6 +27,7 @@
 #include <asm/spu.h>
 #include <asm/spu_priv1.h>
 #include <asm/lv1call.h>
+#include <asm/ps3.h>
 #include "../cell/spufs/spufs.h"
 #include "platform.h"
@@ -140,6 +141,12 @@ static void _dump_areas(unsigned int spe_id, unsigned long priv2,
        pr_debug("%s:%d: shadow:  %lxh\n", func, line, shadow);
 }
+inline u64 ps3_get_spe_id(void *arg)
+{
+        return spu_pdata(arg)->spe_id;
+}
+EXPORT_SYMBOL_GPL(ps3_get_spe_id);
 static unsigned long get_vas_id(void)
 {
        unsigned long id;
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index 992ba6753cf2..bdae04bb7a01 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -18,3 +18,4 @@ obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug-cpu.o
 obj-$(CONFIG_HVC_CONSOLE)       += hvconsole.o
 obj-$(CONFIG_HVCS)              += hvcserver.o
 obj-$(CONFIG_HCALL_STATS)       += hvCall_inst.o
+obj-$(CONFIG_PHYP_DUMP) += phyp_dump.o
diff --git a/arch/powerpc/platforms/pseries/eeh.c b/arch/powerpc/platforms/pseries/eeh.c
index 9eb539ee5f9a..550b2f7d2cc1 100644
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
@@ -945,7 +945,6 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
        unsigned int rets[3];
        struct eeh_early_enable_info *info = data;
        int ret;
-        const char *status = of_get_property(dn, "status", NULL);
        const u32 *class_code = of_get_property(dn, "class-code", NULL);
        const u32 *vendor_id = of_get_property(dn, "vendor-id", NULL);
        const u32 *device_id = of_get_property(dn, "device-id", NULL);
@@ -959,8 +958,8 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
        pdn->eeh_freeze_count = 0;
        pdn->eeh_false_positives = 0;
-        if (status && strncmp(status, "ok", 2) != 0)
+        if (!of_device_is_available(dn))
-                return NULL;    /* ignore devices with bad status */
+                return NULL;
        /* Ignore bad nodes. */
        if (!class_code || !vendor_id || !device_id)
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 9a455d46379d..233d9be25f49 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -520,6 +520,20 @@ static void pSeries_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
        BUG_ON(lpar_rc != H_SUCCESS);
 }
+static void pSeries_lpar_hpte_removebolted(unsigned long ea,
+                                           int psize, int ssize)
+{
+        unsigned long slot, vsid, va;
+        vsid = get_kernel_vsid(ea, ssize);
+        va = hpt_va(ea, vsid, ssize);
+        slot = pSeries_lpar_hpte_find(va, psize, ssize);
+        BUG_ON(slot == -1);
+        pSeries_lpar_hpte_invalidate(slot, va, psize, ssize, 0);
+}
 /* Flag bits for H_BULK_REMOVE */
 #define HBR_REQUEST     0x4000000000000000UL
 #define HBR_RESPONSE    0x8000000000000000UL
@@ -597,6 +611,7 @@ void __init hpte_init_lpar(void)
        ppc_md.hpte_updateboltedpp = pSeries_lpar_hpte_updateboltedpp;
        ppc_md.hpte_insert      = pSeries_lpar_hpte_insert;
        ppc_md.hpte_remove      = pSeries_lpar_hpte_remove;
+        ppc_md.hpte_removebolted = pSeries_lpar_hpte_removebolted;
        ppc_md.flush_hash_range = pSeries_lpar_flush_hash_range;
        ppc_md.hpte_clear_all   = pSeries_lpar_hptab_clear;
 }
diff --git a/arch/powerpc/platforms/pseries/pci_dlpar.c b/arch/powerpc/platforms/pseries/pci_dlpar.c
index 5a5a19e40bb4..0d7229cde0e9 100644
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -123,7 +123,7 @@ pcibios_pci_config_bridge(struct pci_dev *dev)
        /* Add to children of PCI bridge dev->bus */
        child_bus = pci_add_new_bus(dev->bus, dev, sec_busno);
        if (!child_bus) {
-                printk (KERN_ERR "%s: could not add second bus\n", __FUNCTION__);
+                printk (KERN_ERR "%s: could not add second bus\n", __func__);
                return -EIO;
        }
        sprintf(child_bus->name, "PCI Bus #%02x", child_bus->number);
diff --git a/arch/powerpc/platforms/pseries/phyp_dump.c b/arch/powerpc/platforms/pseries/phyp_dump.c
new file mode 100644
index 000000000000..7ddd10526cea
--- /dev/null
+++ b/arch/powerpc/platforms/pseries/phyp_dump.c
@@ -0,0 +1,498 @@
+/*
+ * Hypervisor-assisted dump
+ *
+ * Linas Vepstas, Manish Ahuja 2008
+ * Copyright 2008 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 <linux/init.h>
+#include <linux/kobject.h>
+#include <linux/mm.h>
+#include <linux/of.h>
+#include <linux/pfn.h>
+#include <linux/swap.h>
+#include <linux/sysfs.h>
+#include <asm/page.h>
+#include <asm/phyp_dump.h>
+#include <asm/machdep.h>
+#include <asm/prom.h>
+#include <asm/rtas.h>
+/* Variables, used to communicate data between early boot and late boot */
+static struct phyp_dump phyp_dump_vars;
+struct phyp_dump *phyp_dump_info = &phyp_dump_vars;
+static int ibm_configure_kernel_dump;
+/* ------------------------------------------------- */
+/* RTAS interfaces to declare the dump regions */
+struct dump_section {
+        u32 dump_flags;
+        u16 source_type;
+        u16 error_flags;
+        u64 source_address;
+        u64 source_length;
+        u64 length_copied;
+        u64 destination_address;
+};
+struct phyp_dump_header {
+        u32 version;
+        u16 num_of_sections;
+        u16 status;
+        u32 first_offset_section;
+        u32 dump_disk_section;
+        u64 block_num_dd;
+        u64 num_of_blocks_dd;
+        u32 offset_dd;
+        u32 maxtime_to_auto;
+        /* No dump disk path string used */
+        struct dump_section cpu_data;
+        struct dump_section hpte_data;
+        struct dump_section kernel_data;
+};
+/* The dump header *must be* in low memory, so .bss it */
+static struct phyp_dump_header phdr;
+#define NUM_DUMP_SECTIONS       3
+#define DUMP_HEADER_VERSION     0x1
+#define DUMP_REQUEST_FLAG       0x1
+#define DUMP_SOURCE_CPU         0x0001
+#define DUMP_SOURCE_HPTE        0x0002
+#define DUMP_SOURCE_RMO         0x0011
+#define DUMP_ERROR_FLAG         0x2000
+#define DUMP_TRIGGERED          0x4000
+#define DUMP_PERFORMED          0x8000
+/**
+ * init_dump_header() - initialize the header declaring a dump
+ * Returns: length of dump save area.
+ *
+ * When the hypervisor saves crashed state, it needs to put
+ * it somewhere. The dump header tells the hypervisor where
+ * the data can be saved.
+ */
+static unsigned long init_dump_header(struct phyp_dump_header *ph)
+{
+        unsigned long addr_offset = 0;
+        /* Set up the dump header */
+        ph->version = DUMP_HEADER_VERSION;
+        ph->num_of_sections = NUM_DUMP_SECTIONS;
+        ph->status = 0;
+        ph->first_offset_section =
+                (u32)offsetof(struct phyp_dump_header, cpu_data);
+        ph->dump_disk_section = 0;
+        ph->block_num_dd = 0;
+        ph->num_of_blocks_dd = 0;
+        ph->offset_dd = 0;
+        ph->maxtime_to_auto = 0; /* disabled */
+        /* The first two sections are mandatory */
+        ph->cpu_data.dump_flags = DUMP_REQUEST_FLAG;
+        ph->cpu_data.source_type = DUMP_SOURCE_CPU;
+        ph->cpu_data.source_address = 0;
+        ph->cpu_data.source_length = phyp_dump_info->cpu_state_size;
+        ph->cpu_data.destination_address = addr_offset;
+        addr_offset += phyp_dump_info->cpu_state_size;
+        ph->hpte_data.dump_flags = DUMP_REQUEST_FLAG;
+        ph->hpte_data.source_type = DUMP_SOURCE_HPTE;
+        ph->hpte_data.source_address = 0;
+        ph->hpte_data.source_length = phyp_dump_info->hpte_region_size;
+        ph->hpte_data.destination_address = addr_offset;
+        addr_offset += phyp_dump_info->hpte_region_size;
+        /* This section describes the low kernel region */
+        ph->kernel_data.dump_flags = DUMP_REQUEST_FLAG;
+        ph->kernel_data.source_type = DUMP_SOURCE_RMO;
+        ph->kernel_data.source_address = PHYP_DUMP_RMR_START;
+        ph->kernel_data.source_length = PHYP_DUMP_RMR_END;
+        ph->kernel_data.destination_address = addr_offset;
+        addr_offset += ph->kernel_data.source_length;
+        return addr_offset;
+}
+static void print_dump_header(const struct phyp_dump_header *ph)
+{
+#ifdef DEBUG
+        printk(KERN_INFO "dump header:\n");
+        /* setup some ph->sections required */
+        printk(KERN_INFO "version = %d\n", ph->version);
+        printk(KERN_INFO "Sections = %d\n", ph->num_of_sections);
+        printk(KERN_INFO "Status = 0x%x\n", ph->status);
+        /* No ph->disk, so all should be set to 0 */
+        printk(KERN_INFO "Offset to first section 0x%x\n",
+                ph->first_offset_section);
+        printk(KERN_INFO "dump disk sections should be zero\n");
+        printk(KERN_INFO "dump disk section = %d\n", ph->dump_disk_section);
+        printk(KERN_INFO "block num = %ld\n", ph->block_num_dd);
+        printk(KERN_INFO "number of blocks = %ld\n", ph->num_of_blocks_dd);
+        printk(KERN_INFO "dump disk offset = %d\n", ph->offset_dd);
+        printk(KERN_INFO "Max auto time= %d\n", ph->maxtime_to_auto);
+        /*set cpu state and hpte states as well scratch pad area */
+        printk(KERN_INFO " CPU AREA \n");
+        printk(KERN_INFO "cpu dump_flags =%d\n", ph->cpu_data.dump_flags);
+        printk(KERN_INFO "cpu source_type =%d\n", ph->cpu_data.source_type);
+        printk(KERN_INFO "cpu error_flags =%d\n", ph->cpu_data.error_flags);
+        printk(KERN_INFO "cpu source_address =%lx\n",
+                ph->cpu_data.source_address);
+        printk(KERN_INFO "cpu source_length =%lx\n",
+                ph->cpu_data.source_length);
+        printk(KERN_INFO "cpu length_copied =%lx\n",
+                ph->cpu_data.length_copied);
+        printk(KERN_INFO " HPTE AREA \n");
+        printk(KERN_INFO "HPTE dump_flags =%d\n", ph->hpte_data.dump_flags);
+        printk(KERN_INFO "HPTE source_type =%d\n", ph->hpte_data.source_type);
+        printk(KERN_INFO "HPTE error_flags =%d\n", ph->hpte_data.error_flags);
+        printk(KERN_INFO "HPTE source_address =%lx\n",
+                ph->hpte_data.source_address);
+        printk(KERN_INFO "HPTE source_length =%lx\n",
+                ph->hpte_data.source_length);
+        printk(KERN_INFO "HPTE length_copied =%lx\n",
+                ph->hpte_data.length_copied);
+        printk(KERN_INFO " SRSD AREA \n");
+        printk(KERN_INFO "SRSD dump_flags =%d\n", ph->kernel_data.dump_flags);
+        printk(KERN_INFO "SRSD source_type =%d\n", ph->kernel_data.source_type);
+        printk(KERN_INFO "SRSD error_flags =%d\n", ph->kernel_data.error_flags);
+        printk(KERN_INFO "SRSD source_address =%lx\n",
+                ph->kernel_data.source_address);
+        printk(KERN_INFO "SRSD source_length =%lx\n",
+                ph->kernel_data.source_length);
+        printk(KERN_INFO "SRSD length_copied =%lx\n",
+                ph->kernel_data.length_copied);
+#endif
+}
+static ssize_t show_phyp_dump_active(struct kobject *kobj,
+                        struct kobj_attribute *attr, char *buf)
+{
+        /* create filesystem entry so kdump is phyp-dump aware */
+        return sprintf(buf, "%lx\n", phyp_dump_info->phyp_dump_at_boot);
+}
+static struct kobj_attribute pdl = __ATTR(phyp_dump_active, 0600,
+                                        show_phyp_dump_active,
+                                        NULL);
+static void register_dump_area(struct phyp_dump_header *ph, unsigned long addr)
+{
+        int rc;
+        /* Add addr value if not initialized before */
+        if (ph->cpu_data.destination_address == 0) {
+                ph->cpu_data.destination_address += addr;
+                ph->hpte_data.destination_address += addr;
+                ph->kernel_data.destination_address += addr;
+        }
+        /* ToDo Invalidate kdump and free memory range. */
+        do {
+                rc = rtas_call(ibm_configure_kernel_dump, 3, 1, NULL,
+                                1, ph, sizeof(struct phyp_dump_header));
+        } while (rtas_busy_delay(rc));
+        if (rc) {
+                printk(KERN_ERR "phyp-dump: unexpected error (%d) on "
+                                                "register\n", rc);
+                print_dump_header(ph);
+                return;
+        }
+        rc = sysfs_create_file(kernel_kobj, &pdl.attr);
+        if (rc)
+                printk(KERN_ERR "phyp-dump: unable to create sysfs"
+                                " file (%d)\n", rc);
+}
+static
+void invalidate_last_dump(struct phyp_dump_header *ph, unsigned long addr)
+{
+        int rc;
+        /* Add addr value if not initialized before */
+        if (ph->cpu_data.destination_address == 0) {
+                ph->cpu_data.destination_address += addr;
+                ph->hpte_data.destination_address += addr;
+                ph->kernel_data.destination_address += addr;
+        }
+        do {
+                rc = rtas_call(ibm_configure_kernel_dump, 3, 1, NULL,
+                                2, ph, sizeof(struct phyp_dump_header));
+        } while (rtas_busy_delay(rc));
+        if (rc) {
+                printk(KERN_ERR "phyp-dump: unexpected error (%d) "
+                                                "on invalidate\n", rc);
+                print_dump_header(ph);
+        }
+}
+/* ------------------------------------------------- */
+/**
+ * release_memory_range -- release memory previously lmb_reserved
+ * @start_pfn: starting physical frame number
+ * @nr_pages: number of pages to free.
+ *
+ * This routine will release memory that had been previously
+ * lmb_reserved in early boot. The released memory becomes
+ * available for genreal use.
+ */
+static void release_memory_range(unsigned long start_pfn,
+                        unsigned long nr_pages)
+{
+        struct page *rpage;
+        unsigned long end_pfn;
+        long i;
+        end_pfn = start_pfn + nr_pages;
+        for (i = start_pfn; i <= end_pfn; i++) {
+                rpage = pfn_to_page(i);
+                if (PageReserved(rpage)) {
+                        ClearPageReserved(rpage);
+                        init_page_count(rpage);
+                        __free_page(rpage);
+                        totalram_pages++;
+                }
+        }
+}
+/**
+ * track_freed_range -- Counts the range being freed.
+ * Once the counter goes to zero, it re-registers dump for
+ * future use.
+ */
+static void
+track_freed_range(unsigned long addr, unsigned long length)
+{
+        static unsigned long scratch_area_size, reserved_area_size;
+        if (addr < phyp_dump_info->init_reserve_start)
+                return;
+        if ((addr >= phyp_dump_info->init_reserve_start) &&
+            (addr <= phyp_dump_info->init_reserve_start +
+             phyp_dump_info->init_reserve_size))
+                reserved_area_size += length;
+        if ((addr >= phyp_dump_info->reserved_scratch_addr) &&
+            (addr <= phyp_dump_info->reserved_scratch_addr +
+             phyp_dump_info->reserved_scratch_size))
+                scratch_area_size += length;
+        if ((reserved_area_size == phyp_dump_info->init_reserve_size) &&
+            (scratch_area_size == phyp_dump_info->reserved_scratch_size)) {
+                invalidate_last_dump(&phdr,
+                                phyp_dump_info->reserved_scratch_addr);
+                register_dump_area(&phdr,
+                                phyp_dump_info->reserved_scratch_addr);
+        }
+}
+/* ------------------------------------------------- */
+/**
+ * sysfs_release_region -- sysfs interface to release memory range.
+ *
+ * Usage:
+ *   "echo <start addr> <length> > /sys/kernel/release_region"
+ *
+ * Example:
+ *   "echo 0x40000000 0x10000000 > /sys/kernel/release_region"
+ *
+ * will release 256MB starting at 1GB.
+ */
+static ssize_t store_release_region(struct kobject *kobj,
+                                struct kobj_attribute *attr,
+                                const char *buf, size_t count)
+{
+        unsigned long start_addr, length, end_addr;
+        unsigned long start_pfn, nr_pages;
+        ssize_t ret;
+        ret = sscanf(buf, "%lx %lx", &start_addr, &length);
+        if (ret != 2)
+                return -EINVAL;
+        track_freed_range(start_addr, length);
+        /* Range-check - don't free any reserved memory that
+         * wasn't reserved for phyp-dump */
+        if (start_addr < phyp_dump_info->init_reserve_start)
+                start_addr = phyp_dump_info->init_reserve_start;
+        end_addr = phyp_dump_info->init_reserve_start +
+                        phyp_dump_info->init_reserve_size;
+        if (start_addr+length > end_addr)
+                length = end_addr - start_addr;
+        /* Release the region of memory assed in by user */
+        start_pfn = PFN_DOWN(start_addr);
+        nr_pages = PFN_DOWN(length);
+        release_memory_range(start_pfn, nr_pages);
+        return count;
+}
+static ssize_t show_release_region(struct kobject *kobj,
+                        struct kobj_attribute *attr, char *buf)
+{
+        u64 second_addr_range;
+        /* total reserved size - start of scratch area */
+        second_addr_range = phyp_dump_info->init_reserve_size -
+                                phyp_dump_info->reserved_scratch_size;
+        return sprintf(buf, "CPU:0x%lx-0x%lx: HPTE:0x%lx-0x%lx:"
+                            " DUMP:0x%lx-0x%lx, 0x%lx-0x%lx:\n",
+                phdr.cpu_data.destination_address,
+                phdr.cpu_data.length_copied,
+                phdr.hpte_data.destination_address,
+                phdr.hpte_data.length_copied,
+                phdr.kernel_data.destination_address,
+                phdr.kernel_data.length_copied,
+                phyp_dump_info->init_reserve_start,
+                second_addr_range);
+}
+static struct kobj_attribute rr = __ATTR(release_region, 0600,
+                                        show_release_region,
+                                        store_release_region);
+static int __init phyp_dump_setup(void)
+{
+        struct device_node *rtas;
+        const struct phyp_dump_header *dump_header = NULL;
+        unsigned long dump_area_start;
+        unsigned long dump_area_length;
+        int header_len = 0;
+        int rc;
+        /* If no memory was reserved in early boot, there is nothing to do */
+        if (phyp_dump_info->init_reserve_size == 0)
+                return 0;
+        /* Return if phyp dump not supported */
+        if (!phyp_dump_info->phyp_dump_configured)
+                return -ENOSYS;
+        /* Is there dump data waiting for us? If there isn't,
+         * then register a new dump area, and release all of
+         * the rest of the reserved ram.
+         *
+         * The /rtas/ibm,kernel-dump rtas node is present only
+         * if there is dump data waiting for us.
+         */
+        rtas = of_find_node_by_path("/rtas");
+        if (rtas) {
+                dump_header = of_get_property(rtas, "ibm,kernel-dump",
+                                                &header_len);
+                of_node_put(rtas);
+        }
+        print_dump_header(dump_header);
+        dump_area_length = init_dump_header(&phdr);
+        /* align down */
+        dump_area_start = phyp_dump_info->init_reserve_start & PAGE_MASK;
+        if (dump_header == NULL) {
+                register_dump_area(&phdr, dump_area_start);
+                return 0;
+        }
+        /* re-register the dump area, if old dump was invalid */
+        if ((dump_header) && (dump_header->status & DUMP_ERROR_FLAG)) {
+                invalidate_last_dump(&phdr, dump_area_start);
+                register_dump_area(&phdr, dump_area_start);
+                return 0;
+        }
+        if (dump_header) {
+                phyp_dump_info->reserved_scratch_addr =
+                                dump_header->cpu_data.destination_address;
+                phyp_dump_info->reserved_scratch_size =
+                                dump_header->cpu_data.source_length +
+                                dump_header->hpte_data.source_length +
+                                dump_header->kernel_data.source_length;
+        }
+        /* Should we create a dump_subsys, analogous to s390/ipl.c ? */
+        rc = sysfs_create_file(kernel_kobj, &rr.attr);
+        if (rc)
+                printk(KERN_ERR "phyp-dump: unable to create sysfs file (%d)\n",
+                                                                        rc);
+        /* ToDo: re-register the dump area, for next time. */
+        return 0;
+}
+machine_subsys_initcall(pseries, phyp_dump_setup);
+int __init early_init_dt_scan_phyp_dump(unsigned long node,
+                const char *uname, int depth, void *data)
+{
+        const unsigned int *sizes;
+        phyp_dump_info->phyp_dump_configured = 0;
+        phyp_dump_info->phyp_dump_is_active = 0;
+        if (depth != 1 || strcmp(uname, "rtas") != 0)
+                return 0;
+        if (of_get_flat_dt_prop(node, "ibm,configure-kernel-dump", NULL))
+                phyp_dump_info->phyp_dump_configured++;
+        if (of_get_flat_dt_prop(node, "ibm,dump-kernel", NULL))
+                phyp_dump_info->phyp_dump_is_active++;
+        sizes = of_get_flat_dt_prop(node, "ibm,configure-kernel-dump-sizes",
+                                    NULL);
+        if (!sizes)
+                return 0;
+        if (sizes[0] == 1)
+                phyp_dump_info->cpu_state_size = *((unsigned long *)&sizes[1]);
+        if (sizes[3] == 2)
+                phyp_dump_info->hpte_region_size =
+                                                *((unsigned long *)&sizes[4]);
+        return 1;
+}
+/* Look for phyp_dump= cmdline option */
+static int __init early_phyp_dump_enabled(char *p)
+{
+        phyp_dump_info->phyp_dump_at_boot = 1;
+        if (!p)
+                return 0;
+        if (strncmp(p, "1", 1) == 0)
+                phyp_dump_info->phyp_dump_at_boot = 1;
+        else if (strncmp(p, "0", 1) == 0)
+                phyp_dump_info->phyp_dump_at_boot = 0;
+        return 0;
+}
+early_param("phyp_dump", early_phyp_dump_enabled);
diff --git a/arch/powerpc/platforms/pseries/reconfig.c b/arch/powerpc/platforms/pseries/reconfig.c
index 2800fced8c7c..ac75c10de278 100644
--- a/arch/powerpc/platforms/pseries/reconfig.c
+++ b/arch/powerpc/platforms/pseries/reconfig.c
@@ -222,14 +222,14 @@ static char * parse_next_property(char *buf, char *end, char **name, int *length
        tmp = strchr(buf, ' ');
        if (!tmp) {
                printk(KERN_ERR "property parse failed in %s at line %d\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                return NULL;
        }
        *tmp = '\0';
        if (++tmp >= end) {
                printk(KERN_ERR "property parse failed in %s at line %d\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                return NULL;
        }
@@ -238,12 +238,12 @@ static char * parse_next_property(char *buf, char *end, char **name, int *length
        *length = simple_strtoul(tmp, &tmp, 10);
        if (*length == -1) {
                printk(KERN_ERR "property parse failed in %s at line %d\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                return NULL;
        }
        if (*tmp != ' ' || ++tmp >= end) {
                printk(KERN_ERR "property parse failed in %s at line %d\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                return NULL;
        }
@@ -252,12 +252,12 @@ static char * parse_next_property(char *buf, char *end, char **name, int *length
        tmp += *length;
        if (tmp > end) {
                printk(KERN_ERR "property parse failed in %s at line %d\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                return NULL;
        }
        else if (tmp < end && *tmp != ' ' && *tmp != '\0') {
                printk(KERN_ERR "property parse failed in %s at line %d\n",
-                       __FUNCTION__, __LINE__);
+                       __func__, __LINE__);
                return NULL;
        }
        tmp++;
diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c
index 8e1ef168e2dd..e5b0ea870164 100644
--- a/arch/powerpc/platforms/pseries/scanlog.c
+++ b/arch/powerpc/platforms/pseries/scanlog.c
@@ -195,31 +195,30 @@ const struct file_operations scanlog_fops = {
 static int __init scanlog_init(void)
 {
        struct proc_dir_entry *ent;
+        void *data;
+        int err = -ENOMEM;
        ibm_scan_log_dump = rtas_token("ibm,scan-log-dump");
-        if (ibm_scan_log_dump == RTAS_UNKNOWN_SERVICE) {
+        if (ibm_scan_log_dump == RTAS_UNKNOWN_SERVICE)
-                printk(KERN_ERR "scan-log-dump not implemented on this system\n");
+                return -ENODEV;
-                return -EIO;
-        }
-        ent = create_proc_entry("ppc64/rtas/scan-log-dump",  S_IRUSR, NULL);
+        /* Ideally we could allocate a buffer < 4G */
-        if (ent) {
+        data = kzalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
-                ent->proc_fops = &scanlog_fops;
+        if (!data)
-                /* Ideally we could allocate a buffer < 4G */
+                goto err;
-                ent->data = kmalloc(RTAS_DATA_BUF_SIZE, GFP_KERNEL);
-                if (!ent->data) {
+        ent = proc_create("ppc64/rtas/scan-log-dump", S_IRUSR, NULL,
-                        printk(KERN_ERR "Failed to allocate a buffer\n");
+                          &scanlog_fops);
-                        remove_proc_entry("scan-log-dump", ent->parent);
+        if (!ent)
-                        return -ENOMEM;
+                goto err;
-                }
-                ((unsigned int *)ent->data)[0] = 0;
+        ent->data = data;
-        } else {
-                printk(KERN_ERR "Failed to create ppc64/scan-log-dump proc entry\n");
-                return -EIO;
-        }
        proc_ppc64_scan_log_dump = ent;
        return 0;
+err:
+        kfree(data);
+        return err;
 }
 static void __exit scanlog_cleanup(void)
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index fdb9b1c8f977..90555a39fe62 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -393,6 +393,7 @@ static void pseries_dedicated_idle_sleep(void)
 { 
        unsigned int cpu = smp_processor_id();
        unsigned long start_snooze;
+        unsigned long in_purr, out_purr;
        /*
         * Indicate to the HV that we are idle. Now would be
@@ -400,6 +401,7 @@ static void pseries_dedicated_idle_sleep(void)
         */
        get_lppaca()->idle = 1;
        get_lppaca()->donate_dedicated_cpu = 1;
+        in_purr = mfspr(SPRN_PURR);
        /*
         * We come in with interrupts disabled, and need_resched()
@@ -432,6 +434,8 @@ static void pseries_dedicated_idle_sleep(void)
 out:
        HMT_medium();
+        out_purr = mfspr(SPRN_PURR);
+        get_lppaca()->wait_state_cycles += out_purr - in_purr;
        get_lppaca()->donate_dedicated_cpu = 0;
        get_lppaca()->idle = 0;
 }
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index 15f3e8527d77..851a0be71947 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_PPC_INDIRECT_PCI)	+= indirect_pci.o
 obj-$(CONFIG_PPC_I8259)         += i8259.o
 obj-$(CONFIG_IPIC)              += ipic.o
 obj-$(CONFIG_4xx)               += uic.o
+obj-$(CONFIG_4xx_SOC)           += ppc4xx_soc.o
 obj-$(CONFIG_XILINX_VIRTEX)     += xilinx_intc.o
 obj-$(CONFIG_OF_RTC)            += of_rtc.o
 ifeq ($(CONFIG_PCI),y)
diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index df8bd2b64796..3eceeb5f3ee7 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -257,7 +257,7 @@ int cpm_command(u32 command, u8 opcode)
                if ((in_be16(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
                        goto out;
-        printk(KERN_ERR "%s(): Not able to issue CPM command\n", __FUNCTION__);
+        printk(KERN_ERR "%s(): Not able to issue CPM command\n", __func__);
        ret = -EIO;
 out:
        spin_unlock_irqrestore(&cmd_lock, flags);
diff --git a/arch/powerpc/sysdev/cpm2.c b/arch/powerpc/sysdev/cpm2.c
index dd066bb1d562..fa70ee31349e 100644
--- a/arch/powerpc/sysdev/cpm2.c
+++ b/arch/powerpc/sysdev/cpm2.c
@@ -99,7 +99,7 @@ int cpm_command(u32 command, u8 opcode)
                if ((in_be32(&cpmp->cp_cpcr) & CPM_CR_FLG) == 0)
                        goto out;
-        printk(KERN_ERR "%s(): Not able to issue CPM command\n", __FUNCTION__);
+        printk(KERN_ERR "%s(): Not able to issue CPM command\n", __func__);
        ret = -EIO;
 out:
        spin_unlock_irqrestore(&cmd_lock, flags);
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index e0e24b01e3a6..005c2ecf976f 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -37,6 +37,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/vmalloc.h>
 #include <linux/suspend.h>
+#include <linux/lmb.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/iommu.h>
@@ -44,7 +45,6 @@
 #include <asm/machdep.h>
 #include <asm/abs_addr.h>
 #include <asm/cacheflush.h>
-#include <asm/lmb.h>
 #include <asm/ppc-pci.h>
 #include "dart.h"
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index 6ffdda244bb1..6131fd2b6619 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -175,13 +175,16 @@ static inline void _mpic_write(enum mpic_reg_type type,
        switch(type) {
 #ifdef CONFIG_PPC_DCR
        case mpic_access_dcr:
-                return dcr_write(rb->dhost, reg, value);
+                dcr_write(rb->dhost, reg, value);
+                break;
 #endif
        case mpic_access_mmio_be:
-                return out_be32(rb->base + (reg >> 2), value);
+                out_be32(rb->base + (reg >> 2), value);
+                break;
        case mpic_access_mmio_le:
        default:
-                return out_le32(rb->base + (reg >> 2), value);
+                out_le32(rb->base + (reg >> 2), value);
+                break;
        }
 }
@@ -1000,7 +1003,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
                                const char *name)
 {
        struct mpic     *mpic;
-        u32             reg;
+        u32             greg_feature;
        const char      *vers;
        int             i;
        int             intvec_top;
@@ -1064,7 +1067,8 @@ struct mpic * __init mpic_alloc(struct device_node *node,
        /* Look for protected sources */
        if (node) {
-                unsigned int psize, bits, mapsize;
+                int psize;
+                unsigned int bits, mapsize;
                const u32 *psrc =
                        of_get_property(node, "protected-sources", &psize);
                if (psrc) {
@@ -1107,8 +1111,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         * in, try to obtain one
         */
        if (paddr == 0 && !(mpic->flags & MPIC_USES_DCR)) {
-                const u32 *reg;
+                const u32 *reg = of_get_property(node, "reg", NULL);
-                reg = of_get_property(node, "reg", NULL);
                BUG_ON(reg == NULL);
                paddr = of_translate_address(node, reg);
                BUG_ON(paddr == OF_BAD_ADDR);
@@ -1137,12 +1140,13 @@ struct mpic * __init mpic_alloc(struct device_node *node,
         * MPICs, num sources as well. On ISU MPICs, sources are counted
         * as ISUs are added
         */
-        reg = mpic_read(mpic->gregs, MPIC_INFO(GREG_FEATURE_0));
+        greg_feature = mpic_read(mpic->gregs, MPIC_INFO(GREG_FEATURE_0));
-        mpic->num_cpus = ((reg & MPIC_GREG_FEATURE_LAST_CPU_MASK)
+        mpic->num_cpus = ((greg_feature & MPIC_GREG_FEATURE_LAST_CPU_MASK)
                          >> MPIC_GREG_FEATURE_LAST_CPU_SHIFT) + 1;
        if (isu_size == 0)
-                mpic->num_sources = ((reg & MPIC_GREG_FEATURE_LAST_SRC_MASK)
+                mpic->num_sources =
-                                     >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1;
+                        ((greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK)
+                         >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1;
        /* Map the per-CPU registers */
        for (i = 0; i < mpic->num_cpus; i++) {
@@ -1161,7 +1165,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
        mpic->isu_mask = (1 << mpic->isu_shift) - 1;
        /* Display version */
-        switch (reg & MPIC_GREG_FEATURE_VERSION_MASK) {
+        switch (greg_feature & MPIC_GREG_FEATURE_VERSION_MASK) {
        case 1:
                vers = "1.0";
                break;
@@ -1321,7 +1325,7 @@ void __init mpic_set_serial_int(struct mpic *mpic, int enable)
 void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
 {
-        int is_ipi;
+        unsigned int is_ipi;
        struct mpic *mpic = mpic_find(irq, &is_ipi);
        unsigned int src = mpic_irq_to_hw(irq);
        unsigned long flags;
@@ -1344,7 +1348,7 @@ void mpic_irq_set_priority(unsigned int irq, unsigned int pri)
 unsigned int mpic_irq_get_priority(unsigned int irq)
 {
-        int is_ipi;
+        unsigned int is_ipi;
        struct mpic *mpic = mpic_find(irq, &is_ipi);
        unsigned int src = mpic_irq_to_hw(irq);
        unsigned long flags;
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c
index 5abfcd157483..1814adbd2236 100644
--- a/arch/powerpc/sysdev/ppc4xx_pci.c
+++ b/arch/powerpc/sysdev/ppc4xx_pci.c
@@ -527,6 +527,7 @@ static void __init ppc4xx_probe_pcix_bridge(struct device_node *np)
 *
 * ibm,plb-pciex-440spe
 * ibm,plb-pciex-405ex
+ * ibm,plb-pciex-460ex
 *
 * Anything else will be rejected for now as they are all subtly
 * different unfortunately.
@@ -645,7 +646,7 @@ static int __init ppc440spe_pciex_core_init(struct device_node *np)
        int time_out = 20;
        /* Set PLL clock receiver to LVPECL */
-        mtdcri(SDR0, PESDR0_PLLLCT1, mfdcri(SDR0, PESDR0_PLLLCT1) | 1 << 28);
+        dcri_clrset(SDR0, PESDR0_PLLLCT1, 0, 1 << 28);
        /* Shouldn't we do all the calibration stuff etc... here ? */
        if (ppc440spe_pciex_check_reset(np))
@@ -659,8 +660,7 @@ static int __init ppc440spe_pciex_core_init(struct device_node *np)
        }
        /* De-assert reset of PCIe PLL, wait for lock */
-        mtdcri(SDR0, PESDR0_PLLLCT1,
+        dcri_clrset(SDR0, PESDR0_PLLLCT1, 1 << 24, 0);
-               mfdcri(SDR0, PESDR0_PLLLCT1) & ~(1 << 24));
        udelay(3);
        while (time_out) {
@@ -712,9 +712,8 @@ static int ppc440spe_pciex_init_port_hw(struct ppc4xx_pciex_port *port)
                mtdcri(SDR0, port->sdr_base + PESDRn_440SPE_HSSL7SET1,
                       0x35000000);
        }
-        val = mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET);
+        dcri_clrset(SDR0, port->sdr_base + PESDRn_RCSSET,
-        mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
+                        (1 << 24) | (1 << 16), 1 << 12);
-               (val & ~(1 << 24 | 1 << 16)) | 1 << 12);
        return 0;
 }
@@ -775,6 +774,115 @@ static struct ppc4xx_pciex_hwops ppc440speB_pcie_hwops __initdata =
        .setup_utl      = ppc440speB_pciex_init_utl,
 };
+static int __init ppc460ex_pciex_core_init(struct device_node *np)
+{
+        /* Nothing to do, return 2 ports */
+        return 2;
+}
+static int ppc460ex_pciex_init_port_hw(struct ppc4xx_pciex_port *port)
+{
+        u32 val;
+        u32 utlset1;
+        if (port->endpoint)
+                val = PTYPE_LEGACY_ENDPOINT << 20;
+        else
+                val = PTYPE_ROOT_PORT << 20;
+        if (port->index == 0) {
+                val |= LNKW_X1 << 12;
+                utlset1 = 0x20000000;
+        } else {
+                val |= LNKW_X4 << 12;
+                utlset1 = 0x20101101;
+        }
+        mtdcri(SDR0, port->sdr_base + PESDRn_DLPSET, val);
+        mtdcri(SDR0, port->sdr_base + PESDRn_UTLSET1, utlset1);
+        mtdcri(SDR0, port->sdr_base + PESDRn_UTLSET2, 0x01210000);
+        switch (port->index) {
+        case 0:
+                mtdcri(SDR0, PESDR0_460EX_L0CDRCTL, 0x00003230);
+                mtdcri(SDR0, PESDR0_460EX_L0DRV, 0x00000136);
+                mtdcri(SDR0, PESDR0_460EX_L0CLK, 0x00000006);
+                mtdcri(SDR0, PESDR0_460EX_PHY_CTL_RST,0x10000000);
+                break;
+        case 1:
+                mtdcri(SDR0, PESDR1_460EX_L0CDRCTL, 0x00003230);
+                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_L0CLK, 0x00000006);
+                mtdcri(SDR0, PESDR1_460EX_L1CLK, 0x00000006);
+                mtdcri(SDR0, PESDR1_460EX_L2CLK, 0x00000006);
+                mtdcri(SDR0, PESDR1_460EX_L3CLK, 0x00000006);
+                mtdcri(SDR0, PESDR1_460EX_PHY_CTL_RST,0x10000000);
+                break;
+        }
+        mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
+               mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET) |
+               (PESDRx_RCSSET_RSTGU | PESDRx_RCSSET_RSTPYN));
+        /* Poll for PHY reset */
+        /* XXX FIXME add timeout */
+        switch (port->index) {
+        case 0:
+                while (!(mfdcri(SDR0, PESDR0_460EX_RSTSTA) & 0x1))
+                        udelay(10);
+                break;
+        case 1:
+                while (!(mfdcri(SDR0, PESDR1_460EX_RSTSTA) & 0x1))
+                        udelay(10);
+                break;
+        }
+        mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
+               (mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET) &
+                ~(PESDRx_RCSSET_RSTGU | PESDRx_RCSSET_RSTDL)) |
+               PESDRx_RCSSET_RSTPYN);
+        port->has_ibpre = 1;
+        return 0;
+}
+static int ppc460ex_pciex_init_utl(struct ppc4xx_pciex_port *port)
+{
+        dcr_write(port->dcrs, DCRO_PEGPL_SPECIAL, 0x0);
+        /*
+         * Set buffer allocations and then assert VRB and TXE.
+         */
+        out_be32(port->utl_base + PEUTL_PBCTL,  0x0800000c);
+        out_be32(port->utl_base + PEUTL_OUTTR,  0x08000000);
+        out_be32(port->utl_base + PEUTL_INTR,   0x02000000);
+        out_be32(port->utl_base + PEUTL_OPDBSZ, 0x04000000);
+        out_be32(port->utl_base + PEUTL_PBBSZ,  0x00000000);
+        out_be32(port->utl_base + PEUTL_IPHBSZ, 0x02000000);
+        out_be32(port->utl_base + PEUTL_IPDBSZ, 0x04000000);
+        out_be32(port->utl_base + PEUTL_RCIRQEN,0x00f00000);
+        out_be32(port->utl_base + PEUTL_PCTL,   0x80800066);
+        return 0;
+}
+static struct ppc4xx_pciex_hwops ppc460ex_pcie_hwops __initdata =
+{
+        .core_init      = ppc460ex_pciex_core_init,
+        .port_init_hw   = ppc460ex_pciex_init_port_hw,
+        .setup_utl      = ppc460ex_pciex_init_utl,
+};
 #endif /* CONFIG_44x */
 #ifdef CONFIG_40x
@@ -830,17 +938,9 @@ static int ppc405ex_pciex_init_port_hw(struct ppc4xx_pciex_port *port)
         * PCIe boards don't show this problem.
         * This has to be re-tested and fixed in a later release!
         */
-#if 0 /* XXX FIXME: Not resetting the PHY will leave all resources
-       * configured as done previously by U-Boot. Then Linux will currently
-       * not reassign them. So the PHY reset is now done always. This will
-       * lead to problems with the Atheros PCIe board again.
-       */
        val = mfdcri(SDR0, port->sdr_base + PESDRn_LOOP);
        if (!(val & 0x00001000))
                ppc405ex_pcie_phy_reset(port);
-#else
-        ppc405ex_pcie_phy_reset(port);
-#endif
        dcr_write(port->dcrs, DCRO_PEGPL_CFG, 0x10000000);  /* guarded on */
@@ -896,6 +996,8 @@ static int __init ppc4xx_pciex_check_core_init(struct device_node *np)
                else
                        ppc4xx_pciex_hwops = &ppc440speB_pcie_hwops;
        }
+        if (of_device_is_compatible(np, "ibm,plb-pciex-460ex"))
+                ppc4xx_pciex_hwops = &ppc460ex_pcie_hwops;
 #endif /* CONFIG_44x    */
 #ifdef CONFIG_40x
        if (of_device_is_compatible(np, "ibm,plb-pciex-405ex"))
@@ -1042,8 +1144,7 @@ static int __init ppc4xx_pciex_port_init(struct ppc4xx_pciex_port *port)
                port->link = 0;
        }
-        mtdcri(SDR0, port->sdr_base + PESDRn_RCSSET,
+        dcri_clrset(SDR0, port->sdr_base + PESDRn_RCSSET, 0, 1 << 20);
-               mfdcri(SDR0, port->sdr_base + PESDRn_RCSSET) | 1 << 20);
        msleep(100);
        return 0;
diff --git a/arch/powerpc/sysdev/ppc4xx_pci.h b/arch/powerpc/sysdev/ppc4xx_pci.h
index 1c07908dc6ef..d04e40b306fb 100644
--- a/arch/powerpc/sysdev/ppc4xx_pci.h
+++ b/arch/powerpc/sysdev/ppc4xx_pci.h
@@ -271,6 +271,59 @@
 #define PESDR1_405EX_PHYSTA             0x044C
 /*
+ * 460EX additional DCRs
+ */
+#define PESDR0_460EX_L0BIST             0x0308
+#define PESDR0_460EX_L0BISTSTS          0x0309
+#define PESDR0_460EX_L0CDRCTL           0x030A
+#define PESDR0_460EX_L0DRV              0x030B
+#define PESDR0_460EX_L0REC              0x030C
+#define PESDR0_460EX_L0LPB              0x030D
+#define PESDR0_460EX_L0CLK              0x030E
+#define PESDR0_460EX_PHY_CTL_RST        0x030F
+#define PESDR0_460EX_RSTSTA             0x0310
+#define PESDR0_460EX_OBS                0x0311
+#define PESDR0_460EX_L0ERRC             0x0320
+#define PESDR1_460EX_L0BIST             0x0348
+#define PESDR1_460EX_L1BIST             0x0349
+#define PESDR1_460EX_L2BIST             0x034A
+#define PESDR1_460EX_L3BIST             0x034B
+#define PESDR1_460EX_L0BISTSTS          0x034C
+#define PESDR1_460EX_L1BISTSTS          0x034D
+#define PESDR1_460EX_L2BISTSTS          0x034E
+#define PESDR1_460EX_L3BISTSTS          0x034F
+#define PESDR1_460EX_L0CDRCTL           0x0350
+#define PESDR1_460EX_L1CDRCTL           0x0351
+#define PESDR1_460EX_L2CDRCTL           0x0352
+#define PESDR1_460EX_L3CDRCTL           0x0353
+#define PESDR1_460EX_L0DRV              0x0354
+#define PESDR1_460EX_L1DRV              0x0355
+#define PESDR1_460EX_L2DRV              0x0356
+#define PESDR1_460EX_L3DRV              0x0357
+#define PESDR1_460EX_L0REC              0x0358
+#define PESDR1_460EX_L1REC              0x0359
+#define PESDR1_460EX_L2REC              0x035A
+#define PESDR1_460EX_L3REC              0x035B
+#define PESDR1_460EX_L0LPB              0x035C
+#define PESDR1_460EX_L1LPB              0x035D
+#define PESDR1_460EX_L2LPB              0x035E
+#define PESDR1_460EX_L3LPB              0x035F
+#define PESDR1_460EX_L0CLK              0x0360
+#define PESDR1_460EX_L1CLK              0x0361
+#define PESDR1_460EX_L2CLK              0x0362
+#define PESDR1_460EX_L3CLK              0x0363
+#define PESDR1_460EX_PHY_CTL_RST        0x0364
+#define PESDR1_460EX_RSTSTA             0x0365
+#define PESDR1_460EX_OBS                0x0366
+#define PESDR1_460EX_L0ERRC             0x0368
+#define PESDR1_460EX_L1ERRC             0x0369
+#define PESDR1_460EX_L2ERRC             0x036A
+#define PESDR1_460EX_L3ERRC             0x036B
+#define PESDR0_460EX_IHS1               0x036C
+#define PESDR0_460EX_IHS2               0x036D
+/*
 * Of the above, some are common offsets from the base
 */
 #define PESDRn_UTLSET1                  0x00
@@ -353,6 +406,12 @@
 #define PECFG_POM2LAL           0x390
 #define PECFG_POM2LAH           0x394
+/* SDR Bit Mappings */
+#define PESDRx_RCSSET_HLDPLB    0x10000000
+#define PESDRx_RCSSET_RSTGU     0x01000000
+#define PESDRx_RCSSET_RDY       0x00100000
+#define PESDRx_RCSSET_RSTDL     0x00010000
+#define PESDRx_RCSSET_RSTPYN    0x00001000
 enum
 {
diff --git a/arch/powerpc/sysdev/ppc4xx_soc.c b/arch/powerpc/sysdev/ppc4xx_soc.c
new file mode 100644
index 000000000000..5b32adc9a9b2
--- /dev/null
+++ b/arch/powerpc/sysdev/ppc4xx_soc.c
@@ -0,0 +1,200 @@
+/*
+ * IBM/AMCC PPC4xx SoC setup code
+ *
+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ *
+ * L2 cache routines cloned from arch/ppc/syslib/ibm440gx_common.c which is:
+ *   Eugene Surovegin <eugene.surovegin@zultys.com> or <ebs@ebshome.net>
+ *   Copyright (c) 2003 - 2006 Zultys Technologies
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/of_platform.h>
+#include <asm/dcr.h>
+#include <asm/dcr-regs.h>
+#include <asm/reg.h>
+static u32 dcrbase_l2c;
+/*
+ * L2-cache
+ */
+/* Issue L2C diagnostic command */
+static inline u32 l2c_diag(u32 addr)
+{
+        mtdcr(dcrbase_l2c + DCRN_L2C0_ADDR, addr);
+        mtdcr(dcrbase_l2c + DCRN_L2C0_CMD, L2C_CMD_DIAG);
+        while (!(mfdcr(dcrbase_l2c + DCRN_L2C0_SR) & L2C_SR_CC))
+                ;
+        return mfdcr(dcrbase_l2c + DCRN_L2C0_DATA);
+}
+static irqreturn_t l2c_error_handler(int irq, void *dev)
+{
+        u32 sr = mfdcr(dcrbase_l2c + DCRN_L2C0_SR);
+        if (sr & L2C_SR_CPE) {
+                /* Read cache trapped address */
+                u32 addr = l2c_diag(0x42000000);
+                printk(KERN_EMERG "L2C: Cache Parity Error, addr[16:26] = 0x%08x\n",
+                       addr);
+        }
+        if (sr & L2C_SR_TPE) {
+                /* Read tag trapped address */
+                u32 addr = l2c_diag(0x82000000) >> 16;
+                printk(KERN_EMERG "L2C: Tag Parity Error, addr[16:26] = 0x%08x\n",
+                       addr);
+        }
+        /* Clear parity errors */
+        if (sr & (L2C_SR_CPE | L2C_SR_TPE)){
+                mtdcr(dcrbase_l2c + DCRN_L2C0_ADDR, 0);
+                mtdcr(dcrbase_l2c + DCRN_L2C0_CMD, L2C_CMD_CCP | L2C_CMD_CTE);
+        } else {
+                printk(KERN_EMERG "L2C: LRU error\n");
+        }
+        return IRQ_HANDLED;
+}
+static int __init ppc4xx_l2c_probe(void)
+{
+        struct device_node *np;
+        u32 r;
+        unsigned long flags;
+        int irq;
+        const u32 *dcrreg;
+        u32 dcrbase_isram;
+        int len;
+        const u32 *prop;
+        u32 l2_size;
+        np = of_find_compatible_node(NULL, NULL, "ibm,l2-cache");
+        if (!np)
+                return 0;
+        /* Get l2 cache size */
+        prop = of_get_property(np, "cache-size", NULL);
+        if (prop == NULL) {
+                printk(KERN_ERR "%s: Can't get cache-size!\n", np->full_name);
+                of_node_put(np);
+                return -ENODEV;
+        }
+        l2_size = prop[0];
+        /* Map DCRs */
+        dcrreg = of_get_property(np, "dcr-reg", &len);
+        if (!dcrreg || (len != 4 * sizeof(u32))) {
+                printk(KERN_ERR "%s: Can't get DCR register base !",
+                       np->full_name);
+                of_node_put(np);
+                return -ENODEV;
+        }
+        dcrbase_isram = dcrreg[0];
+        dcrbase_l2c = dcrreg[2];
+        /* Get and map irq number from device tree */
+        irq = irq_of_parse_and_map(np, 0);
+        if (irq == NO_IRQ) {
+                printk(KERN_ERR "irq_of_parse_and_map failed\n");
+                of_node_put(np);
+                return -ENODEV;
+        }
+        /* Install error handler */
+        if (request_irq(irq, l2c_error_handler, IRQF_DISABLED, "L2C", 0) < 0) {
+                printk(KERN_ERR "Cannot install L2C error handler"
+                       ", cache is not enabled\n");
+                of_node_put(np);
+                return -ENODEV;
+        }
+        local_irq_save(flags);
+        asm volatile ("sync" ::: "memory");
+        /* Disable SRAM */
+        mtdcr(dcrbase_isram + DCRN_SRAM0_DPC,
+              mfdcr(dcrbase_isram + DCRN_SRAM0_DPC) & ~SRAM_DPC_ENABLE);
+        mtdcr(dcrbase_isram + DCRN_SRAM0_SB0CR,
+              mfdcr(dcrbase_isram + DCRN_SRAM0_SB0CR) & ~SRAM_SBCR_BU_MASK);
+        mtdcr(dcrbase_isram + DCRN_SRAM0_SB1CR,
+              mfdcr(dcrbase_isram + DCRN_SRAM0_SB1CR) & ~SRAM_SBCR_BU_MASK);
+        mtdcr(dcrbase_isram + DCRN_SRAM0_SB2CR,
+              mfdcr(dcrbase_isram + DCRN_SRAM0_SB2CR) & ~SRAM_SBCR_BU_MASK);
+        mtdcr(dcrbase_isram + DCRN_SRAM0_SB3CR,
+              mfdcr(dcrbase_isram + DCRN_SRAM0_SB3CR) & ~SRAM_SBCR_BU_MASK);
+        /* Enable L2_MODE without ICU/DCU */
+        r = mfdcr(dcrbase_l2c + DCRN_L2C0_CFG) &
+                ~(L2C_CFG_ICU | L2C_CFG_DCU | L2C_CFG_SS_MASK);
+        r |= L2C_CFG_L2M | L2C_CFG_SS_256;
+        mtdcr(dcrbase_l2c + DCRN_L2C0_CFG, r);
+        mtdcr(dcrbase_l2c + DCRN_L2C0_ADDR, 0);
+        /* Hardware Clear Command */
+        mtdcr(dcrbase_l2c + DCRN_L2C0_CMD, L2C_CMD_HCC);
+        while (!(mfdcr(dcrbase_l2c + DCRN_L2C0_SR) & L2C_SR_CC))
+                ;
+        /* Clear Cache Parity and Tag Errors */
+        mtdcr(dcrbase_l2c + DCRN_L2C0_CMD, L2C_CMD_CCP | L2C_CMD_CTE);
+        /* Enable 64G snoop region starting at 0 */
+        r = mfdcr(dcrbase_l2c + DCRN_L2C0_SNP0) &
+                ~(L2C_SNP_BA_MASK | L2C_SNP_SSR_MASK);
+        r |= L2C_SNP_SSR_32G | L2C_SNP_ESR;
+        mtdcr(dcrbase_l2c + DCRN_L2C0_SNP0, r);
+        r = mfdcr(dcrbase_l2c + DCRN_L2C0_SNP1) &
+                ~(L2C_SNP_BA_MASK | L2C_SNP_SSR_MASK);
+        r |= 0x80000000 | L2C_SNP_SSR_32G | L2C_SNP_ESR;
+        mtdcr(dcrbase_l2c + DCRN_L2C0_SNP1, r);
+        asm volatile ("sync" ::: "memory");
+        /* Enable ICU/DCU ports */
+        r = mfdcr(dcrbase_l2c + DCRN_L2C0_CFG);
+        r &= ~(L2C_CFG_DCW_MASK | L2C_CFG_PMUX_MASK | L2C_CFG_PMIM
+               | L2C_CFG_TPEI | L2C_CFG_CPEI | L2C_CFG_NAM | L2C_CFG_NBRM);
+        r |= L2C_CFG_ICU | L2C_CFG_DCU | L2C_CFG_TPC | L2C_CFG_CPC | L2C_CFG_FRAN
+                | L2C_CFG_CPIM | L2C_CFG_TPIM | L2C_CFG_LIM | L2C_CFG_SMCM;
+        /* Check for 460EX/GT special handling */
+        if (of_device_is_compatible(np, "ibm,l2-cache-460ex"))
+                r |= L2C_CFG_RDBW;
+        mtdcr(dcrbase_l2c + DCRN_L2C0_CFG, r);
+        asm volatile ("sync; isync" ::: "memory");
+        local_irq_restore(flags);
+        printk(KERN_INFO "%dk L2-cache enabled\n", l2_size >> 10);
+        of_node_put(np);
+        return 0;
+}
+arch_initcall(ppc4xx_l2c_probe);
+/*
+ * At present, this routine just applies a system reset.
+ */
+void ppc4xx_reset_system(char *cmd)
+{
+        mtspr(SPRN_DBCR0, mfspr(SPRN_DBCR0) | DBCR0_RST_SYSTEM);
+        while (1)
+                ;       /* Just in case the reset doesn't work */
+}
diff --git a/arch/powerpc/sysdev/qe_lib/qe_io.c b/arch/powerpc/sysdev/qe_lib/qe_io.c
index e53ea4d374a0..736c1fcc9503 100644
--- a/arch/powerpc/sysdev/qe_lib/qe_io.c
+++ b/arch/powerpc/sysdev/qe_lib/qe_io.c
@@ -200,7 +200,7 @@ static void dump_par_io(void)
 {
        unsigned int i;
-        printk(KERN_INFO "%s: par_io=%p\n", __FUNCTION__, par_io);
+        printk(KERN_INFO "%s: par_io=%p\n", __func__, par_io);
        for (i = 0; i < num_par_io_ports; i++) {
                printk(KERN_INFO "      cpodr[%u]=%08x\n", i,
                        in_be32(&par_io[i].cpodr));
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
index 3223acbc39e5..bcf88e6ce962 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
@@ -148,57 +148,57 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
        /* check if the UCC port number is in range. */
        if ((uf_info->ucc_num < 0) || (uf_info->ucc_num > UCC_MAX_NUM - 1)) {
-                printk(KERN_ERR "%s: illegal UCC number\n", __FUNCTION__);
+                printk(KERN_ERR "%s: illegal UCC number\n", __func__);
                return -EINVAL;
        }
        /* Check that 'max_rx_buf_length' is properly aligned (4). */
        if (uf_info->max_rx_buf_length & (UCC_FAST_MRBLR_ALIGNMENT - 1)) {
                printk(KERN_ERR "%s: max_rx_buf_length not aligned\n",
-                        __FUNCTION__);
+                        __func__);
                return -EINVAL;
        }
        /* Validate Virtual Fifo register values */
        if (uf_info->urfs < UCC_FAST_URFS_MIN_VAL) {
-                printk(KERN_ERR "%s: urfs is too small\n", __FUNCTION__);
+                printk(KERN_ERR "%s: urfs is too small\n", __func__);
                return -EINVAL;
        }
        if (uf_info->urfs & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
-                printk(KERN_ERR "%s: urfs is not aligned\n", __FUNCTION__);
+                printk(KERN_ERR "%s: urfs is not aligned\n", __func__);
                return -EINVAL;
        }
        if (uf_info->urfet & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
-                printk(KERN_ERR "%s: urfet is not aligned.\n", __FUNCTION__);
+                printk(KERN_ERR "%s: urfet is not aligned.\n", __func__);
                return -EINVAL;
        }
        if (uf_info->urfset & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
-                printk(KERN_ERR "%s: urfset is not aligned\n", __FUNCTION__);
+                printk(KERN_ERR "%s: urfset is not aligned\n", __func__);
                return -EINVAL;
        }
        if (uf_info->utfs & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
-                printk(KERN_ERR "%s: utfs is not aligned\n", __FUNCTION__);
+                printk(KERN_ERR "%s: utfs is not aligned\n", __func__);
                return -EINVAL;
        }
        if (uf_info->utfet & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
-                printk(KERN_ERR "%s: utfet is not aligned\n", __FUNCTION__);
+                printk(KERN_ERR "%s: utfet is not aligned\n", __func__);
                return -EINVAL;
        }
        if (uf_info->utftt & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
-                printk(KERN_ERR "%s: utftt is not aligned\n", __FUNCTION__);
+                printk(KERN_ERR "%s: utftt is not aligned\n", __func__);
                return -EINVAL;
        }
        uccf = kzalloc(sizeof(struct ucc_fast_private), GFP_KERNEL);
        if (!uccf) {
                printk(KERN_ERR "%s: Cannot allocate private data\n",
-                        __FUNCTION__);
+                        __func__);
                return -ENOMEM;
        }
@@ -207,7 +207,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
        /* Set the PHY base address */
        uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast));
        if (uccf->uf_regs == NULL) {
-                printk(KERN_ERR "%s: Cannot map UCC registers\n", __FUNCTION__);
+                printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__);
                return -ENOMEM;
        }
@@ -230,7 +230,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
        /* Set UCC to fast type */
        ret = ucc_set_type(uf_info->ucc_num, UCC_SPEED_TYPE_FAST);
        if (ret) {
-                printk(KERN_ERR "%s: cannot set UCC type\n", __FUNCTION__);
+                printk(KERN_ERR "%s: cannot set UCC type\n", __func__);
                ucc_fast_free(uccf);
                return ret;
        }
@@ -270,7 +270,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
            qe_muram_alloc(uf_info->utfs, UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
        if (IS_ERR_VALUE(uccf->ucc_fast_tx_virtual_fifo_base_offset)) {
                printk(KERN_ERR "%s: cannot allocate MURAM for TX FIFO\n",
-                        __FUNCTION__);
+                        __func__);
                uccf->ucc_fast_tx_virtual_fifo_base_offset = 0;
                ucc_fast_free(uccf);
                return -ENOMEM;
@@ -283,7 +283,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
                           UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
        if (IS_ERR_VALUE(uccf->ucc_fast_rx_virtual_fifo_base_offset)) {
                printk(KERN_ERR "%s: cannot allocate MURAM for RX FIFO\n",
-                        __FUNCTION__);
+                        __func__);
                uccf->ucc_fast_rx_virtual_fifo_base_offset = 0;
                ucc_fast_free(uccf);
                return -ENOMEM;
@@ -314,7 +314,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
                    ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->rx_clock,
                                        COMM_DIR_RX)) {
                        printk(KERN_ERR "%s: illegal value for RX clock\n",
-                               __FUNCTION__);
+                               __func__);
                        ucc_fast_free(uccf);
                        return -EINVAL;
                }
@@ -323,7 +323,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
                    ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->tx_clock,
                                        COMM_DIR_TX)) {
                        printk(KERN_ERR "%s: illegal value for TX clock\n",
-                               __FUNCTION__);
+                               __func__);
                        ucc_fast_free(uccf);
                        return -EINVAL;
                }
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_slow.c b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
index b2870b208ddb..a578bc77b9d5 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_slow.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_slow.c
@@ -142,7 +142,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
        /* check if the UCC port number is in range. */
        if ((us_info->ucc_num < 0) || (us_info->ucc_num > UCC_MAX_NUM - 1)) {
-                printk(KERN_ERR "%s: illegal UCC number\n", __FUNCTION__);
+                printk(KERN_ERR "%s: illegal UCC number\n", __func__);
                return -EINVAL;
        }
@@ -161,7 +161,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
        uccs = kzalloc(sizeof(struct ucc_slow_private), GFP_KERNEL);
        if (!uccs) {
                printk(KERN_ERR "%s: Cannot allocate private data\n",
-                        __FUNCTION__);
+                        __func__);
                return -ENOMEM;
        }
@@ -170,7 +170,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
        /* Set the PHY base address */
        uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow));
        if (uccs->us_regs == NULL) {
-                printk(KERN_ERR "%s: Cannot map UCC registers\n", __FUNCTION__);
+                printk(KERN_ERR "%s: Cannot map UCC registers\n", __func__);
                return -ENOMEM;
        }
@@ -189,7 +189,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
        uccs->us_pram_offset =
                qe_muram_alloc(UCC_SLOW_PRAM_SIZE, ALIGNMENT_OF_UCC_SLOW_PRAM);
        if (IS_ERR_VALUE(uccs->us_pram_offset)) {
-                printk(KERN_ERR "%s: cannot allocate MURAM for PRAM", __FUNCTION__);
+                printk(KERN_ERR "%s: cannot allocate MURAM for PRAM", __func__);
                ucc_slow_free(uccs);
                return -ENOMEM;
        }
@@ -202,7 +202,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
        /* Set UCC to slow type */
        ret = ucc_set_type(us_info->ucc_num, UCC_SPEED_TYPE_SLOW);
        if (ret) {
-                printk(KERN_ERR "%s: cannot set UCC type", __FUNCTION__);
+                printk(KERN_ERR "%s: cannot set UCC type", __func__);
                ucc_slow_free(uccs);
                return ret;
        }
@@ -216,7 +216,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
                qe_muram_alloc(us_info->rx_bd_ring_len * sizeof(struct qe_bd),
                                QE_ALIGNMENT_OF_BD);
        if (IS_ERR_VALUE(uccs->rx_base_offset)) {
-                printk(KERN_ERR "%s: cannot allocate %u RX BDs\n", __FUNCTION__,
+                printk(KERN_ERR "%s: cannot allocate %u RX BDs\n", __func__,
                        us_info->rx_bd_ring_len);
                uccs->rx_base_offset = 0;
                ucc_slow_free(uccs);
@@ -227,7 +227,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
                qe_muram_alloc(us_info->tx_bd_ring_len * sizeof(struct qe_bd),
                        QE_ALIGNMENT_OF_BD);
        if (IS_ERR_VALUE(uccs->tx_base_offset)) {
-                printk(KERN_ERR "%s: cannot allocate TX BDs", __FUNCTION__);
+                printk(KERN_ERR "%s: cannot allocate TX BDs", __func__);
                uccs->tx_base_offset = 0;
                ucc_slow_free(uccs);
                return -ENOMEM;
@@ -317,7 +317,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
                if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->rx_clock,
                                        COMM_DIR_RX)) {
                        printk(KERN_ERR "%s: illegal value for RX clock\n",
-                               __FUNCTION__);
+                               __func__);
                        ucc_slow_free(uccs);
                        return -EINVAL;
                }
@@ -325,7 +325,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
                if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->tx_clock,
                                        COMM_DIR_TX)) {
                        printk(KERN_ERR "%s: illegal value for TX clock\n",
-                               __FUNCTION__);
+                               __func__);
                        ucc_slow_free(uccs);
                        return -EINVAL;
                }
diff --git a/arch/powerpc/sysdev/tsi108_dev.c b/arch/powerpc/sysdev/tsi108_dev.c
index be2808a292f7..d4d15aaf18fa 100644
--- a/arch/powerpc/sysdev/tsi108_dev.c
+++ b/arch/powerpc/sysdev/tsi108_dev.c
@@ -84,7 +84,7 @@ static int __init tsi108_eth_of_init(void)
                ret = of_address_to_resource(np, 0, &r[0]);
                DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
-                        __FUNCTION__,r[0].name, r[0].start, r[0].end);
+                        __func__,r[0].name, r[0].start, r[0].end);
                if (ret)
                        goto err;
@@ -93,7 +93,7 @@ static int __init tsi108_eth_of_init(void)
                r[1].end = irq_of_parse_and_map(np, 0);
                r[1].flags = IORESOURCE_IRQ;
                DBG("%s: name:start->end = %s:0x%lx-> 0x%lx\n",
-                        __FUNCTION__,r[1].name, r[1].start, r[1].end);
+                        __func__,r[1].name, r[1].start, r[1].end);
                tsi_eth_dev =
                    platform_device_register_simple("tsi-ethernet", i++, &r[0],
diff --git a/arch/powerpc/sysdev/tsi108_pci.c b/arch/powerpc/sysdev/tsi108_pci.c
index 31d3d33d91fc..ac1a72dc21e5 100644
--- a/arch/powerpc/sysdev/tsi108_pci.c
+++ b/arch/powerpc/sysdev/tsi108_pci.c
@@ -207,7 +207,7 @@ int __init tsi108_setup_pci(struct device_node *dev, u32 cfg_phys, int primary)
        /* PCI Config mapping */
        tsi108_pci_cfg_base = (u32)ioremap(cfg_phys, TSI108_PCI_CFG_SIZE);
        tsi108_pci_cfg_phys = cfg_phys;
-        DBG("TSI_PCI: %s tsi108_pci_cfg_base=0x%x\n", __FUNCTION__,
+        DBG("TSI_PCI: %s tsi108_pci_cfg_base=0x%x\n", __func__,
            tsi108_pci_cfg_base);
        /* Fetch host bridge registers address */
@@ -395,7 +395,7 @@ static int pci_irq_host_xlate(struct irq_host *h, struct device_node *ct,
 static int pci_irq_host_map(struct irq_host *h, unsigned int virq,
                          irq_hw_number_t hw)
 {       unsigned int irq;
-        DBG("%s(%d, 0x%lx)\n", __FUNCTION__, virq, hw);
+        DBG("%s(%d, 0x%lx)\n", __func__, virq, hw);
        if ((virq >= 1) && (virq <= 4)){
                irq = virq + IRQ_PCI_INTAD_BASE - 1;
                get_irq_desc(irq)->status |= IRQ_LEVEL;
diff --git a/arch/ppc/8xx_io/commproc.c b/arch/ppc/8xx_io/commproc.c
index 9d656de0f0f1..752443df5ecf 100644
--- a/arch/ppc/8xx_io/commproc.c
+++ b/arch/ppc/8xx_io/commproc.c
@@ -43,7 +43,7 @@
 ({                                                                      \
        u32 offset = offsetof(immap_t, member);                         \
        void *addr = ioremap (IMAP_ADDR + offset,                       \
-                              sizeof( ((immap_t*)0)->member));          \
+                              FIELD_SIZEOF(immap_t, member));           \
        addr;                                                           \
 })
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
index 11b0aa6ca97e..1d4b49ad0d7f 100644
--- a/arch/ppc/8xx_io/fec.c
+++ b/arch/ppc/8xx_io/fec.c
@@ -520,7 +520,7 @@ fec_enet_interrupt(int irq, void * dev_id)
 #ifdef  CONFIG_USE_MDIO
                        fec_enet_mii(dev);
 #else
-printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__,__LINE__,__FUNCTION__);
+printk("%s[%d] %s: unexpected FEC_ENET_MII event\n", __FILE__, __LINE__, __func__);
 #endif  /* CONFIG_USE_MDIO */
                }
@@ -1441,7 +1441,7 @@ irqreturn_t mii_link_interrupt(int irq, void * dev_id)
                fecp->fec_ecntrl = ecntrl;      /* restore old settings */
        }
 #else
-printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__,__LINE__,__FUNCTION__);
+printk("%s[%d] %s: unexpected Link interrupt\n", __FILE__, __LINE__, __func__);
 #endif  /* CONFIG_USE_MDIO */
 #ifndef CONFIG_RPXCLASSIC
diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S
index 1b0ec7202dd5..e7e642b95138 100644
--- a/arch/ppc/kernel/head.S
+++ b/arch/ppc/kernel/head.S
@@ -701,23 +701,6 @@ load_up_altivec:
        b       fast_exception_return
 /*
- * AltiVec unavailable trap from kernel - print a message, but let
- * the task use AltiVec in the kernel until it returns to user mode.
- */
-KernelAltiVec:
-        lwz     r3,_MSR(r1)
-        oris    r3,r3,MSR_VEC@h
-        stw     r3,_MSR(r1)     /* enable use of AltiVec after return */
-        lis     r3,87f@h
-        ori     r3,r3,87f@l
-        mr      r4,r2           /* current */
-        lwz     r5,_NIP(r1)
-        bl      printk
-        b       ret_from_except
-87:     .string "AltiVec used in kernel  (task=%p, pc=%x)  \n"
-        .align  4,0
-/*
 * giveup_altivec(tsk)
 * Disable AltiVec for the task given as the argument,
 * and save the AltiVec registers in its thread_struct.
diff --git a/arch/ppc/mm/init.c b/arch/ppc/mm/init.c
index 7444df3889c5..1a63711081b5 100644
--- a/arch/ppc/mm/init.c
+++ b/arch/ppc/mm/init.c
@@ -109,7 +109,6 @@ void show_mem(void)
        printk("Mem-info:\n");
        show_free_areas();
-        printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
        i = max_mapnr;
        while (i-- > 0) {
                total++;
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c
index 44d4398a36ff..fc928a26609b 100644
--- a/arch/ppc/platforms/radstone_ppc7d.c
+++ b/arch/ppc/platforms/radstone_ppc7d.c
@@ -512,7 +512,7 @@ static void __init ppc7d_init_irq(void)
 {
        int irq;
-        pr_debug("%s\n", __FUNCTION__);
+        pr_debug("%s\n", __func__);
        i8259_init(0, 0);
        mv64360_init_irq();
@@ -569,7 +569,7 @@ static int __init ppc7d_map_irq(struct pci_dev *dev, unsigned char idsel,
        };
        const long min_idsel = 10, max_idsel = 14, irqs_per_slot = 4;
-        pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __FUNCTION__,
+        pr_debug("%s: %04x/%04x/%x: idsel=%hx pin=%hu\n", __func__,
                 dev->vendor, dev->device, PCI_FUNC(dev->devfn), idsel, pin);
        return PCI_IRQ_TABLE_LOOKUP;
@@ -1300,7 +1300,7 @@ static void ppc7d_init2(void)
        u32 data;
        u8 data8;
-        pr_debug("%s: enter\n", __FUNCTION__);
+        pr_debug("%s: enter\n", __func__);
        /* Wait for debugger? */
        if (ppc7d_wait_debugger) {
@@ -1333,7 +1333,7 @@ static void ppc7d_init2(void)
        ppc_md.set_rtc_time = ppc7d_set_rtc_time;
        ppc_md.get_rtc_time = ppc7d_get_rtc_time;
-        pr_debug("%s: exit\n", __FUNCTION__);
+        pr_debug("%s: exit\n", __func__);
 }
 /* Called from machine_init(), early, before any of the __init functions
diff --git a/arch/ppc/syslib/mpc52xx_setup.c b/arch/ppc/syslib/mpc52xx_setup.c
index 9f504fc7693e..ab0cf4ced9e5 100644
--- a/arch/ppc/syslib/mpc52xx_setup.c
+++ b/arch/ppc/syslib/mpc52xx_setup.c
@@ -279,7 +279,7 @@ int mpc52xx_match_psc_function(int psc_idx, const char *func)
 int mpc52xx_set_psc_clkdiv(int psc_id, int clkdiv)
 {
-        static spinlock_t lock = SPIN_LOCK_UNLOCKED;
+        static DEFINE_SPINLOCK(lock);
        struct mpc52xx_cdm __iomem *cdm;
        unsigned long flags;
        u16 mclken_div;
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 463d1be32c98..2667a9dee11d 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -16,6 +16,7 @@ config SPARC64
        bool
        default y
        select HAVE_IDE
+        select HAVE_LMB
        help
          SPARC is a family of RISC microprocessors designed and marketed by
          Sun Microsystems, incorporated.  This port covers the newer 64-bit
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 41ca721d2523..ebfe038d859e 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
 enum {
        PARTITION_SHIFT = 3,
        MAX_DISKNO = HVMAXARCHITECTEDVIRTUALDISKS,
-        MAX_DISK_NAME = sizeof(((struct gendisk *)0)->disk_name)
+        MAX_DISK_NAME = FIELD_SIZEOF(struct gendisk, disk_name)
 };
 static DEFINE_SPINLOCK(viodasd_spinlock);
diff --git a/drivers/char/xilinx_hwicap/buffer_icap.c b/drivers/char/xilinx_hwicap/buffer_icap.c
index f577daedb630..aa7f7962a9a0 100644
--- a/drivers/char/xilinx_hwicap/buffer_icap.c
+++ b/drivers/char/xilinx_hwicap/buffer_icap.c
@@ -74,7 +74,7 @@
 /**
 * buffer_icap_get_status - Get the contents of the status register.
- * @base_address: is the base address of the device
+ * @drvdata: a pointer to the drvdata.
 *
 * The status register contains the ICAP status and the done bit.
 *
@@ -88,9 +88,9 @@
 * D1 - Always 1
 * D0 - Done bit
 **/
-static inline u32 buffer_icap_get_status(void __iomem *base_address)
+u32 buffer_icap_get_status(struct hwicap_drvdata *drvdata)
 {
-        return in_be32(base_address + XHI_STATUS_REG_OFFSET);
+        return in_be32(drvdata->base_address + XHI_STATUS_REG_OFFSET);
 }
 /**
@@ -117,20 +117,8 @@ static inline u32 buffer_icap_get_bram(void __iomem *base_address,
 **/
 static inline bool buffer_icap_busy(void __iomem *base_address)
 {
-        return (buffer_icap_get_status(base_address) & 1) == XHI_NOT_FINISHED;
+        u32 status = in_be32(base_address + XHI_STATUS_REG_OFFSET);
-}
+        return (status & 1) == XHI_NOT_FINISHED;
-/**
- * buffer_icap_busy - Return true if the icap device is not busy
- * @base_address: is the base address of the device
- *
- * The queries the low order bit of the status register, which
- * indicates whether the current configuration or readback operation
- * has completed.
- **/
-static inline bool buffer_icap_done(void __iomem *base_address)
-{
-        return (buffer_icap_get_status(base_address) & 1) == XHI_FINISHED;
 }
 /**
diff --git a/drivers/char/xilinx_hwicap/buffer_icap.h b/drivers/char/xilinx_hwicap/buffer_icap.h
index 03184959fa00..c5b1840906b2 100644
--- a/drivers/char/xilinx_hwicap/buffer_icap.h
+++ b/drivers/char/xilinx_hwicap/buffer_icap.h
@@ -44,8 +44,6 @@
 #include <asm/io.h>
 #include "xilinx_hwicap.h"
-void buffer_icap_reset(struct hwicap_drvdata *drvdata);
 /* Loads a partial bitstream from system memory. */
 int buffer_icap_set_configuration(struct hwicap_drvdata *drvdata, u32 *data,
                             u32 Size);
@@ -54,4 +52,7 @@ int buffer_icap_set_configuration(struct hwicap_drvdata *drvdata, u32 *data,
 int buffer_icap_get_configuration(struct hwicap_drvdata *drvdata, u32 *data,
                             u32 Size);
+u32 buffer_icap_get_status(struct hwicap_drvdata *drvdata);
+void buffer_icap_reset(struct hwicap_drvdata *drvdata);
 #endif
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.c b/drivers/char/xilinx_hwicap/fifo_icap.c
index 6f45dbd47125..776b50528478 100644
--- a/drivers/char/xilinx_hwicap/fifo_icap.c
+++ b/drivers/char/xilinx_hwicap/fifo_icap.c
@@ -78,13 +78,6 @@
 #define XHI_CR_READ_MASK 0x00000002 /* Read from ICAP to FIFO */
 #define XHI_CR_WRITE_MASK 0x00000001 /* Write from FIFO to ICAP */
-/* Status Register (SR) */
-#define XHI_SR_CFGERR_N_MASK 0x00000100 /* Config Error Mask */
-#define XHI_SR_DALIGN_MASK 0x00000080 /* Data Alignment Mask */
-#define XHI_SR_RIP_MASK 0x00000040 /* Read back Mask */
-#define XHI_SR_IN_ABORT_N_MASK 0x00000020 /* Select Map Abort Mask */
-#define XHI_SR_DONE_MASK 0x00000001 /* Done bit Mask  */
 #define XHI_WFO_MAX_VACANCY 1024 /* Max Write FIFO Vacancy, in words */
 #define XHI_RFO_MAX_OCCUPANCY 256 /* Max Read FIFO Occupancy, in words */
@@ -152,13 +145,35 @@ static inline void fifo_icap_start_readback(struct hwicap_drvdata *drvdata)
 }
 /**
+ * fifo_icap_get_status - Get the contents of the status register.
+ * @drvdata: a pointer to the drvdata.
+ *
+ * The status register contains the ICAP status and the done bit.
+ *
+ * D8 - cfgerr
+ * D7 - dalign
+ * D6 - rip
+ * D5 - in_abort_l
+ * D4 - Always 1
+ * D3 - Always 1
+ * D2 - Always 1
+ * D1 - Always 1
+ * D0 - Done bit
+ **/
+u32 fifo_icap_get_status(struct hwicap_drvdata *drvdata)
+{
+        u32 status = in_be32(drvdata->base_address + XHI_SR_OFFSET);
+        dev_dbg(drvdata->dev, "Getting status = %x\n", status);
+        return status;
+}
+/**
 * fifo_icap_busy - Return true if the ICAP is still processing a transaction.
 * @drvdata: a pointer to the drvdata.
 **/
 static inline u32 fifo_icap_busy(struct hwicap_drvdata *drvdata)
 {
        u32 status = in_be32(drvdata->base_address + XHI_SR_OFFSET);
-        dev_dbg(drvdata->dev, "Getting status = %x\n", status);
        return (status & XHI_SR_DONE_MASK) ? 0 : 1;
 }
diff --git a/drivers/char/xilinx_hwicap/fifo_icap.h b/drivers/char/xilinx_hwicap/fifo_icap.h
index 4d3068dd0405..ffabd3ba2bd8 100644
--- a/drivers/char/xilinx_hwicap/fifo_icap.h
+++ b/drivers/char/xilinx_hwicap/fifo_icap.h
@@ -56,6 +56,7 @@ int fifo_icap_set_configuration(
                u32 *FrameBuffer,
                u32 NumWords);
+u32 fifo_icap_get_status(struct hwicap_drvdata *drvdata);
 void fifo_icap_reset(struct hwicap_drvdata *drvdata);
 void fifo_icap_flush_fifo(struct hwicap_drvdata *drvdata);
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 2284fa2a5a57..016f90567a52 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -36,7 +36,7 @@
 *****************************************************************************/
 /*
- * This is the code behind /dev/xilinx_icap -- it allows a user-space
+ * This is the code behind /dev/icap* -- it allows a user-space
 * application to use the Xilinx ICAP subsystem.
 *
 * The following operations are possible:
@@ -67,7 +67,7 @@
 * user-space application code that uses this device.  The simplest
 * way to use this interface is simply:
 *
- * cp foo.bit /dev/xilinx_icap
+ * cp foo.bit /dev/icap0
 *
 * Note that unless foo.bit is an appropriately constructed partial
 * bitstream, this has a high likelyhood of overwriting the design
@@ -105,18 +105,14 @@
 #include "buffer_icap.h"
 #include "fifo_icap.h"
-#define DRIVER_NAME "xilinx_icap"
+#define DRIVER_NAME "icap"
 #define HWICAP_REGS   (0x10000)
-/* dynamically allocate device number */
+#define XHWICAP_MAJOR 259
-static int xhwicap_major;
+#define XHWICAP_MINOR 0
-static int xhwicap_minor;
 #define HWICAP_DEVICES 1
-module_param(xhwicap_major, int, S_IRUGO);
-module_param(xhwicap_minor, int, S_IRUGO);
 /* An array, which is set to true when the device is registered. */
 static bool probed_devices[HWICAP_DEVICES];
 static struct mutex icap_sem;
@@ -250,8 +246,26 @@ static int hwicap_get_configuration_register(struct hwicap_drvdata *drvdata,
         * Create the data to be written to the ICAP.
         */
        buffer[index++] = XHI_DUMMY_PACKET;
+        buffer[index++] = XHI_NOOP_PACKET;
        buffer[index++] = XHI_SYNC_PACKET;
        buffer[index++] = XHI_NOOP_PACKET;
+        buffer[index++] = XHI_NOOP_PACKET;
+        /*
+         * Write the data to the FIFO and initiate the transfer of data present
+         * in the FIFO to the ICAP device.
+         */
+        status = drvdata->config->set_configuration(drvdata,
+                                                    &buffer[0], index);
+        if (status)
+                return status;
+        /* If the syncword was not found, then we need to start over. */
+        status = drvdata->config->get_status(drvdata);
+        if ((status & XHI_SR_DALIGN_MASK) != XHI_SR_DALIGN_MASK)
+                return -EIO;
+        index = 0;
        buffer[index++] = hwicap_type_1_read(reg) | 1;
        buffer[index++] = XHI_NOOP_PACKET;
        buffer[index++] = XHI_NOOP_PACKET;
@@ -587,7 +601,7 @@ static int __devinit hwicap_setup(struct device *dev, int id,
        probed_devices[id] = 1;
        mutex_unlock(&icap_sem);
-        devt = MKDEV(xhwicap_major, xhwicap_minor + id);
+        devt = MKDEV(XHWICAP_MAJOR, XHWICAP_MINOR + id);
        drvdata = kzalloc(sizeof(struct hwicap_drvdata), GFP_KERNEL);
        if (!drvdata) {
@@ -664,12 +678,14 @@ static int __devinit hwicap_setup(struct device *dev, int id,
 static struct hwicap_driver_config buffer_icap_config = {
        .get_configuration = buffer_icap_get_configuration,
        .set_configuration = buffer_icap_set_configuration,
+        .get_status = buffer_icap_get_status,
        .reset = buffer_icap_reset,
 };
 static struct hwicap_driver_config fifo_icap_config = {
        .get_configuration = fifo_icap_get_configuration,
        .set_configuration = fifo_icap_set_configuration,
+        .get_status = fifo_icap_get_status,
        .reset = fifo_icap_reset,
 };
@@ -690,7 +706,7 @@ static int __devexit hwicap_remove(struct device *dev)
        dev_set_drvdata(dev, NULL);
        mutex_lock(&icap_sem);
-        probed_devices[MINOR(dev->devt)-xhwicap_minor] = 0;
+        probed_devices[MINOR(dev->devt)-XHWICAP_MINOR] = 0;
        mutex_unlock(&icap_sem);
        return 0;               /* success */
 }
@@ -830,23 +846,12 @@ static int __init hwicap_module_init(void)
        icap_class = class_create(THIS_MODULE, "xilinx_config");
        mutex_init(&icap_sem);
-        if (xhwicap_major) {
+        devt = MKDEV(XHWICAP_MAJOR, XHWICAP_MINOR);
-                devt = MKDEV(xhwicap_major, xhwicap_minor);
+        retval = register_chrdev_region(devt,
-                retval = register_chrdev_region(
+                                        HWICAP_DEVICES,
-                                devt,
+                                        DRIVER_NAME);
-                                HWICAP_DEVICES,
+        if (retval < 0)
-                                DRIVER_NAME);
+                return retval;
-                if (retval < 0)
-                        return retval;
-        } else {
-                retval = alloc_chrdev_region(&devt,
-                                xhwicap_minor,
-                                HWICAP_DEVICES,
-                                DRIVER_NAME);
-                if (retval < 0)
-                        return retval;
-                xhwicap_major = MAJOR(devt);
-        }
        retval = platform_driver_register(&hwicap_platform_driver);
@@ -871,7 +876,7 @@ static int __init hwicap_module_init(void)
 static void __exit hwicap_module_cleanup(void)
 {
-        dev_t devt = MKDEV(xhwicap_major, xhwicap_minor);
+        dev_t devt = MKDEV(XHWICAP_MAJOR, XHWICAP_MINOR);
        class_destroy(icap_class);
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.h b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
index 405fee7e189b..1f9c8b082dbe 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.h
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.h
@@ -65,10 +65,27 @@ struct hwicap_drvdata {
 };
 struct hwicap_driver_config {
+        /* Read configuration data given by size into the data buffer.
+           Return 0 if successful. */
        int (*get_configuration)(struct hwicap_drvdata *drvdata, u32 *data,
                        u32 size);
+        /* Write configuration data given by size from the data buffer.
+           Return 0 if successful. */
        int (*set_configuration)(struct hwicap_drvdata *drvdata, u32 *data,
                        u32 size);
+        /* Get the status register, bit pattern given by:
+         * D8 - 0 = configuration error
+         * D7 - 1 = alignment found
+         * D6 - 1 = readback in progress
+         * D5 - 0 = abort in progress
+         * D4 - Always 1
+         * D3 - Always 1
+         * D2 - Always 1
+         * D1 - Always 1
+         * D0 - 1 = operation completed
+         */
+        u32 (*get_status)(struct hwicap_drvdata *drvdata);
+        /* Reset the hw */
        void (*reset)(struct hwicap_drvdata *drvdata);
 };
@@ -163,6 +180,13 @@ struct config_registers {
 /* Constant to use for CRC check when CRC has been disabled */
 #define XHI_DISABLED_AUTO_CRC       0x0000DEFCUL
+/* Meanings of the bits returned by get_status */
+#define XHI_SR_CFGERR_N_MASK 0x00000100 /* Config Error Mask */
+#define XHI_SR_DALIGN_MASK 0x00000080 /* Data Alignment Mask */
+#define XHI_SR_RIP_MASK 0x00000040 /* Read back Mask */
+#define XHI_SR_IN_ABORT_N_MASK 0x00000020 /* Select Map Abort Mask */
+#define XHI_SR_DONE_MASK 0x00000001 /* Done bit Mask  */
 /**
 * hwicap_type_1_read - Generates a Type 1 read packet header.
 * @reg: is the address of the register to be read back.
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 3b1ea321dc05..4b442739e7bf 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -218,7 +218,8 @@ obj-$(CONFIG_SMC911X) += smc911x.o
 obj-$(CONFIG_BFIN_MAC) += bfin_mac.o
 obj-$(CONFIG_DM9000) += dm9000.o
 obj-$(CONFIG_FEC_8XX) += fec_8xx/
-obj-$(CONFIG_PASEMI_MAC) += pasemi_mac.o
+obj-$(CONFIG_PASEMI_MAC) += pasemi_mac_driver.o
+pasemi_mac_driver-objs := pasemi_mac.o pasemi_mac_ethtool.o
 obj-$(CONFIG_MLX4_CORE) += mlx4/
 obj-$(CONFIG_ENC28J60) += enc28j60.o
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 2e39e0285d8f..c50f0f4de6d8 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -55,15 +55,10 @@
 * - Multiqueue RX/TX
 */
-/* Must be a power of two */
-#define RX_RING_SIZE 2048
-#define TX_RING_SIZE 4096
 #define LRO_MAX_AGGR 64
 #define PE_MIN_MTU      64
-#define PE_MAX_MTU      1500
+#define PE_MAX_MTU      9000
 #define PE_DEF_MTU      ETH_DATA_LEN
 #define DEFAULT_MSG_ENABLE        \
@@ -76,16 +71,6 @@
         NETIF_MSG_RX_ERR       | \
         NETIF_MSG_TX_ERR)
-#define TX_DESC(tx, num)        ((tx)->chan.ring_virt[(num) & (TX_RING_SIZE-1)])
-#define TX_DESC_INFO(tx, num)   ((tx)->ring_info[(num) & (TX_RING_SIZE-1)])
-#define RX_DESC(rx, num)        ((rx)->chan.ring_virt[(num) & (RX_RING_SIZE-1)])
-#define RX_DESC_INFO(rx, num)   ((rx)->ring_info[(num) & (RX_RING_SIZE-1)])
-#define RX_BUFF(rx, num)        ((rx)->buffers[(num) & (RX_RING_SIZE-1)])
-#define RING_USED(ring)         (((ring)->next_to_fill - (ring)->next_to_clean) \
-                                 & ((ring)->size - 1))
-#define RING_AVAIL(ring)        ((ring->size) - RING_USED(ring))
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR ("Olof Johansson <olof@lixom.net>");
 MODULE_DESCRIPTION("PA Semi PWRficient Ethernet driver");
@@ -94,6 +79,8 @@ static int debug = -1;	/* -1 == use DEFAULT_MSG_ENABLE as value */
 module_param(debug, int, 0);
 MODULE_PARM_DESC(debug, "PA Semi MAC bitmapped debugging message enable value");
+extern const struct ethtool_ops pasemi_mac_ethtool_ops;
 static int translation_enabled(void)
 {
 #if defined(CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE)
@@ -322,6 +309,103 @@ static int pasemi_mac_unmap_tx_skb(struct pasemi_mac *mac,
        return (nfrags + 3) & ~1;
 }
+static struct pasemi_mac_csring *pasemi_mac_setup_csring(struct pasemi_mac *mac)
+{
+        struct pasemi_mac_csring *ring;
+        u32 val;
+        unsigned int cfg;
+        int chno;
+        ring = pasemi_dma_alloc_chan(TXCHAN, sizeof(struct pasemi_mac_csring),
+                                       offsetof(struct pasemi_mac_csring, chan));
+        if (!ring) {
+                dev_err(&mac->pdev->dev, "Can't allocate checksum channel\n");
+                goto out_chan;
+        }
+        chno = ring->chan.chno;
+        ring->size = CS_RING_SIZE;
+        ring->next_to_fill = 0;
+        /* Allocate descriptors */
+        if (pasemi_dma_alloc_ring(&ring->chan, CS_RING_SIZE))
+                goto out_ring_desc;
+        write_dma_reg(PAS_DMA_TXCHAN_BASEL(chno),
+                      PAS_DMA_TXCHAN_BASEL_BRBL(ring->chan.ring_dma));
+        val = PAS_DMA_TXCHAN_BASEU_BRBH(ring->chan.ring_dma >> 32);
+        val |= PAS_DMA_TXCHAN_BASEU_SIZ(CS_RING_SIZE >> 3);
+        write_dma_reg(PAS_DMA_TXCHAN_BASEU(chno), val);
+        ring->events[0] = pasemi_dma_alloc_flag();
+        ring->events[1] = pasemi_dma_alloc_flag();
+        if (ring->events[0] < 0 || ring->events[1] < 0)
+                goto out_flags;
+        pasemi_dma_clear_flag(ring->events[0]);
+        pasemi_dma_clear_flag(ring->events[1]);
+        ring->fun = pasemi_dma_alloc_fun();
+        if (ring->fun < 0)
+                goto out_fun;
+        cfg = PAS_DMA_TXCHAN_CFG_TY_FUNC | PAS_DMA_TXCHAN_CFG_UP |
+              PAS_DMA_TXCHAN_CFG_TATTR(ring->fun) |
+              PAS_DMA_TXCHAN_CFG_LPSQ | PAS_DMA_TXCHAN_CFG_LPDQ;
+        if (translation_enabled())
+                cfg |= PAS_DMA_TXCHAN_CFG_TRD | PAS_DMA_TXCHAN_CFG_TRR;
+        write_dma_reg(PAS_DMA_TXCHAN_CFG(chno), cfg);
+        /* enable channel */
+        pasemi_dma_start_chan(&ring->chan, PAS_DMA_TXCHAN_TCMDSTA_SZ |
+                                           PAS_DMA_TXCHAN_TCMDSTA_DB |
+                                           PAS_DMA_TXCHAN_TCMDSTA_DE |
+                                           PAS_DMA_TXCHAN_TCMDSTA_DA);
+        return ring;
+out_fun:
+out_flags:
+        if (ring->events[0] >= 0)
+                pasemi_dma_free_flag(ring->events[0]);
+        if (ring->events[1] >= 0)
+                pasemi_dma_free_flag(ring->events[1]);
+        pasemi_dma_free_ring(&ring->chan);
+out_ring_desc:
+        pasemi_dma_free_chan(&ring->chan);
+out_chan:
+        return NULL;
+}
+static void pasemi_mac_setup_csrings(struct pasemi_mac *mac)
+{
+        int i;
+        mac->cs[0] = pasemi_mac_setup_csring(mac);
+        if (mac->type == MAC_TYPE_XAUI)
+                mac->cs[1] = pasemi_mac_setup_csring(mac);
+        else
+                mac->cs[1] = 0;
+        for (i = 0; i < MAX_CS; i++)
+                if (mac->cs[i])
+                        mac->num_cs++;
+}
+static void pasemi_mac_free_csring(struct pasemi_mac_csring *csring)
+{
+        pasemi_dma_stop_chan(&csring->chan);
+        pasemi_dma_free_flag(csring->events[0]);
+        pasemi_dma_free_flag(csring->events[1]);
+        pasemi_dma_free_ring(&csring->chan);
+        pasemi_dma_free_chan(&csring->chan);
+}
 static int pasemi_mac_setup_rx_resources(const struct net_device *dev)
 {
        struct pasemi_mac_rxring *ring;
@@ -445,7 +529,7 @@ pasemi_mac_setup_tx_resources(const struct net_device *dev)
        cfg = PAS_DMA_TXCHAN_CFG_TY_IFACE |
              PAS_DMA_TXCHAN_CFG_TATTR(mac->dma_if) |
              PAS_DMA_TXCHAN_CFG_UP |
-              PAS_DMA_TXCHAN_CFG_WT(2);
+              PAS_DMA_TXCHAN_CFG_WT(4);
        if (translation_enabled())
                cfg |= PAS_DMA_TXCHAN_CFG_TRD | PAS_DMA_TXCHAN_CFG_TRR;
@@ -810,13 +894,21 @@ restart:
                u64 mactx = TX_DESC(txring, i);
                struct sk_buff *skb;
-                skb = TX_DESC_INFO(txring, i+1).skb;
-                nr_frags = TX_DESC_INFO(txring, i).dma;
                if ((mactx  & XCT_MACTX_E) ||
                    (*chan->status & PAS_STATUS_ERROR))
                        pasemi_mac_tx_error(mac, mactx);
+                /* Skip over control descriptors */
+                if (!(mactx & XCT_MACTX_LLEN_M)) {
+                        TX_DESC(txring, i) = 0;
+                        TX_DESC(txring, i+1) = 0;
+                        buf_count = 2;
+                        continue;
+                }
+                skb = TX_DESC_INFO(txring, i+1).skb;
+                nr_frags = TX_DESC_INFO(txring, i).dma;
                if (unlikely(mactx & XCT_MACTX_O))
                        /* Not yet transmitted */
                        break;
@@ -1041,13 +1133,7 @@ static int pasemi_mac_open(struct net_device *dev)
 {
        struct pasemi_mac *mac = netdev_priv(dev);
        unsigned int flags;
-        int ret;
+        int i, ret;
-        /* enable rx section */
-        write_dma_reg(PAS_DMA_COM_RXCMD, PAS_DMA_COM_RXCMD_EN);
-        /* enable tx section */
-        write_dma_reg(PAS_DMA_COM_TXCMD, PAS_DMA_COM_TXCMD_EN);
        flags = PAS_MAC_CFG_TXP_FCE | PAS_MAC_CFG_TXP_FPC(3) |
                PAS_MAC_CFG_TXP_SL(3) | PAS_MAC_CFG_TXP_COB(0xf) |
@@ -1064,6 +1150,16 @@ static int pasemi_mac_open(struct net_device *dev)
        if (!mac->tx)
                goto out_tx_ring;
+        if (dev->mtu > 1500) {
+                pasemi_mac_setup_csrings(mac);
+                if (!mac->num_cs)
+                        goto out_tx_ring;
+        }
+        /* Zero out rmon counters */
+        for (i = 0; i < 32; i++)
+                write_mac_reg(mac, PAS_MAC_RMON(i), 0);
        /* 0x3ff with 33MHz clock is about 31us */
        write_iob_reg(PAS_IOB_DMA_COM_TIMEOUTCFG,
                      PAS_IOB_DMA_COM_TIMEOUTCFG_TCNT(0x3ff));
@@ -1247,7 +1343,7 @@ static int pasemi_mac_close(struct net_device *dev)
 {
        struct pasemi_mac *mac = netdev_priv(dev);
        unsigned int sta;
-        int rxch, txch;
+        int rxch, txch, i;
        rxch = rx_ring(mac)->chan.chno;
        txch = tx_ring(mac)->chan.chno;
@@ -1292,6 +1388,9 @@ static int pasemi_mac_close(struct net_device *dev)
        free_irq(mac->tx->chan.irq, mac->tx);
        free_irq(mac->rx->chan.irq, mac->rx);
+        for (i = 0; i < mac->num_cs; i++)
+                pasemi_mac_free_csring(mac->cs[i]);
        /* Free resources */
        pasemi_mac_free_rx_resources(mac);
        pasemi_mac_free_tx_resources(mac);
@@ -1299,35 +1398,113 @@ static int pasemi_mac_close(struct net_device *dev)
        return 0;
 }
+static void pasemi_mac_queue_csdesc(const struct sk_buff *skb,
+                                    const dma_addr_t *map,
+                                    const unsigned int *map_size,
+                                    struct pasemi_mac_txring *txring,
+                                    struct pasemi_mac_csring *csring)
+{
+        u64 fund;
+        dma_addr_t cs_dest;
+        const int nh_off = skb_network_offset(skb);
+        const int nh_len = skb_network_header_len(skb);
+        const int nfrags = skb_shinfo(skb)->nr_frags;
+        int cs_size, i, fill, hdr, cpyhdr, evt;
+        dma_addr_t csdma;
+        fund = XCT_FUN_ST | XCT_FUN_RR_8BRES |
+               XCT_FUN_O | XCT_FUN_FUN(csring->fun) |
+               XCT_FUN_CRM_SIG | XCT_FUN_LLEN(skb->len - nh_off) |
+               XCT_FUN_SHL(nh_len >> 2) | XCT_FUN_SE;
+        switch (ip_hdr(skb)->protocol) {
+        case IPPROTO_TCP:
+                fund |= XCT_FUN_SIG_TCP4;
+                /* TCP checksum is 16 bytes into the header */
+                cs_dest = map[0] + skb_transport_offset(skb) + 16;
+                break;
+        case IPPROTO_UDP:
+                fund |= XCT_FUN_SIG_UDP4;
+                /* UDP checksum is 6 bytes into the header */
+                cs_dest = map[0] + skb_transport_offset(skb) + 6;
+                break;
+        default:
+                BUG();
+        }
+        /* Do the checksum offloaded */
+        fill = csring->next_to_fill;
+        hdr = fill;
+        CS_DESC(csring, fill++) = fund;
+        /* Room for 8BRES. Checksum result is really 2 bytes into it */
+        csdma = csring->chan.ring_dma + (fill & (CS_RING_SIZE-1)) * 8 + 2;
+        CS_DESC(csring, fill++) = 0;
+        CS_DESC(csring, fill) = XCT_PTR_LEN(map_size[0]-nh_off) | XCT_PTR_ADDR(map[0]+nh_off);
+        for (i = 1; i <= nfrags; i++)
+                CS_DESC(csring, fill+i) = XCT_PTR_LEN(map_size[i]) | XCT_PTR_ADDR(map[i]);
+        fill += i;
+        if (fill & 1)
+                fill++;
+        /* Copy the result into the TCP packet */
+        cpyhdr = fill;
+        CS_DESC(csring, fill++) = XCT_FUN_O | XCT_FUN_FUN(csring->fun) |
+                                  XCT_FUN_LLEN(2) | XCT_FUN_SE;
+        CS_DESC(csring, fill++) = XCT_PTR_LEN(2) | XCT_PTR_ADDR(cs_dest) | XCT_PTR_T;
+        CS_DESC(csring, fill++) = XCT_PTR_LEN(2) | XCT_PTR_ADDR(csdma);
+        fill++;
+        evt = !csring->last_event;
+        csring->last_event = evt;
+        /* Event handshaking with MAC TX */
+        CS_DESC(csring, fill++) = CTRL_CMD_T | CTRL_CMD_META_EVT | CTRL_CMD_O |
+                                  CTRL_CMD_ETYPE_SET | CTRL_CMD_REG(csring->events[evt]);
+        CS_DESC(csring, fill++) = 0;
+        CS_DESC(csring, fill++) = CTRL_CMD_T | CTRL_CMD_META_EVT | CTRL_CMD_O |
+                                  CTRL_CMD_ETYPE_WCLR | CTRL_CMD_REG(csring->events[!evt]);
+        CS_DESC(csring, fill++) = 0;
+        csring->next_to_fill = fill & (CS_RING_SIZE-1);
+        cs_size = fill - hdr;
+        write_dma_reg(PAS_DMA_TXCHAN_INCR(csring->chan.chno), (cs_size) >> 1);
+        /* TX-side event handshaking */
+        fill = txring->next_to_fill;
+        TX_DESC(txring, fill++) = CTRL_CMD_T | CTRL_CMD_META_EVT | CTRL_CMD_O |
+                                  CTRL_CMD_ETYPE_WSET | CTRL_CMD_REG(csring->events[evt]);
+        TX_DESC(txring, fill++) = 0;
+        TX_DESC(txring, fill++) = CTRL_CMD_T | CTRL_CMD_META_EVT | CTRL_CMD_O |
+                                  CTRL_CMD_ETYPE_CLR | CTRL_CMD_REG(csring->events[!evt]);
+        TX_DESC(txring, fill++) = 0;
+        txring->next_to_fill = fill;
+        write_dma_reg(PAS_DMA_TXCHAN_INCR(txring->chan.chno), 2);
+        return;
+}
 static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
 {
-        struct pasemi_mac *mac = netdev_priv(dev);
+        struct pasemi_mac * const mac = netdev_priv(dev);
-        struct pasemi_mac_txring *txring;
+        struct pasemi_mac_txring * const txring = tx_ring(mac);
-        u64 dflags, mactx;
+        struct pasemi_mac_csring *csring;
+        u64 dflags = 0;
+        u64 mactx;
        dma_addr_t map[MAX_SKB_FRAGS+1];
        unsigned int map_size[MAX_SKB_FRAGS+1];
        unsigned long flags;
        int i, nfrags;
        int fill;
+        const int nh_off = skb_network_offset(skb);
+        const int nh_len = skb_network_header_len(skb);
-        dflags = XCT_MACTX_O | XCT_MACTX_ST | XCT_MACTX_CRC_PAD;
+        prefetch(&txring->ring_info);
-        if (skb->ip_summed == CHECKSUM_PARTIAL) {
-                const unsigned char *nh = skb_network_header(skb);
-                switch (ip_hdr(skb)->protocol) {
+        dflags = XCT_MACTX_O | XCT_MACTX_ST | XCT_MACTX_CRC_PAD;
-                case IPPROTO_TCP:
-                        dflags |= XCT_MACTX_CSUM_TCP;
-                        dflags |= XCT_MACTX_IPH(skb_network_header_len(skb) >> 2);
-                        dflags |= XCT_MACTX_IPO(nh - skb->data);
-                        break;
-                case IPPROTO_UDP:
-                        dflags |= XCT_MACTX_CSUM_UDP;
-                        dflags |= XCT_MACTX_IPH(skb_network_header_len(skb) >> 2);
-                        dflags |= XCT_MACTX_IPO(nh - skb->data);
-                        break;
-                }
-        }
        nfrags = skb_shinfo(skb)->nr_frags;
@@ -1350,24 +1527,46 @@ static int pasemi_mac_start_tx(struct sk_buff *skb, struct net_device *dev)
                }
        }
-        mactx = dflags | XCT_MACTX_LLEN(skb->len);
+        if (skb->ip_summed == CHECKSUM_PARTIAL && skb->len <= 1540) {
+                switch (ip_hdr(skb)->protocol) {
+                case IPPROTO_TCP:
+                        dflags |= XCT_MACTX_CSUM_TCP;
+                        dflags |= XCT_MACTX_IPH(nh_len >> 2);
+                        dflags |= XCT_MACTX_IPO(nh_off);
+                        break;
+                case IPPROTO_UDP:
+                        dflags |= XCT_MACTX_CSUM_UDP;
+                        dflags |= XCT_MACTX_IPH(nh_len >> 2);
+                        dflags |= XCT_MACTX_IPO(nh_off);
+                        break;
+                default:
+                        WARN_ON(1);
+                }
+        }
-        txring = tx_ring(mac);
+        mactx = dflags | XCT_MACTX_LLEN(skb->len);
        spin_lock_irqsave(&txring->lock, flags);
-        fill = txring->next_to_fill;
        /* Avoid stepping on the same cache line that the DMA controller
         * is currently about to send, so leave at least 8 words available.
         * Total free space needed is mactx + fragments + 8
         */
-        if (RING_AVAIL(txring) < nfrags + 10) {
+        if (RING_AVAIL(txring) < nfrags + 14) {
                /* no room -- stop the queue and wait for tx intr */
                netif_stop_queue(dev);
                goto out_err;
        }
+        /* Queue up checksum + event descriptors, if needed */
+        if (mac->num_cs && skb->ip_summed == CHECKSUM_PARTIAL && skb->len > 1540) {
+                csring = mac->cs[mac->last_cs];
+                mac->last_cs = (mac->last_cs + 1) % mac->num_cs;
+                pasemi_mac_queue_csdesc(skb, map, map_size, txring, csring);
+        }
+        fill = txring->next_to_fill;
        TX_DESC(txring, fill) = mactx;
        TX_DESC_INFO(txring, fill).dma = nfrags;
        fill++;
@@ -1445,8 +1644,9 @@ static int pasemi_mac_change_mtu(struct net_device *dev, int new_mtu)
 {
        struct pasemi_mac *mac = netdev_priv(dev);
        unsigned int reg;
-        unsigned int rcmdsta;
+        unsigned int rcmdsta = 0;
        int running;
+        int ret = 0;
        if (new_mtu < PE_MIN_MTU || new_mtu > PE_MAX_MTU)
                return -EINVAL;
@@ -1468,6 +1668,16 @@ static int pasemi_mac_change_mtu(struct net_device *dev, int new_mtu)
                pasemi_mac_pause_rxint(mac);
                pasemi_mac_clean_rx(rx_ring(mac), RX_RING_SIZE);
                pasemi_mac_free_rx_buffers(mac);
+        }
+        /* Setup checksum channels if large MTU and none already allocated */
+        if (new_mtu > 1500 && !mac->num_cs) {
+                pasemi_mac_setup_csrings(mac);
+                if (!mac->num_cs) {
+                        ret = -ENOMEM;
+                        goto out;
+                }
        }
        /* Change maxf, i.e. what size frames are accepted.
@@ -1482,6 +1692,7 @@ static int pasemi_mac_change_mtu(struct net_device *dev, int new_mtu)
        /* MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
        mac->bufsz = new_mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128;
+out:
        if (running) {
                write_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if),
                              rcmdsta | PAS_DMA_RXINT_RCMDSTA_EN);
@@ -1494,7 +1705,7 @@ static int pasemi_mac_change_mtu(struct net_device *dev, int new_mtu)
                pasemi_mac_intf_enable(mac);
        }
-        return 0;
+        return ret;
 }
 static int __devinit
@@ -1528,7 +1739,7 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        netif_napi_add(dev, &mac->napi, pasemi_mac_poll, 64);
        dev->features = NETIF_F_IP_CSUM | NETIF_F_LLTX | NETIF_F_SG |
-                        NETIF_F_HIGHDMA;
+                        NETIF_F_HIGHDMA | NETIF_F_GSO;
        mac->lro_mgr.max_aggr = LRO_MAX_AGGR;
        mac->lro_mgr.max_desc = MAX_LRO_DESCRIPTORS;
@@ -1590,6 +1801,7 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        mac->bufsz = dev->mtu + ETH_HLEN + ETH_FCS_LEN + LOCAL_SKB_ALIGN + 128;
        dev->change_mtu = pasemi_mac_change_mtu;
+        dev->ethtool_ops = &pasemi_mac_ethtool_ops;
        if (err)
                goto out;
diff --git a/drivers/net/pasemi_mac.h b/drivers/net/pasemi_mac.h
index 99e7b9329a6f..1a115ec60b53 100644
--- a/drivers/net/pasemi_mac.h
+++ b/drivers/net/pasemi_mac.h
@@ -26,7 +26,14 @@
 #include <linux/spinlock.h>
 #include <linux/phy.h>
+/* Must be a power of two */
+#define RX_RING_SIZE 2048
+#define TX_RING_SIZE 4096
+#define CS_RING_SIZE (TX_RING_SIZE*2)
 #define MAX_LRO_DESCRIPTORS 8
+#define MAX_CS  2
 struct pasemi_mac_txring {
        struct pasemi_dmachan chan; /* Must be first */
@@ -51,6 +58,15 @@ struct pasemi_mac_rxring {
        struct pasemi_mac *mac; /* Needed in intr handler */
 };
+struct pasemi_mac_csring {
+        struct pasemi_dmachan chan;
+        unsigned int    size;
+        unsigned int    next_to_fill;
+        int             events[2];
+        int             last_event;
+        int             fun;
+};
 struct pasemi_mac {
        struct net_device *netdev;
        struct pci_dev *pdev;
@@ -60,10 +76,12 @@ struct pasemi_mac {
        struct napi_struct napi;
        int             bufsz; /* RX ring buffer size */
+        int             last_cs;
+        int             num_cs;
+        u32             dma_if;
        u8              type;
 #define MAC_TYPE_GMAC   1
 #define MAC_TYPE_XAUI   2
-        u32     dma_if;
        u8              mac_addr[6];
@@ -74,6 +92,7 @@ struct pasemi_mac {
        struct pasemi_mac_txring *tx;
        struct pasemi_mac_rxring *rx;
+        struct pasemi_mac_csring *cs[MAX_CS];
        char            tx_irq_name[10];                /* "eth%d tx" */
        char            rx_irq_name[10];                /* "eth%d rx" */
        int     link;
@@ -90,6 +109,16 @@ struct pasemi_mac_buffer {
        dma_addr_t      dma;
 };
+#define TX_DESC(tx, num)        ((tx)->chan.ring_virt[(num) & (TX_RING_SIZE-1)])
+#define TX_DESC_INFO(tx, num)   ((tx)->ring_info[(num) & (TX_RING_SIZE-1)])
+#define RX_DESC(rx, num)        ((rx)->chan.ring_virt[(num) & (RX_RING_SIZE-1)])
+#define RX_DESC_INFO(rx, num)   ((rx)->ring_info[(num) & (RX_RING_SIZE-1)])
+#define RX_BUFF(rx, num)        ((rx)->buffers[(num) & (RX_RING_SIZE-1)])
+#define CS_DESC(cs, num)        ((cs)->chan.ring_virt[(num) & (CS_RING_SIZE-1)])
+#define RING_USED(ring) (((ring)->next_to_fill - (ring)->next_to_clean) \
+                                & ((ring)->size - 1))
+#define RING_AVAIL(ring)        ((ring->size) - RING_USED(ring))
 /* PCI register offsets and formats */
@@ -101,6 +130,7 @@ enum {
        PAS_MAC_CFG_ADR0 = 0x8c,
        PAS_MAC_CFG_ADR1 = 0x90,
        PAS_MAC_CFG_TXP = 0x98,
+        PAS_MAC_CFG_RMON = 0x100,
        PAS_MAC_IPC_CHNL = 0x208,
 };
@@ -172,6 +202,8 @@ enum {
 #define PAS_MAC_CFG_TXP_TIFG(x)         (((x) << PAS_MAC_CFG_TXP_TIFG_S) & \
                                         PAS_MAC_CFG_TXP_TIFG_M)
+#define PAS_MAC_RMON(r)                 (0x100+(r)*4)
 #define PAS_MAC_IPC_CHNL_DCHNO_M        0x003f0000
 #define PAS_MAC_IPC_CHNL_DCHNO_S        16
 #define PAS_MAC_IPC_CHNL_DCHNO(x)       (((x) << PAS_MAC_IPC_CHNL_DCHNO_S) & \
@@ -181,4 +213,5 @@ enum {
 #define PAS_MAC_IPC_CHNL_BCH(x)         (((x) << PAS_MAC_IPC_CHNL_BCH_S) & \
                                         PAS_MAC_IPC_CHNL_BCH_M)
 #endif /* PASEMI_MAC_H */
diff --git a/drivers/net/pasemi_mac_ethtool.c b/drivers/net/pasemi_mac_ethtool.c
new file mode 100644
index 000000000000..5e8df3afea64
--- /dev/null
+++ b/drivers/net/pasemi_mac_ethtool.c
@@ -0,0 +1,159 @@
+/*
+ * Copyright (C) 2006-2008 PA Semi, Inc
+ *
+ * Ethtool hooks for the PA Semi PWRficient onchip 1G/10G Ethernet MACs
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ */
+#include <linux/netdevice.h>
+#include <linux/ethtool.h>
+#include <linux/pci.h>
+#include <linux/inet_lro.h>
+#include <asm/pasemi_dma.h>
+#include "pasemi_mac.h"
+static struct {
+        const char str[ETH_GSTRING_LEN];
+} ethtool_stats_keys[] = {
+        { "rx-drops" },
+        { "rx-bytes" },
+        { "rx-packets" },
+        { "rx-broadcast-packets" },
+        { "rx-multicast-packets" },
+        { "rx-crc-errors" },
+        { "rx-undersize-errors" },
+        { "rx-oversize-errors" },
+        { "rx-short-fragment-errors" },
+        { "rx-jabber-errors" },
+        { "rx-64-byte-packets" },
+        { "rx-65-127-byte-packets" },
+        { "rx-128-255-byte-packets" },
+        { "rx-256-511-byte-packets" },
+        { "rx-512-1023-byte-packets" },
+        { "rx-1024-1518-byte-packets" },
+        { "rx-pause-frames" },
+        { "tx-bytes" },
+        { "tx-packets" },
+        { "tx-broadcast-packets" },
+        { "tx-multicast-packets" },
+        { "tx-collisions" },
+        { "tx-late-collisions" },
+        { "tx-excessive-collisions" },
+        { "tx-crc-errors" },
+        { "tx-undersize-errors" },
+        { "tx-oversize-errors" },
+        { "tx-64-byte-packets" },
+        { "tx-65-127-byte-packets" },
+        { "tx-128-255-byte-packets" },
+        { "tx-256-511-byte-packets" },
+        { "tx-512-1023-byte-packets" },
+        { "tx-1024-1518-byte-packets" },
+};
+static int
+pasemi_mac_ethtool_get_settings(struct net_device *netdev,
+                               struct ethtool_cmd *cmd)
+{
+        struct pasemi_mac *mac = netdev_priv(netdev);
+        struct phy_device *phydev = mac->phydev;
+        return phy_ethtool_gset(phydev, cmd);
+}
+static void
+pasemi_mac_ethtool_get_drvinfo(struct net_device *netdev,
+                               struct ethtool_drvinfo *drvinfo)
+{
+        struct pasemi_mac *mac;
+        mac = netdev_priv(netdev);
+        /* clear and fill out info */
+        memset(drvinfo, 0, sizeof(struct ethtool_drvinfo));
+        strncpy(drvinfo->driver, "pasemi_mac", 12);
+        strcpy(drvinfo->version, "N/A");
+        strcpy(drvinfo->fw_version, "N/A");
+        strncpy(drvinfo->bus_info, pci_name(mac->pdev), 32);
+}
+static u32
+pasemi_mac_ethtool_get_msglevel(struct net_device *netdev)
+{
+        struct pasemi_mac *mac = netdev_priv(netdev);
+        return mac->msg_enable;
+}
+static void
+pasemi_mac_ethtool_set_msglevel(struct net_device *netdev,
+                                u32 level)
+{
+        struct pasemi_mac *mac = netdev_priv(netdev);
+        mac->msg_enable = level;
+}
+static void
+pasemi_mac_ethtool_get_ringparam(struct net_device *netdev,
+                                 struct ethtool_ringparam *ering)
+{
+        struct pasemi_mac *mac = netdev->priv;
+        ering->tx_max_pending = TX_RING_SIZE/2;
+        ering->tx_pending = RING_USED(mac->tx)/2;
+        ering->rx_max_pending = RX_RING_SIZE/4;
+        ering->rx_pending = RING_USED(mac->rx)/4;
+}
+static int pasemi_mac_get_sset_count(struct net_device *netdev, int sset)
+{
+        switch (sset) {
+        case ETH_SS_STATS:
+                return ARRAY_SIZE(ethtool_stats_keys);
+        default:
+                return -EOPNOTSUPP;
+        }
+}
+static void pasemi_mac_get_ethtool_stats(struct net_device *netdev,
+                struct ethtool_stats *stats, u64 *data)
+{
+        struct pasemi_mac *mac = netdev->priv;
+        int i;
+        data[0] = pasemi_read_dma_reg(PAS_DMA_RXINT_RCMDSTA(mac->dma_if))
+                        >> PAS_DMA_RXINT_RCMDSTA_DROPS_S;
+        for (i = 0; i < 32; i++)
+                data[1+i] = pasemi_read_mac_reg(mac->dma_if, PAS_MAC_RMON(i));
+}
+static void pasemi_mac_get_strings(struct net_device *netdev, u32 stringset,
+                                   u8 *data)
+{
+        memcpy(data, ethtool_stats_keys, sizeof(ethtool_stats_keys));
+}
+const struct ethtool_ops pasemi_mac_ethtool_ops = {
+        .get_settings           = pasemi_mac_ethtool_get_settings,
+        .get_drvinfo            = pasemi_mac_ethtool_get_drvinfo,
+        .get_msglevel           = pasemi_mac_ethtool_get_msglevel,
+        .set_msglevel           = pasemi_mac_ethtool_set_msglevel,
+        .get_link               = ethtool_op_get_link,
+        .get_ringparam          = pasemi_mac_ethtool_get_ringparam,
+        .get_strings            = pasemi_mac_get_strings,
+        .get_sset_count         = pasemi_mac_get_sset_count,
+        .get_ethtool_stats      = pasemi_mac_get_ethtool_stats,
+};
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 7eb6e7e848f4..e365efb3c627 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -1266,6 +1266,85 @@ int gelic_net_set_rx_csum(struct net_device *netdev, u32 data)
        return 0;
 }
+static void gelic_net_get_wol(struct net_device *netdev,
+                              struct ethtool_wolinfo *wol)
+{
+        if (0 <= ps3_compare_firmware_version(2, 2, 0))
+                wol->supported = WAKE_MAGIC;
+        else
+                wol->supported = 0;
+        wol->wolopts = ps3_sys_manager_get_wol() ? wol->supported : 0;
+        memset(&wol->sopass, 0, sizeof(wol->sopass));
+}
+static int gelic_net_set_wol(struct net_device *netdev,
+                             struct ethtool_wolinfo *wol)
+{
+        int status;
+        struct gelic_card *card;
+        u64 v1, v2;
+        if (ps3_compare_firmware_version(2, 2, 0) < 0 ||
+            !capable(CAP_NET_ADMIN))
+                return -EPERM;
+        if (wol->wolopts & ~WAKE_MAGIC)
+                return -EINVAL;
+        card = netdev_card(netdev);
+        if (wol->wolopts & WAKE_MAGIC) {
+                status = lv1_net_control(bus_id(card), dev_id(card),
+                                         GELIC_LV1_SET_WOL,
+                                         GELIC_LV1_WOL_MAGIC_PACKET,
+                                         0, GELIC_LV1_WOL_MP_ENABLE,
+                                         &v1, &v2);
+                if (status) {
+                        pr_info("%s: enabling WOL failed %d\n", __func__,
+                                status);
+                        status = -EIO;
+                        goto done;
+                }
+                status = lv1_net_control(bus_id(card), dev_id(card),
+                                         GELIC_LV1_SET_WOL,
+                                         GELIC_LV1_WOL_ADD_MATCH_ADDR,
+                                         0, GELIC_LV1_WOL_MATCH_ALL,
+                                         &v1, &v2);
+                if (!status)
+                        ps3_sys_manager_set_wol(1);
+                else {
+                        pr_info("%s: enabling WOL filter failed %d\n",
+                                __func__, status);
+                        status = -EIO;
+                }
+        } else {
+                status = lv1_net_control(bus_id(card), dev_id(card),
+                                         GELIC_LV1_SET_WOL,
+                                         GELIC_LV1_WOL_MAGIC_PACKET,
+                                         0, GELIC_LV1_WOL_MP_DISABLE,
+                                         &v1, &v2);
+                if (status) {
+                        pr_info("%s: disabling WOL failed %d\n", __func__,
+                                status);
+                        status = -EIO;
+                        goto done;
+                }
+                status = lv1_net_control(bus_id(card), dev_id(card),
+                                         GELIC_LV1_SET_WOL,
+                                         GELIC_LV1_WOL_DELETE_MATCH_ADDR,
+                                         0, GELIC_LV1_WOL_MATCH_ALL,
+                                         &v1, &v2);
+                if (!status)
+                        ps3_sys_manager_set_wol(0);
+                else {
+                        pr_info("%s: removing WOL filter failed %d\n",
+                                __func__, status);
+                        status = -EIO;
+                }
+        }
+done:
+        return status;
+}
 static struct ethtool_ops gelic_ether_ethtool_ops = {
        .get_drvinfo    = gelic_net_get_drvinfo,
        .get_settings   = gelic_ether_get_settings,
@@ -1274,6 +1353,8 @@ static struct ethtool_ops gelic_ether_ethtool_ops = {
        .set_tx_csum    = ethtool_op_set_tx_csum,
        .get_rx_csum    = gelic_net_get_rx_csum,
        .set_rx_csum    = gelic_net_set_rx_csum,
+        .get_wol        = gelic_net_get_wol,
+        .set_wol        = gelic_net_set_wol,
 };
 /**
diff --git a/drivers/net/ps3_gelic_net.h b/drivers/net/ps3_gelic_net.h
index 1d39d06797e4..520f143c2c09 100644
--- a/drivers/net/ps3_gelic_net.h
+++ b/drivers/net/ps3_gelic_net.h
@@ -182,12 +182,32 @@ enum gelic_lv1_net_control_code {
        GELIC_LV1_GET_ETH_PORT_STATUS   = 2,
        GELIC_LV1_SET_NEGOTIATION_MODE  = 3,
        GELIC_LV1_GET_VLAN_ID           = 4,
+        GELIC_LV1_SET_WOL               = 5,
        GELIC_LV1_GET_CHANNEL           = 6,
        GELIC_LV1_POST_WLAN_CMD         = 9,
        GELIC_LV1_GET_WLAN_CMD_RESULT   = 10,
        GELIC_LV1_GET_WLAN_EVENT        = 11
 };
+/* for GELIC_LV1_SET_WOL */
+enum gelic_lv1_wol_command {
+        GELIC_LV1_WOL_MAGIC_PACKET      = 1,
+        GELIC_LV1_WOL_ADD_MATCH_ADDR    = 6,
+        GELIC_LV1_WOL_DELETE_MATCH_ADDR = 7,
+};
+/* for GELIC_LV1_WOL_MAGIC_PACKET */
+enum gelic_lv1_wol_mp_arg {
+        GELIC_LV1_WOL_MP_DISABLE        = 0,
+        GELIC_LV1_WOL_MP_ENABLE         = 1,
+};
+/* for GELIC_LV1_WOL_{ADD,DELETE}_MATCH_ADDR */
+enum gelic_lv1_wol_match_arg {
+        GELIC_LV1_WOL_MATCH_INDIVIDUAL  = 0,
+        GELIC_LV1_WOL_MATCH_ALL         = 1,
+};
 /* status returened from GET_ETH_PORT_STATUS */
 enum gelic_lv1_ether_port_status {
        GELIC_LV1_ETHER_LINK_UP         = 0x0000000000000001L,
diff --git a/drivers/of/base.c b/drivers/of/base.c
index 80c9deca5f35..9bd7c4a31253 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -117,6 +117,32 @@ int of_device_is_compatible(const struct device_node *device,
 EXPORT_SYMBOL(of_device_is_compatible);
 /**
+ *  of_device_is_available - check if a device is available for use
+ *
+ *  @device: Node to check for availability
+ *
+ *  Returns 1 if the status property is absent or set to "okay" or "ok",
+ *  0 otherwise
+ */
+int of_device_is_available(const struct device_node *device)
+{
+        const char *status;
+        int statlen;
+        status = of_get_property(device, "status", &statlen);
+        if (status == NULL)
+                return 1;
+        if (statlen > 0) {
+                if (!strcmp(status, "okay") || !strcmp(status, "ok"))
+                        return 1;
+        }
+        return 0;
+}
+EXPORT_SYMBOL(of_device_is_available);
+/**
 *      of_get_parent - Get a node's parent if any
 *      @node:  Node to get parent
 *
diff --git a/drivers/ps3/ps3-sys-manager.c b/drivers/ps3/ps3-sys-manager.c
index d4f6f960dd18..7605453b74fd 100644
--- a/drivers/ps3/ps3-sys-manager.c
+++ b/drivers/ps3/ps3-sys-manager.c
@@ -24,6 +24,7 @@
 #include <linux/reboot.h>
 #include <asm/firmware.h>
+#include <asm/lv1call.h>
 #include <asm/ps3.h>
 #include "vuart.h"
@@ -187,6 +188,7 @@ enum ps3_sys_manager_next_op {
 * controller, and bluetooth controller.
 * @PS3_SM_WAKE_RTC:
 * @PS3_SM_WAKE_RTC_ERROR:
+ * @PS3_SM_WAKE_W_O_L: Ether or wireless LAN.
 * @PS3_SM_WAKE_P_O_R: Power on reset.
 *
 * Additional wakeup sources when specifying PS3_SM_NEXT_OP_SYS_SHUTDOWN.
@@ -200,10 +202,19 @@ enum ps3_sys_manager_wake_source {
        PS3_SM_WAKE_DEFAULT   = 0,
        PS3_SM_WAKE_RTC       = 0x00000040,
        PS3_SM_WAKE_RTC_ERROR = 0x00000080,
+        PS3_SM_WAKE_W_O_L     = 0x00000400,
        PS3_SM_WAKE_P_O_R     = 0x80000000,
 };
 /**
+ * user_wake_sources - User specified wakeup sources.
+ *
+ * Logical OR of enum ps3_sys_manager_wake_source types.
+ */
+static u32 user_wake_sources = PS3_SM_WAKE_DEFAULT;
+/**
 * enum ps3_sys_manager_cmd - Command from system manager to guest.
 *
 * The guest completes the actions needed, then acks or naks the command via
@@ -581,6 +592,23 @@ fail_id:
        return -EIO;
 }
+static void ps3_sys_manager_fin(struct ps3_system_bus_device *dev)
+{
+        ps3_sys_manager_send_request_shutdown(dev);
+        pr_emerg("System Halted, OK to turn off power\n");
+        while (ps3_sys_manager_handle_msg(dev)) {
+                /* pause until next DEC interrupt */
+                lv1_pause(0);
+        }
+        while (1) {
+                /* pause, ignoring DEC interrupt */
+                lv1_pause(1);
+        }
+}
 /**
 * ps3_sys_manager_final_power_off - The final platform machine_power_off routine.
 *
@@ -601,13 +629,9 @@ static void ps3_sys_manager_final_power_off(struct ps3_system_bus_device *dev)
        ps3_vuart_cancel_async(dev);
        ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_SHUTDOWN,
-                PS3_SM_WAKE_DEFAULT);
+                user_wake_sources);
-        ps3_sys_manager_send_request_shutdown(dev);
-        pr_emerg("System Halted, OK to turn off power\n");
-        while (1)
+        ps3_sys_manager_fin(dev);
-                ps3_sys_manager_handle_msg(dev);
 }
 /**
@@ -638,14 +662,42 @@ static void ps3_sys_manager_final_restart(struct ps3_system_bus_device *dev)
        ps3_sys_manager_send_attr(dev, 0);
        ps3_sys_manager_send_next_op(dev, PS3_SM_NEXT_OP_SYS_REBOOT,
-                PS3_SM_WAKE_DEFAULT);
+                user_wake_sources);
-        ps3_sys_manager_send_request_shutdown(dev);
-        pr_emerg("System Halted, OK to turn off power\n");
+        ps3_sys_manager_fin(dev);
+}
+/**
+ * ps3_sys_manager_get_wol - Get wake-on-lan setting.
+ */
+int ps3_sys_manager_get_wol(void)
+{
+        pr_debug("%s:%d\n", __func__, __LINE__);
+        return (user_wake_sources & PS3_SM_WAKE_W_O_L) != 0;
+}
+EXPORT_SYMBOL_GPL(ps3_sys_manager_get_wol);
+/**
+ * ps3_sys_manager_set_wol - Set wake-on-lan setting.
+ */
+void ps3_sys_manager_set_wol(int state)
+{
+        static DEFINE_MUTEX(mutex);
+        mutex_lock(&mutex);
+        pr_debug("%s:%d: %d\n", __func__, __LINE__, state);
-        while (1)
+        if (state)
-                ps3_sys_manager_handle_msg(dev);
+                user_wake_sources |= PS3_SM_WAKE_W_O_L;
+        else
+                user_wake_sources &= ~PS3_SM_WAKE_W_O_L;
+        mutex_unlock(&mutex);
 }
+EXPORT_SYMBOL_GPL(ps3_sys_manager_set_wol);
 /**
 * ps3_sys_manager_work - Asynchronous read handler.
diff --git a/drivers/ps3/sys-manager-core.c b/drivers/ps3/sys-manager-core.c
index 31648f7d9ae1..474225852b63 100644
--- a/drivers/ps3/sys-manager-core.c
+++ b/drivers/ps3/sys-manager-core.c
@@ -19,6 +19,7 @@
 */
 #include <linux/kernel.h>
+#include <asm/lv1call.h>
 #include <asm/ps3.h>
 /**
@@ -50,10 +51,7 @@ void ps3_sys_manager_power_off(void)
        if (ps3_sys_manager_ops.power_off)
                ps3_sys_manager_ops.power_off(ps3_sys_manager_ops.dev);
-        printk(KERN_EMERG "System Halted, OK to turn off power\n");
+        ps3_sys_manager_halt();
-        local_irq_disable();
-        while (1)
-                (void)0;
 }
 void ps3_sys_manager_restart(void)
@@ -61,8 +59,14 @@ void ps3_sys_manager_restart(void)
        if (ps3_sys_manager_ops.restart)
                ps3_sys_manager_ops.restart(ps3_sys_manager_ops.dev);
-        printk(KERN_EMERG "System Halted, OK to turn off power\n");
+        ps3_sys_manager_halt();
+}
+void ps3_sys_manager_halt(void)
+{
+        pr_emerg("System Halted, OK to turn off power\n");
        local_irq_disable();
        while (1)
-                (void)0;
+                lv1_pause(1);
 }
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index c0e50a461055..8aacfb78deab 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -56,7 +56,9 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
        port->flags = UPF_SHARE_IRQ | UPF_BOOT_AUTOCONF | UPF_IOREMAP
                | UPF_FIXED_PORT;
        port->dev = &ofdev->dev;
-        port->custom_divisor = *clk / (16 * (*spd));
+        /* If current-speed was set, then try not to change it. */
+        if (spd)
+                port->custom_divisor = *clk / (16 * (*spd));
        return 0;
 }
diff --git a/include/asm-powerpc/Kbuild b/include/asm-powerpc/Kbuild
index 5f640e542475..7381916dfcbb 100644
--- a/include/asm-powerpc/Kbuild
+++ b/include/asm-powerpc/Kbuild
@@ -1,5 +1,6 @@
 include include/asm-generic/Kbuild.asm
+header-y += a.out.h
 header-y += auxvec.h
 header-y += ioctls.h
 header-y += mman.h
@@ -23,7 +24,6 @@ header-y += sigcontext.h
 header-y += statfs.h
 header-y += ps3fb.h
-unifdef-y += a.out.h
 unifdef-y += asm-compat.h
 unifdef-y += bootx.h
 unifdef-y += byteorder.h
diff --git a/include/asm-powerpc/abs_addr.h b/include/asm-powerpc/abs_addr.h
index 4aa220718b19..98324c5a8286 100644
--- a/include/asm-powerpc/abs_addr.h
+++ b/include/asm-powerpc/abs_addr.h
@@ -12,10 +12,11 @@
 * 2 of the License, or (at your option) any later version.
 */
+#include <linux/lmb.h>
 #include <asm/types.h>
 #include <asm/page.h>
 #include <asm/prom.h>
-#include <asm/lmb.h>
 #include <asm/firmware.h>
 struct mschunks_map {
diff --git a/include/asm-powerpc/cputhreads.h b/include/asm-powerpc/cputhreads.h
index 8485c28b5f47..fb11b0c459b8 100644
--- a/include/asm-powerpc/cputhreads.h
+++ b/include/asm-powerpc/cputhreads.h
@@ -35,7 +35,7 @@ static inline cpumask_t cpu_thread_mask_to_cores(cpumask_t threads)
        res = CPU_MASK_NONE;
        for (i = 0; i < NR_CPUS; i += threads_per_core) {
-                cpus_shift_right(tmp, threads_core_mask, i);
+                cpus_shift_left(tmp, threads_core_mask, i);
                if (cpus_intersects(threads, tmp))
                        cpu_set(i, res);
        }
diff --git a/include/asm-powerpc/dcr-native.h b/include/asm-powerpc/dcr-native.h
index be6c879e8760..f8398ce80372 100644
--- a/include/asm-powerpc/dcr-native.h
+++ b/include/asm-powerpc/dcr-native.h
@@ -82,6 +82,19 @@ static inline void __mtdcri(int base_addr, int base_data, int reg,
        spin_unlock_irqrestore(&dcr_ind_lock, flags);
 }
+static inline void __dcri_clrset(int base_addr, int base_data, int reg,
+                                 unsigned clr, unsigned set)
+{
+        unsigned long flags;
+        unsigned int val;
+        spin_lock_irqsave(&dcr_ind_lock, flags);
+        __mtdcr(base_addr, reg);
+        val = (__mfdcr(base_data) & ~clr) | set;
+        __mtdcr(base_data, val);
+        spin_unlock_irqrestore(&dcr_ind_lock, flags);
+}
 #define mfdcri(base, reg)       __mfdcri(DCRN_ ## base ## _CONFIG_ADDR, \
                                         DCRN_ ## base ## _CONFIG_DATA, \
                                         reg)
@@ -90,6 +103,10 @@ static inline void __mtdcri(int base_addr, int base_data, int reg,
                                         DCRN_ ## base ## _CONFIG_DATA, \
                                         reg, data)
+#define dcri_clrset(base, reg, clr, set)        __dcri_clrset(DCRN_ ## base ## _CONFIG_ADDR,    \
+                                                              DCRN_ ## base ## _CONFIG_DATA,    \
+                                                              reg, clr, set)
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_DCR_NATIVE_H */
diff --git a/include/asm-powerpc/dcr-regs.h b/include/asm-powerpc/dcr-regs.h
index 9f1fb98fcdc6..29b0ecef980a 100644
--- a/include/asm-powerpc/dcr-regs.h
+++ b/include/asm-powerpc/dcr-regs.h
@@ -68,4 +68,82 @@
 #define SDR0_UART3              0x0123
 #define SDR0_CUST0              0x4000
+/*
+ * All those DCR register addresses are offsets from the base address
+ * for the SRAM0 controller (e.g. 0x20 on 440GX). The base address is
+ * excluded here and configured in the device tree.
+ */
+#define DCRN_SRAM0_SB0CR        0x00
+#define DCRN_SRAM0_SB1CR        0x01
+#define DCRN_SRAM0_SB2CR        0x02
+#define DCRN_SRAM0_SB3CR        0x03
+#define  SRAM_SBCR_BU_MASK      0x00000180
+#define  SRAM_SBCR_BS_64KB      0x00000800
+#define  SRAM_SBCR_BU_RO        0x00000080
+#define  SRAM_SBCR_BU_RW        0x00000180
+#define DCRN_SRAM0_BEAR         0x04
+#define DCRN_SRAM0_BESR0        0x05
+#define DCRN_SRAM0_BESR1        0x06
+#define DCRN_SRAM0_PMEG         0x07
+#define DCRN_SRAM0_CID          0x08
+#define DCRN_SRAM0_REVID        0x09
+#define DCRN_SRAM0_DPC          0x0a
+#define  SRAM_DPC_ENABLE        0x80000000
+/*
+ * All those DCR register addresses are offsets from the base address
+ * for the SRAM0 controller (e.g. 0x30 on 440GX). The base address is
+ * excluded here and configured in the device tree.
+ */
+#define DCRN_L2C0_CFG           0x00
+#define  L2C_CFG_L2M            0x80000000
+#define  L2C_CFG_ICU            0x40000000
+#define  L2C_CFG_DCU            0x20000000
+#define  L2C_CFG_DCW_MASK       0x1e000000
+#define  L2C_CFG_TPC            0x01000000
+#define  L2C_CFG_CPC            0x00800000
+#define  L2C_CFG_FRAN           0x00200000
+#define  L2C_CFG_SS_MASK        0x00180000
+#define  L2C_CFG_SS_256         0x00000000
+#define  L2C_CFG_CPIM           0x00040000
+#define  L2C_CFG_TPIM           0x00020000
+#define  L2C_CFG_LIM            0x00010000
+#define  L2C_CFG_PMUX_MASK      0x00007000
+#define  L2C_CFG_PMUX_SNP       0x00000000
+#define  L2C_CFG_PMUX_IF        0x00001000
+#define  L2C_CFG_PMUX_DF        0x00002000
+#define  L2C_CFG_PMUX_DS        0x00003000
+#define  L2C_CFG_PMIM           0x00000800
+#define  L2C_CFG_TPEI           0x00000400
+#define  L2C_CFG_CPEI           0x00000200
+#define  L2C_CFG_NAM            0x00000100
+#define  L2C_CFG_SMCM           0x00000080
+#define  L2C_CFG_NBRM           0x00000040
+#define  L2C_CFG_RDBW           0x00000008      /* only 460EX/GT */
+#define DCRN_L2C0_CMD           0x01
+#define  L2C_CMD_CLR            0x80000000
+#define  L2C_CMD_DIAG           0x40000000
+#define  L2C_CMD_INV            0x20000000
+#define  L2C_CMD_CCP            0x10000000
+#define  L2C_CMD_CTE            0x08000000
+#define  L2C_CMD_STRC           0x04000000
+#define  L2C_CMD_STPC           0x02000000
+#define  L2C_CMD_RPMC           0x01000000
+#define  L2C_CMD_HCC            0x00800000
+#define DCRN_L2C0_ADDR          0x02
+#define DCRN_L2C0_DATA          0x03
+#define DCRN_L2C0_SR            0x04
+#define  L2C_SR_CC              0x80000000
+#define  L2C_SR_CPE             0x40000000
+#define  L2C_SR_TPE             0x20000000
+#define  L2C_SR_LRU             0x10000000
+#define  L2C_SR_PCS             0x08000000
+#define DCRN_L2C0_REVID         0x05
+#define DCRN_L2C0_SNP0          0x06
+#define DCRN_L2C0_SNP1          0x07
+#define  L2C_SNP_BA_MASK        0xffff0000
+#define  L2C_SNP_SSR_MASK       0x0000f000
+#define  L2C_SNP_SSR_32G        0x0000f000
+#define  L2C_SNP_ESR            0x00000800
 #endif /* __DCR_REGS_H__ */
diff --git a/include/asm-powerpc/lmb.h b/include/asm-powerpc/lmb.h
index 5d1dc48a0bb8..028184b6a162 100644
--- a/include/asm-powerpc/lmb.h
+++ b/include/asm-powerpc/lmb.h
@@ -1,81 +1,15 @@
 #ifndef _ASM_POWERPC_LMB_H
 #define _ASM_POWERPC_LMB_H
-#ifdef __KERNEL__
-/*
+#include <asm/udbg.h>
- * Definitions for talking to the Open Firmware PROM on
- * Power Macintosh computers.
- *
- * Copyright (C) 2001 Peter Bergner, 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 <linux/init.h>
+#define LMB_DBG(fmt...) udbg_printf(fmt)
-#include <asm/prom.h>
-#define MAX_LMB_REGIONS 128
+#ifdef CONFIG_PPC32
+extern unsigned long __max_low_memory;
+#define LMB_REAL_LIMIT  __max_low_memory
+#else
+#define LMB_REAL_LIMIT  0
+#endif
-struct lmb_property {
-        unsigned long base;
-        unsigned long size;
-};
-struct lmb_region {
-        unsigned long cnt;
-        unsigned long size;
-        struct lmb_property region[MAX_LMB_REGIONS+1];
-};
-struct lmb {
-        unsigned long debug;
-        unsigned long rmo_size;
-        struct lmb_region memory;
-        struct lmb_region reserved;
-};
-extern struct lmb lmb;
-extern void __init lmb_init(void);
-extern void __init lmb_analyze(void);
-extern long __init lmb_add(unsigned long base, unsigned long size);
-extern long __init lmb_reserve(unsigned long base, unsigned long size);
-extern unsigned long __init lmb_alloc(unsigned long size, unsigned long align);
-extern unsigned long __init lmb_alloc_base(unsigned long size,
-                unsigned long align, unsigned long max_addr);
-extern unsigned long __init __lmb_alloc_base(unsigned long size,
-                unsigned long align, unsigned long max_addr);
-extern unsigned long __init lmb_phys_mem_size(void);
-extern unsigned long __init lmb_end_of_DRAM(void);
-extern void __init lmb_enforce_memory_limit(unsigned long memory_limit);
-extern int __init lmb_is_reserved(unsigned long addr);
-extern void lmb_dump_all(void);
-static inline unsigned long
-lmb_size_bytes(struct lmb_region *type, unsigned long region_nr)
-{
-        return type->region[region_nr].size;
-}
-static inline unsigned long
-lmb_size_pages(struct lmb_region *type, unsigned long region_nr)
-{
-        return lmb_size_bytes(type, region_nr) >> PAGE_SHIFT;
-}
-static inline unsigned long
-lmb_start_pfn(struct lmb_region *type, unsigned long region_nr)
-{
-        return type->region[region_nr].base >> PAGE_SHIFT;
-}
-static inline unsigned long
-lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)
-{
-        return lmb_start_pfn(type, region_nr) +
-               lmb_size_pages(type, region_nr);
-}
-#endif /* __KERNEL__ */
 #endif /* _ASM_POWERPC_LMB_H */
diff --git a/include/asm-powerpc/machdep.h b/include/asm-powerpc/machdep.h
index 0872ec228c1e..b95386aed50d 100644
--- a/include/asm-powerpc/machdep.h
+++ b/include/asm-powerpc/machdep.h
@@ -68,6 +68,8 @@ struct machdep_calls {
                                       unsigned long vflags,
                                       int psize, int ssize);
        long            (*hpte_remove)(unsigned long hpte_group);
+        void            (*hpte_removebolted)(unsigned long ea,
+                                             int psize, int ssize);
        void            (*flush_hash_range)(unsigned long number, int local);
        /* special for kexec, to be called in real mode, linar mapping is
diff --git a/include/asm-powerpc/pasemi_dma.h b/include/asm-powerpc/pasemi_dma.h
index b4526ff3a50d..19fd7933e2d9 100644
--- a/include/asm-powerpc/pasemi_dma.h
+++ b/include/asm-powerpc/pasemi_dma.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 PA Semi, Inc
+ * Copyright (C) 2006-2008 PA Semi, Inc
 *
 * Hardware register layout and descriptor formats for the on-board
 * DMA engine on PA Semi PWRficient. Used by ethernet, function and security
@@ -40,6 +40,11 @@ enum {
        PAS_DMA_COM_TXSTA = 0x104,      /* Transmit Status Register   */
        PAS_DMA_COM_RXCMD = 0x108,      /* Receive Command Register   */
        PAS_DMA_COM_RXSTA = 0x10c,      /* Receive Status Register    */
+        PAS_DMA_COM_CFG   = 0x114,      /* Common config reg          */
+        PAS_DMA_TXF_SFLG0 = 0x140,      /* Set flags                  */
+        PAS_DMA_TXF_SFLG1 = 0x144,      /* Set flags                  */
+        PAS_DMA_TXF_CFLG0 = 0x148,      /* Set flags                  */
+        PAS_DMA_TXF_CFLG1 = 0x14c,      /* Set flags                  */
 };
@@ -123,11 +128,16 @@ enum {
 #define    PAS_DMA_TXCHAN_TCMDSTA_DA    0x00000100
 #define PAS_DMA_TXCHAN_CFG(c)     (0x304+(c)*_PAS_DMA_TXCHAN_STRIDE)
 #define    PAS_DMA_TXCHAN_CFG_TY_IFACE  0x00000000      /* Type = interface */
+#define    PAS_DMA_TXCHAN_CFG_TY_COPY   0x00000001      /* Type = copy only */
+#define    PAS_DMA_TXCHAN_CFG_TY_FUNC   0x00000002      /* Type = function */
+#define    PAS_DMA_TXCHAN_CFG_TY_XOR    0x00000003      /* Type = xor only */
 #define    PAS_DMA_TXCHAN_CFG_TATTR_M   0x0000003c
 #define    PAS_DMA_TXCHAN_CFG_TATTR_S   2
 #define    PAS_DMA_TXCHAN_CFG_TATTR(x)  (((x) << PAS_DMA_TXCHAN_CFG_TATTR_S) & \
                                         PAS_DMA_TXCHAN_CFG_TATTR_M)
-#define    PAS_DMA_TXCHAN_CFG_WT_M      0x000001c0
+#define    PAS_DMA_TXCHAN_CFG_LPDQ      0x00000800
+#define    PAS_DMA_TXCHAN_CFG_LPSQ      0x00000400
+#define    PAS_DMA_TXCHAN_CFG_WT_M      0x000003c0
 #define    PAS_DMA_TXCHAN_CFG_WT_S      6
 #define    PAS_DMA_TXCHAN_CFG_WT(x)     (((x) << PAS_DMA_TXCHAN_CFG_WT_S) & \
                                         PAS_DMA_TXCHAN_CFG_WT_M)
@@ -394,11 +404,62 @@ enum {
                                 XCT_COPY_LLEN_M)
 #define XCT_COPY_SE             0x0000000000000001ull
+/* Function descriptor fields */
+#define XCT_FUN_T               0x8000000000000000ull
+#define XCT_FUN_ST              0x4000000000000000ull
+#define XCT_FUN_RR_M            0x3000000000000000ull
+#define XCT_FUN_RR_NORES        0x0000000000000000ull
+#define XCT_FUN_RR_8BRES        0x1000000000000000ull
+#define XCT_FUN_RR_24BRES       0x2000000000000000ull
+#define XCT_FUN_RR_40BRES       0x3000000000000000ull
+#define XCT_FUN_I               0x0800000000000000ull
+#define XCT_FUN_O               0x0400000000000000ull
+#define XCT_FUN_E               0x0200000000000000ull
+#define XCT_FUN_FUN_M           0x01c0000000000000ull
+#define XCT_FUN_FUN_S           54
+#define XCT_FUN_FUN(x)          ((((long)(x)) << XCT_FUN_FUN_S) & XCT_FUN_FUN_M)
+#define XCT_FUN_CRM_M           0x0038000000000000ull
+#define XCT_FUN_CRM_NOP         0x0000000000000000ull
+#define XCT_FUN_CRM_SIG         0x0008000000000000ull
+#define XCT_FUN_LLEN_M          0x0007ffff00000000ull
+#define XCT_FUN_LLEN_S          32
+#define XCT_FUN_LLEN(x)         ((((long)(x)) << XCT_FUN_LLEN_S) & XCT_FUN_LLEN_M)
+#define XCT_FUN_SHL_M           0x00000000f8000000ull
+#define XCT_FUN_SHL_S           27
+#define XCT_FUN_SHL(x)          ((((long)(x)) << XCT_FUN_SHL_S) & XCT_FUN_SHL_M)
+#define XCT_FUN_CHL_M           0x0000000007c00000ull
+#define XCT_FUN_HSZ_M           0x00000000003c0000ull
+#define XCT_FUN_ALG_M           0x0000000000038000ull
+#define XCT_FUN_HP              0x0000000000004000ull
+#define XCT_FUN_BCM_M           0x0000000000003800ull
+#define XCT_FUN_BCP_M           0x0000000000000600ull
+#define XCT_FUN_SIG_M           0x00000000000001f0ull
+#define XCT_FUN_SIG_TCP4        0x0000000000000140ull
+#define XCT_FUN_SIG_TCP6        0x0000000000000150ull
+#define XCT_FUN_SIG_UDP4        0x0000000000000160ull
+#define XCT_FUN_SIG_UDP6        0x0000000000000170ull
+#define XCT_FUN_A               0x0000000000000008ull
+#define XCT_FUN_C               0x0000000000000004ull
+#define XCT_FUN_AL2             0x0000000000000002ull
+#define XCT_FUN_SE              0x0000000000000001ull
+/* Function descriptor 8byte result fields */
+#define XCT_FUNRES_8B_CS_M      0x0000ffff00000000ull
+#define XCT_FUNRES_8B_CS_S      32
+#define XCT_FUNRES_8B_CRC_M     0x00000000ffffffffull
+#define XCT_FUNRES_8B_CRC_S     0
 /* Control descriptor fields */
 #define CTRL_CMD_T              0x8000000000000000ull
 #define CTRL_CMD_META_EVT       0x2000000000000000ull
 #define CTRL_CMD_O              0x0400000000000000ull
-#define CTRL_CMD_REG_M          0x000000000000000full
+#define CTRL_CMD_ETYPE_M        0x0038000000000000ull
+#define CTRL_CMD_ETYPE_EXT      0x0000000000000000ull
+#define CTRL_CMD_ETYPE_WSET     0x0020000000000000ull
+#define CTRL_CMD_ETYPE_WCLR     0x0028000000000000ull
+#define CTRL_CMD_ETYPE_SET      0x0030000000000000ull
+#define CTRL_CMD_ETYPE_CLR      0x0038000000000000ull
+#define CTRL_CMD_REG_M          0x000000000000007full
 #define CTRL_CMD_REG_S          0
 #define CTRL_CMD_REG(x)         ((((long)(x)) << CTRL_CMD_REG_S) & \
                                 CTRL_CMD_REG_M)
@@ -461,6 +522,16 @@ extern void *pasemi_dma_alloc_buf(struct pasemi_dmachan *chan, int size,
 extern void pasemi_dma_free_buf(struct pasemi_dmachan *chan, int size,
                                dma_addr_t *handle);
+/* Routines to allocate flags (events) for channel syncronization */
+extern int  pasemi_dma_alloc_flag(void);
+extern void pasemi_dma_free_flag(int flag);
+extern void pasemi_dma_set_flag(int flag);
+extern void pasemi_dma_clear_flag(int flag);
+/* Routines to allocate function engines */
+extern int  pasemi_dma_alloc_fun(void);
+extern void pasemi_dma_free_fun(int fun);
 /* Initialize the library, must be called before any other functions */
 extern int pasemi_dma_init(void);
diff --git a/include/asm-powerpc/pgtable-ppc32.h b/include/asm-powerpc/pgtable-ppc32.h
index 2c79f550272b..bd5b4011c53b 100644
--- a/include/asm-powerpc/pgtable-ppc32.h
+++ b/include/asm-powerpc/pgtable-ppc32.h
@@ -420,7 +420,8 @@ extern int icache_44x_need_flush;
 #define _PAGE_IO        (_PAGE_KERNEL | _PAGE_NO_CACHE | _PAGE_GUARDED)
 #define _PAGE_RAM       (_PAGE_KERNEL | _PAGE_HWEXEC)
-#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH)
+#if defined(CONFIG_KGDB) || defined(CONFIG_XMON) || defined(CONFIG_BDI_SWITCH) ||\
+        defined(CONFIG_KPROBES)
 /* We want the debuggers to be able to set breakpoints anywhere, so
 * don't write protect the kernel text */
 #define _PAGE_RAM_TEXT  _PAGE_RAM
diff --git a/include/asm-powerpc/phyp_dump.h b/include/asm-powerpc/phyp_dump.h
new file mode 100644
index 000000000000..209a98913d9d
--- /dev/null
+++ b/include/asm-powerpc/phyp_dump.h
@@ -0,0 +1,45 @@
+/*
+ * Hypervisor-assisted dump
+ *
+ * Linas Vepstas, Manish Ahuja 2008
+ * Copyright 2008 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.
+ */
+#ifndef _PPC64_PHYP_DUMP_H
+#define _PPC64_PHYP_DUMP_H
+#ifdef CONFIG_PHYP_DUMP
+/* The RMR region will be saved for later dumping
+ * whenever the kernel crashes. Set this to 256MB. */
+#define PHYP_DUMP_RMR_START 0x0
+#define PHYP_DUMP_RMR_END   (1UL<<28)
+struct phyp_dump {
+        /* Memory that is reserved during very early boot. */
+        unsigned long init_reserve_start;
+        unsigned long init_reserve_size;
+        /* Check status during boot if dump supported, active & present*/
+        unsigned long phyp_dump_at_boot;
+        unsigned long phyp_dump_configured;
+        unsigned long phyp_dump_is_active;
+        /* store cpu & hpte size */
+        unsigned long cpu_state_size;
+        unsigned long hpte_region_size;
+        /* previous scratch area values */
+        unsigned long reserved_scratch_addr;
+        unsigned long reserved_scratch_size;
+};
+extern struct phyp_dump *phyp_dump_info;
+int early_init_dt_scan_phyp_dump(unsigned long node,
+                const char *uname, int depth, void *data);
+#endif /* CONFIG_PHYP_DUMP */
+#endif /* _PPC64_PHYP_DUMP_H */
diff --git a/include/asm-powerpc/ppc4xx.h b/include/asm-powerpc/ppc4xx.h
new file mode 100644
index 000000000000..033039a80c42
--- /dev/null
+++ b/include/asm-powerpc/ppc4xx.h
@@ -0,0 +1,18 @@
+/*
+ * PPC4xx Prototypes and definitions
+ *
+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ */
+#ifndef __ASM_POWERPC_PPC4xx_H__
+#define __ASM_POWERPC_PPC4xx_H__
+extern void ppc4xx_reset_system(char *cmd);
+#endif /* __ASM_POWERPC_PPC4xx_H__ */
diff --git a/include/asm-powerpc/ps3.h b/include/asm-powerpc/ps3.h
index 2b693673eff4..9e8ed6824e15 100644
--- a/include/asm-powerpc/ps3.h
+++ b/include/asm-powerpc/ps3.h
@@ -434,8 +434,11 @@ struct ps3_sys_manager_ops {
 };
 void ps3_sys_manager_register_ops(const struct ps3_sys_manager_ops *ops);
-void ps3_sys_manager_power_off(void);
+void __noreturn ps3_sys_manager_power_off(void);
-void ps3_sys_manager_restart(void);
+void __noreturn ps3_sys_manager_restart(void);
+void __noreturn ps3_sys_manager_halt(void);
+int ps3_sys_manager_get_wol(void);
+void ps3_sys_manager_set_wol(int state);
 struct ps3_prealloc {
    const char *name;
diff --git a/include/asm-powerpc/sparsemem.h b/include/asm-powerpc/sparsemem.h
index e8b493d52b4f..9aea8e9f0bd1 100644
--- a/include/asm-powerpc/sparsemem.h
+++ b/include/asm-powerpc/sparsemem.h
@@ -15,6 +15,7 @@
 #ifdef CONFIG_MEMORY_HOTPLUG
 extern void create_section_mapping(unsigned long start, unsigned long end);
+extern int remove_section_mapping(unsigned long start, unsigned long end);
 #ifdef CONFIG_NUMA
 extern int hot_add_scn_to_nid(unsigned long scn_addr);
 #else
diff --git a/include/asm-powerpc/string.h b/include/asm-powerpc/string.h
index aa40f92c298d..e40010abcaf1 100644
--- a/include/asm-powerpc/string.h
+++ b/include/asm-powerpc/string.h
@@ -7,6 +7,7 @@
 #define __HAVE_ARCH_STRNCPY
 #define __HAVE_ARCH_STRLEN
 #define __HAVE_ARCH_STRCMP
+#define __HAVE_ARCH_STRNCMP
 #define __HAVE_ARCH_STRCAT
 #define __HAVE_ARCH_MEMSET
 #define __HAVE_ARCH_MEMCPY
@@ -18,6 +19,7 @@ extern char * strcpy(char *,const char *);
 extern char * strncpy(char *,const char *, __kernel_size_t);
 extern __kernel_size_t strlen(const char *);
 extern int strcmp(const char *,const char *);
+extern int strncmp(const char *, const char *, __kernel_size_t);
 extern char * strcat(char *, const char *);
 extern void * memset(void *,int,__kernel_size_t);
 extern void * memcpy(void *,const void *,__kernel_size_t);
diff --git a/include/asm-sparc64/lmb.h b/include/asm-sparc64/lmb.h
new file mode 100644
index 000000000000..6a352cbcf520
--- /dev/null
+++ b/include/asm-sparc64/lmb.h
@@ -0,0 +1,10 @@
+#ifndef _SPARC64_LMB_H
+#define _SPARC64_LMB_H
+#include <asm/oplib.h>
+#define LMB_DBG(fmt...) prom_printf(fmt)
+#define LMB_REAL_LIMIT  0
+#endif /* !(_SPARC64_LMB_H) */
diff --git a/include/linux/lmb.h b/include/linux/lmb.h
new file mode 100644
index 000000000000..632717c6a2ba
--- /dev/null
+++ b/include/linux/lmb.h
@@ -0,0 +1,83 @@
+#ifndef _LINUX_LMB_H
+#define _LINUX_LMB_H
+#ifdef __KERNEL__
+/*
+ * Logical memory blocks.
+ *
+ * Copyright (C) 2001 Peter Bergner, 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 <linux/init.h>
+#include <linux/mm.h>
+#define MAX_LMB_REGIONS 128
+struct lmb_property {
+        u64 base;
+        u64 size;
+};
+struct lmb_region {
+        unsigned long cnt;
+        u64 size;
+        struct lmb_property region[MAX_LMB_REGIONS+1];
+};
+struct lmb {
+        unsigned long debug;
+        u64 rmo_size;
+        struct lmb_region memory;
+        struct lmb_region reserved;
+};
+extern struct lmb lmb;
+extern void __init lmb_init(void);
+extern void __init lmb_analyze(void);
+extern long __init lmb_add(u64 base, u64 size);
+extern long __init lmb_reserve(u64 base, u64 size);
+extern u64 __init lmb_alloc(u64 size, u64 align);
+extern u64 __init lmb_alloc_base(u64 size,
+                u64, u64 max_addr);
+extern u64 __init __lmb_alloc_base(u64 size,
+                u64 align, u64 max_addr);
+extern u64 __init lmb_phys_mem_size(void);
+extern u64 __init lmb_end_of_DRAM(void);
+extern void __init lmb_enforce_memory_limit(u64 memory_limit);
+extern int __init lmb_is_reserved(u64 addr);
+extern void lmb_dump_all(void);
+static inline u64
+lmb_size_bytes(struct lmb_region *type, unsigned long region_nr)
+{
+        return type->region[region_nr].size;
+}
+static inline u64
+lmb_size_pages(struct lmb_region *type, unsigned long region_nr)
+{
+        return lmb_size_bytes(type, region_nr) >> PAGE_SHIFT;
+}
+static inline u64
+lmb_start_pfn(struct lmb_region *type, unsigned long region_nr)
+{
+        return type->region[region_nr].base >> PAGE_SHIFT;
+}
+static inline u64
+lmb_end_pfn(struct lmb_region *type, unsigned long region_nr)
+{
+        return lmb_start_pfn(type, region_nr) +
+               lmb_size_pages(type, region_nr);
+}
+#include <asm/lmb.h>
+#endif /* __KERNEL__ */
+#endif /* _LINUX_LMB_H */
diff --git a/include/linux/of.h b/include/linux/of.h
index 6981016dcc25..59a61bdc98b6 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -62,6 +62,7 @@ extern struct property *of_find_property(const struct device_node *np,
                                         int *lenp);
 extern int of_device_is_compatible(const struct device_node *device,
                                   const char *);
+extern int of_device_is_available(const struct device_node *device);
 extern const void *of_get_property(const struct device_node *node,
                                const char *name,
                                int *lenp);
diff --git a/lib/Kconfig b/lib/Kconfig
index ba3d104994d9..2d53dc092e8b 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -141,4 +141,7 @@ config HAS_DMA
 config CHECK_SIGNATURE
        bool
+config HAVE_LMB
+        boolean
 endmenu
diff --git a/lib/Makefile b/lib/Makefile
index 23de261a4c83..61bba16a0a2f 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -70,6 +70,8 @@ obj-$(CONFIG_FAULT_INJECTION) += fault-inject.o
 lib-$(CONFIG_GENERIC_BUG) += bug.o
+obj-$(CONFIG_HAVE_LMB) += lmb.o
 hostprogs-y     := gen_crc32table
 clean-files     := crc32table.h
diff --git a/arch/powerpc/mm/lmb.c b/lib/lmb.c
index 4ce23bcf8a57..3c43b95fef4a 100644
--- a/arch/powerpc/mm/lmb.c
+++ b/lib/lmb.c
@@ -3,7 +3,7 @@
 *
 * Peter Bergner, IBM Corp.     June 2001.
 * Copyright (C) 2001 Peter Bergner.
- * 
+ *
 *      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
@@ -13,19 +13,12 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/bitops.h>
-#include <asm/types.h>
+#include <linux/lmb.h>
-#include <asm/page.h>
-#include <asm/prom.h>
-#include <asm/lmb.h>
-#ifdef CONFIG_PPC32
-#include "mmu_decl.h"           /* for __max_low_memory */
-#endif
 #undef DEBUG
 #ifdef DEBUG
-#include <asm/udbg.h>
+#define DBG(fmt...) LMB_DBG(fmt)
-#define DBG(fmt...) udbg_printf(fmt)
 #else
 #define DBG(fmt...)
 #endif
@@ -41,33 +34,34 @@ void lmb_dump_all(void)
        DBG("lmb_dump_all:\n");
        DBG("    memory.cnt               = 0x%lx\n", lmb.memory.cnt);
-        DBG("    memory.size              = 0x%lx\n", lmb.memory.size);
+        DBG("    memory.size              = 0x%llx\n",
+            (unsigned long long)lmb.memory.size);
        for (i=0; i < lmb.memory.cnt ;i++) {
-                DBG("    memory.region[0x%x].base       = 0x%lx\n",
+                DBG("    memory.region[0x%x].base       = 0x%llx\n",
-                            i, lmb.memory.region[i].base);
+                    i, (unsigned long long)lmb.memory.region[i].base);
-                DBG("                 .size     = 0x%lx\n",
+                DBG("                 .size     = 0x%llx\n",
-                            lmb.memory.region[i].size);
+                    (unsigned long long)lmb.memory.region[i].size);
        }
        DBG("\n    reserved.cnt   = 0x%lx\n", lmb.reserved.cnt);
        DBG("    reserved.size    = 0x%lx\n", lmb.reserved.size);
        for (i=0; i < lmb.reserved.cnt ;i++) {
-                DBG("    reserved.region[0x%x].base       = 0x%lx\n",
+                DBG("    reserved.region[0x%x].base       = 0x%llx\n",
-                            i, lmb.reserved.region[i].base);
+                    i, (unsigned long long)lmb.reserved.region[i].base);
-                DBG("                 .size     = 0x%lx\n",
+                DBG("                 .size     = 0x%llx\n",
-                            lmb.reserved.region[i].size);
+                    (unsigned long long)lmb.reserved.region[i].size);
        }
 #endif /* DEBUG */
 }
-static unsigned long __init lmb_addrs_overlap(unsigned long base1,
+static unsigned long __init lmb_addrs_overlap(u64 base1,
-                unsigned long size1, unsigned long base2, unsigned long size2)
+                u64 size1, u64 base2, u64 size2)
 {
        return ((base1 < (base2+size2)) && (base2 < (base1+size1)));
 }
-static long __init lmb_addrs_adjacent(unsigned long base1, unsigned long size1,
+static long __init lmb_addrs_adjacent(u64 base1, u64 size1,
-                unsigned long base2, unsigned long size2)
+                u64 base2, u64 size2)
 {
        if (base2 == base1 + size1)
                return 1;
@@ -80,10 +74,10 @@ static long __init lmb_addrs_adjacent(unsigned long base1, unsigned long size1,
 static long __init lmb_regions_adjacent(struct lmb_region *rgn,
                unsigned long r1, unsigned long r2)
 {
-        unsigned long base1 = rgn->region[r1].base;
+        u64 base1 = rgn->region[r1].base;
-        unsigned long size1 = rgn->region[r1].size;
+        u64 size1 = rgn->region[r1].size;
-        unsigned long base2 = rgn->region[r2].base;
+        u64 base2 = rgn->region[r2].base;
-        unsigned long size2 = rgn->region[r2].size;
+        u64 size2 = rgn->region[r2].size;
        return lmb_addrs_adjacent(base1, size1, base2, size2);
 }
@@ -135,16 +129,21 @@ void __init lmb_analyze(void)
 }
 /* This routine called with relocation disabled. */
-static long __init lmb_add_region(struct lmb_region *rgn, unsigned long base,
+static long __init lmb_add_region(struct lmb_region *rgn, u64 base, u64 size)
-                                  unsigned long size)
 {
        unsigned long coalesced = 0;
        long adjacent, i;
+        if ((rgn->cnt == 1) && (rgn->region[0].size == 0)) {
+                rgn->region[0].base = base;
+                rgn->region[0].size = size;
+                return 0;
+        }
        /* First try and coalesce this LMB with another. */
        for (i=0; i < rgn->cnt; i++) {
-                unsigned long rgnbase = rgn->region[i].base;
+                u64 rgnbase = rgn->region[i].base;
-                unsigned long rgnsize = rgn->region[i].size;
+                u64 rgnsize = rgn->region[i].size;
                if ((rgnbase == base) && (rgnsize == size))
                        /* Already have this region, so we're done */
@@ -185,13 +184,18 @@ static long __init lmb_add_region(struct lmb_region *rgn, unsigned long base,
                        break;
                }
        }
+        if (base < rgn->region[0].base) {
+                rgn->region[0].base = base;
+                rgn->region[0].size = size;
+        }
        rgn->cnt++;
        return 0;
 }
 /* This routine may be called with relocation disabled. */
-long __init lmb_add(unsigned long base, unsigned long size)
+long __init lmb_add(u64 base, u64 size)
 {
        struct lmb_region *_rgn = &(lmb.memory);
@@ -203,7 +207,7 @@ long __init lmb_add(unsigned long base, unsigned long size)
 }
-long __init lmb_reserve(unsigned long base, unsigned long size)
+long __init lmb_reserve(u64 base, u64 size)
 {
        struct lmb_region *_rgn = &(lmb.reserved);
@@ -212,14 +216,14 @@ long __init lmb_reserve(unsigned long base, unsigned long size)
        return lmb_add_region(_rgn, base, size);
 }
-long __init lmb_overlaps_region(struct lmb_region *rgn, unsigned long base,
+long __init lmb_overlaps_region(struct lmb_region *rgn, u64 base,
-                                unsigned long size)
+                                u64 size)
 {
        unsigned long i;
        for (i=0; i < rgn->cnt; i++) {
-                unsigned long rgnbase = rgn->region[i].base;
+                u64 rgnbase = rgn->region[i].base;
-                unsigned long rgnsize = rgn->region[i].size;
+                u64 rgnsize = rgn->region[i].size;
                if ( lmb_addrs_overlap(base,size,rgnbase,rgnsize) ) {
                        break;
                }
@@ -228,54 +232,61 @@ long __init lmb_overlaps_region(struct lmb_region *rgn, unsigned long base,
        return (i < rgn->cnt) ? i : -1;
 }
-unsigned long __init lmb_alloc(unsigned long size, unsigned long align)
+u64 __init lmb_alloc(u64 size, u64 align)
 {
        return lmb_alloc_base(size, align, LMB_ALLOC_ANYWHERE);
 }
-unsigned long __init lmb_alloc_base(unsigned long size, unsigned long align,
+u64 __init lmb_alloc_base(u64 size, u64 align, u64 max_addr)
-                                    unsigned long max_addr)
 {
-        unsigned long alloc;
+        u64 alloc;
        alloc = __lmb_alloc_base(size, align, max_addr);
        if (alloc == 0)
-                panic("ERROR: Failed to allocate 0x%lx bytes below 0x%lx.\n",
+                panic("ERROR: Failed to allocate 0x%llx bytes below 0x%llx.\n",
-                                size, max_addr);
+                      (unsigned long long) size, (unsigned long long) max_addr);
        return alloc;
 }
-unsigned long __init __lmb_alloc_base(unsigned long size, unsigned long align,
+static u64 lmb_align_down(u64 addr, u64 size)
-                                    unsigned long max_addr)
+{
+        return addr & ~(size - 1);
+}
+static u64 lmb_align_up(u64 addr, u64 size)
+{
+        return (addr + (size - 1)) & ~(size - 1);
+}
+u64 __init __lmb_alloc_base(u64 size, u64 align, u64 max_addr)
 {
        long i, j;
-        unsigned long base = 0;
+        u64 base = 0;
        BUG_ON(0 == size);
-#ifdef CONFIG_PPC32
+        /* On some platforms, make sure we allocate lowmem */
-        /* On 32-bit, make sure we allocate lowmem */
        if (max_addr == LMB_ALLOC_ANYWHERE)
-                max_addr = __max_low_memory;
+                max_addr = LMB_REAL_LIMIT;
-#endif
        for (i = lmb.memory.cnt-1; i >= 0; i--) {
-                unsigned long lmbbase = lmb.memory.region[i].base;
+                u64 lmbbase = lmb.memory.region[i].base;
-                unsigned long lmbsize = lmb.memory.region[i].size;
+                u64 lmbsize = lmb.memory.region[i].size;
                if (max_addr == LMB_ALLOC_ANYWHERE)
-                        base = _ALIGN_DOWN(lmbbase + lmbsize - size, align);
+                        base = lmb_align_down(lmbbase + lmbsize - size, align);
                else if (lmbbase < max_addr) {
                        base = min(lmbbase + lmbsize, max_addr);
-                        base = _ALIGN_DOWN(base - size, align);
+                        base = lmb_align_down(base - size, align);
                } else
                        continue;
                while ((lmbbase <= base) &&
                       ((j = lmb_overlaps_region(&lmb.reserved, base, size)) >= 0) )
-                        base = _ALIGN_DOWN(lmb.reserved.region[j].base - size,
+                        base = lmb_align_down(lmb.reserved.region[j].base - size,
-                                           align);
+                                              align);
                if ((base != 0) && (lmbbase <= base))
                        break;
@@ -284,18 +295,19 @@ unsigned long __init __lmb_alloc_base(unsigned long size, unsigned long align,
        if (i < 0)
                return 0;
-        lmb_add_region(&lmb.reserved, base, size);
+        if (lmb_add_region(&lmb.reserved, base, lmb_align_up(size, align)) < 0)
+                return 0;
        return base;
 }
 /* You must call lmb_analyze() before this. */
-unsigned long __init lmb_phys_mem_size(void)
+u64 __init lmb_phys_mem_size(void)
 {
        return lmb.memory.size;
 }
-unsigned long __init lmb_end_of_DRAM(void)
+u64 __init lmb_end_of_DRAM(void)
 {
        int idx = lmb.memory.cnt - 1;
@@ -303,9 +315,10 @@ unsigned long __init lmb_end_of_DRAM(void)
 }
 /* You must call lmb_analyze() after this. */
-void __init lmb_enforce_memory_limit(unsigned long memory_limit)
+void __init lmb_enforce_memory_limit(u64 memory_limit)
 {
-        unsigned long i, limit;
+        unsigned long i;
+        u64 limit;
        struct lmb_property *p;
        if (! memory_limit)
@@ -343,13 +356,13 @@ void __init lmb_enforce_memory_limit(unsigned long memory_limit)
        }
 }
-int __init lmb_is_reserved(unsigned long addr)
+int __init lmb_is_reserved(u64 addr)
 {
        int i;
        for (i = 0; i < lmb.reserved.cnt; i++) {
-                unsigned long upper = lmb.reserved.region[i].base +
+                u64 upper = lmb.reserved.region[i].base +
-                                      lmb.reserved.region[i].size - 1;
+                        lmb.reserved.region[i].size - 1;
                if ((addr >= lmb.reserved.region[i].base) && (addr <= upper))
                        return 1;
        }